mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Build script: make sure the versions we want to build exist

Browse source 
The script didn't do the right thing if it had been run before and was
re-run to create the latest build. We need to actually pull the latest
versions of the different git repositories and make sure that the branches
and commits that we want exist.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-06-04 10:47:57 -07:00
parent 1cf31eeaf9
commit a798bb010c
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/build.sh
View file

@ -72,7 +72,11 @@ if [ ! -d libgit2 ] ; then
fi fi
cd libgit2 cd libgit2
# let's build with a recent enough version of master for the latest features # let's build with a recent enough version of master for the latest features
git checkout c11daac9de2 git pull
if [ ! git checkout c11daac9de2 ] ; then
echo "Can't find the right commit in libgit2 - giving up"
exit 1
fi
mkdir -p build mkdir -p build
cd build cd build
cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT -DCMAKE_BUILD_TYPE=Release -DBUILD_CLAR=OFF .. cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT -DCMAKE_BUILD_TYPE=Release -DBUILD_CLAR=OFF ..
@ -100,7 +104,11 @@ if [ ! -d libdivecomputer ] ; then
fi fi
fi fi
cd libdivecomputer cd libdivecomputer
git checkout Subsurface-testing git pull
if [ ! git checkout Subsurface-testing ] ; then
echo "can't check out the Subsurface-testing branch of libdivecomputer -- giving up"
exit 1
fi
if [ ! -f configure ] ; then if [ ! -f configure ] ; then
autoreconf --install autoreconf --install
fi fi
@ -120,7 +128,11 @@ if [ ! -d marble-source ] ; then
fi fi
fi fi
cd marble-source cd marble-source
git checkout Subsurface-testing git pull
if [ ! git checkout Subsurface-testing ] ; then
echo "can't check out the Subsurface-testing branch of marble -- giving up"
exit 1
fi
mkdir -p build mkdir -p build
cd build cd build
cmake -DCMAKE_BUILD_TYPE=Release -DQTONLY=TRUE -DQT5BUILD=ON \ cmake -DCMAKE_BUILD_TYPE=Release -DQTONLY=TRUE -DQT5BUILD=ON \