libdc: add submodule support to build.sh

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-12-03 11:48:51 -08:00
parent 10237a19b7
commit dd20c2004d

View file

@ -1,15 +1,11 @@
#!/bin/bash #!/bin/bash
# #
# this should be run from the src directory, the layout is supposed to # this should be run from the src directory which contains the subsurface
# look like this: # directory; the layout should look like this:
#.../src/subsurface #.../src/subsurface
# /libdivecomputer
# #
# the script will build these three libraries from source, even if # the script will build Subsurface and libdivecomputer (plus some other
# they are installed as part of the host OS since we have seen # dependencies if requestsed) from source.
# numerous cases where building with random versions (especially older,
# but sometimes also newer versions than recommended here) will lead
# to all kinds of unnecessary pain
# #
# it installs the libraries and subsurface in the install-root subdirectory # it installs the libraries and subsurface in the install-root subdirectory
# of the current directory (except on Mac where the Subsurface.app ends up # of the current directory (except on Mac where the Subsurface.app ends up
@ -343,19 +339,13 @@ cd $SRC
# build libdivecomputer # build libdivecomputer
if [ ! -d libdivecomputer ] ; then cd subsurface
if [[ $1 = local ]] ; then
git clone $SRC/../libdivecomputer libdivecomputer if [ ! -d subsurface/libdivecomputer/src ] ; then
else git submodule update --recursive
git clone -b Subsurface-branch https://github.com/Subsurface-divelog/libdc.git libdivecomputer
fi
fi fi
cd libdivecomputer cd libdivecomputer
git pull --rebase
if ! git checkout Subsurface-branch ; then
echo "can't check out the Subsurface-branch branch of libdivecomputer -- giving up"
exit 1
fi
mkdir -p build mkdir -p build
cd build cd build