mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Build script: use Subsurface-testing branches of marble and libdivecomputer

Browse source 
While in a release we'd want to use the corresponding release branches, it
seems to make more sense to me to switch to the testing branches for Subsurface
master.

Signed-off-by: Dirk Hohndel (Intel) <dhohndel@dhohndel-mac02.jf.intel.com>
This commit is contained in:
Dirk Hohndel (Intel) 2015-06-02 10:41:29 -07:00
parent 3de62f5275
commit 5823683229
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/build.sh
View file

@ -96,11 +96,11 @@ if [ ! -d libdivecomputer ] ; then
if [[ $1 = local ]] ; then if [[ $1 = local ]] ; then
git clone $SRC/../libdivecomputer libdivecomputer git clone $SRC/../libdivecomputer libdivecomputer
else else
git clone -b Subsurface-4.4 git://subsurface-divelog.org/libdc libdivecomputer git clone -b Subsurface-testing git://subsurface-divelog.org/libdc libdivecomputer
fi fi
fi fi
cd libdivecomputer cd libdivecomputer
git checkout Subsurface-4.4 git checkout Subsurface-testing
if [ ! -f configure ] ; then if [ ! -f configure ] ; then
autoreconf --install autoreconf --install
fi fi
@ -116,11 +116,11 @@ if [ ! -d marble-source ] ; then
if [[ $1 = local ]] ; then if [[ $1 = local ]] ; then
git clone $SRC/../marble-source marble-source git clone $SRC/../marble-source marble-source
else else
git clone -b Subsurface-4.4 git://subsurface-divelog.org/marble marble-source git clone -b Subsurface-testing git://subsurface-divelog.org/marble marble-source
fi fi
fi fi
cd marble-source cd marble-source
git checkout Subsurface-4.4 git checkout Subsurface-testing
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 \