Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make vstart work with cmake out of tree builds #5457

Merged
merged 8 commits into from
Aug 11, 2015
Merged

Make vstart work with cmake out of tree builds #5457

merged 8 commits into from
Aug 11, 2015

Commits on Aug 10, 2015

  1. CMake: build dencoder at src/ceph-dencoder 

    ...instead of in src/test/dencoder.

While the source lives in test/, the dencoder tool is built
and distributed as a first class binary, so it's awkward for
paths in dev/test to have it in a unique location.

Signed-off-by: John Spray <john.spray@redhat.com>
    John Spray committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    1f5ddbf View commit details
    Browse the repository at this point in the history

  2. init-ceph.in: set executable bit 

    Scripts expect the generated init-ceph script
to be +x, and CMake does that if the file you
feed into it is +x.  This matches what we already
do with ceph.in.

Signed-off-by: John Spray <john.spray@redhat.com>
    John Spray committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    af31afa View commit details
    Browse the repository at this point in the history

  3. ceph.in: use cmake-style substitution 

    Avoid need for separate ceph.in and ceph.in.cmake files.

Signed-off-by: John Spray <john.spray@redhat.com>
    John Spray committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    6545981 View commit details
    Browse the repository at this point in the history

  4. Makefile: build ceph.in the cmake way 

    A little bit more of a tongue-twisting command line
to do string replacement, but saves us from having
separate ceph.in files for cmake vs autotools.

Signed-off-by: John Spray <john.spray@redhat.com>
    John Spray committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    64255b9 View commit details
    Browse the repository at this point in the history

  5. vstart: enable more path customization 

    ...for working with out-of-tree builds.

Signed-off-by: John Spray <john.spray@redhat.com>
    John Spray committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    dac84a7 View commit details
    Browse the repository at this point in the history

  6. vstart: detect and handle cmake environ 

    Signed-off-by: John Spray <john.spray@redhat.com>
    John Spray committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    0695d17 View commit details
    Browse the repository at this point in the history

  7. ceph.in: detect paths in out of tree build 

    a la what we currently do for PYTHONPATH
and LD_LIBRARY_PATH, but for cmake out
of tree builds.

Signed-off-by: John Spray <john.spray@redhat.com>
    John Spray committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    44ed436 View commit details
    Browse the repository at this point in the history

  8. vstart: detect CEPH_BIN in stop.sh too 

    ...for the benefit of rbd.

Signed-off-by: John Spray <john.spray@redhat.com>
    John Spray committed Aug 10, 2015
    Configuration menu
    Copy the full SHA
    c747e29 View commit details
    Browse the repository at this point in the history