RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-25 04:43:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vstart: update for cmake build path changes

Browse Source 
Cribbed this from Ali's wip-cmake-make-check branch.

Signed-off-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2016-03-24 12:30:09 +00:00
parent f02f1d17a6
commit 5da6ae8638
2 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/stop.sh
View File

@ -21,7 +21,7 @@ test -d dev/osd0/. && test -e dev/sudo && SUDO="sudo"
if [ -e CMakeCache.txt ]; then if [ -e CMakeCache.txt ]; then
[ -z "$CEPH_BIN" ] && CEPH_BIN=src [ -z "$CEPH_BIN" ] && CEPH_BIN=src
else else
[ -z "$CEPH_BIN" ] && CEPH_BIN=. [ -z "$CEPH_BIN" ] && CEPH_BIN=bin
fi fi
MYUID=$(id -u) MYUID=$(id -u)

58
src/vstart.sh
View File

@ -21,50 +21,34 @@ if [ -n "$VSTART_DEST" ]; then
CEPH_OUT_DIR=$VSTART_DEST/out CEPH_OUT_DIR=$VSTART_DEST/out
fi fi
# for running out of the CMake build directory
if [ -e CMakeCache.txt ]; then if [ -e CMakeCache.txt ]; then
# Out of tree build, learn source location from CMakeCache.txt # Out of tree build, learn source location from CMakeCache.txt
SRC_ROOT=`grep Ceph_SOURCE_DIR CMakeCache.txt | cut -d "=" -f 2` CEPH_ROOT=`grep Ceph_SOURCE_DIR CMakeCache.txt | cut -d "=" -f 2`
[ -z "$PYBIND" ] && PYBIND=$SRC_ROOT/src/pybind CEPH_BUILD_DIR=`pwd`
[ -z "$CEPH_ADM" ] && CEPH_ADM=./ceph
[ -z "$INIT_CEPH" ] && INIT_CEPH=./init-ceph
[ -z "$CEPH_BIN" ] && CEPH_BIN=src
[ -z "$CEPH_LIB" ] && CEPH_LIB=src
[ -z "$OBJCLASS_PATH" ] && OBJCLASS_PATH=src/cls
# Gather symlinks to EC plugins in one dir, because with CMake they
# are built into multiple locations
mkdir -p ec_plugins
for file in ./src/erasure-code/*/libec_*.so*;
do
ln -sf ../${file} ec_plugins/`basename $file`
done
[ -z "$EC_PATH" ] && EC_PATH=./ec_plugins
# check for compression plugins
mkdir -p .libs/compressor
for file in ./src/compressor/*/libcs_*.so*;
do
ln -sf ../${file} .libs/compressor/`basename $file`
done
else
mkdir -p .libs/compressor
for f in `ls -d compressor/*/`;
do
cp .libs/libceph_`basename $f`.so* .libs/compressor/;
done
fi fi
if [ -z "$CEPH_BUILD_ROOT" ]; then # use CEPH_BUILD_ROOT to vstart from a 'make install'
[ -z "$CEPH_BIN" ] && CEPH_BIN=. if [ -n "$CEPH_BUILD_ROOT" ]; then
[ -z "$CEPH_LIB" ] && CEPH_LIB=.libs
[ -z $EC_PATH ] && EC_PATH=$CEPH_LIB
[ -z $CS_PATH ] && CS_PATH=$CEPH_LIB
[ -z $OBJCLASS_PATH ] && OBJCLASS_PATH=$CEPH_LIB
else
[ -z $CEPH_BIN ] && CEPH_BIN=$CEPH_BUILD_ROOT/bin [ -z $CEPH_BIN ] && CEPH_BIN=$CEPH_BUILD_ROOT/bin
[ -z $CEPH_LIB ] && CEPH_LIB=$CEPH_BUILD_ROOT/lib [ -z $CEPH_LIB ] && CEPH_LIB=$CEPH_BUILD_ROOT/lib
[ -z $EC_PATH ] && EC_PATH=$CEPH_LIB/erasure-code [ -z $EC_PATH ] && EC_PATH=$CEPH_LIB/erasure-code
[ -z $CS_PATH ] && CS_PATH=$CEPH_LIB/compressor [ -z $CS_PATH ] && CS_PATH=$CEPH_LIB/compressor
[ -z $OBJCLASS_PATH ] && OBJCLASS_PATH=$CEPH_LIB/rados-classes [ -z $OBJCLASS_PATH ] && OBJCLASS_PATH=$CEPH_LIB/rados-classes
elif [ -n "$CEPH_ROOT" ]; then
[ -z "$PYBIND" ] && PYBIND=$CEPH_ROOT/src/pybind
[ -z "$CEPH_BIN" ] && CEPH_BIN=$CEPH_BUILD_DIR/bin
[ -z "$CEPH_ADM" ] && CEPH_ADM=$CEPH_BIN/ceph
[ -z "$INIT_CEPH" ] && INIT_CEPH=$CEPH_BIN/init-ceph
[ -z "$CEPH_LIB" ] && CEPH_LIB=$CEPH_BUILD_DIR/lib
[ -z "$OBJCLASS_PATH" ] && OBJCLASS_PATH=$CEPH_LIB
[ -z "$EC_PATH" ] && EC_PATH=$CEPH_LIB
else
[ -z "$CEPH_BIN" ] && CEPH_BIN=.
[ -z "$CEPH_LIB" ] && CEPH_LIB=.libs
[ -z $EC_PATH ] && EC_PATH=$CEPH_LIB
[ -z $CS_PATH ] && CS_PATH=$CEPH_LIB
[ -z $OBJCLASS_PATH ] && OBJCLASS_PATH=$CEPH_LIB
fi fi
if [ -z "${CEPH_VSTART_WRAPPER}" ]; then if [ -z "${CEPH_VSTART_WRAPPER}" ]; then
@ -73,7 +57,7 @@ fi
[ -z "$PYBIND" ] && PYBIND=./pybind [ -z "$PYBIND" ] && PYBIND=./pybind
export PYTHONPATH=$PYBIND export PYTHONPATH=$PYBIND:$PYTHONPATH
export LD_LIBRARY_PATH=$CEPH_LIB:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=$CEPH_LIB:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=$CEPH_LIB:$DYLD_LIBRARY_PATH export DYLD_LIBRARY_PATH=$CEPH_LIB:$DYLD_LIBRARY_PATH
@ -800,7 +784,7 @@ fi
echo "started. stop.sh to stop. see out/* (e.g. 'tail -f out/????') for debug output." echo "started. stop.sh to stop. see out/* (e.g. 'tail -f out/????') for debug output."
echo "" echo ""
echo "export PYTHONPATH=./pybind" echo "export PYTHONPATH=./pybind:$PYTHONPATH"
echo "export LD_LIBRARY_PATH=$CEPH_LIB" echo "export LD_LIBRARY_PATH=$CEPH_LIB"
if [ "$CEPH_DIR" != "$PWD" ]; then if [ "$CEPH_DIR" != "$PWD" ]; then