From 582368322966146368300fd4281a9fdd9ff669ec Mon Sep 17 00:00:00 2001 From: "Dirk Hohndel (Intel)" Date: Tue, 2 Jun 2015 10:41:29 -0700 Subject: Build script: use Subsurface-testing branches of marble and libdivecomputer 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) --- scripts/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/build.sh') diff --git a/scripts/build.sh b/scripts/build.sh index b5e942dbe..9e510abbd 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -96,11 +96,11 @@ if [ ! -d libdivecomputer ] ; then if [[ $1 = local ]] ; then git clone $SRC/../libdivecomputer libdivecomputer 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 cd libdivecomputer -git checkout Subsurface-4.4 +git checkout Subsurface-testing if [ ! -f configure ] ; then autoreconf --install fi @@ -116,11 +116,11 @@ if [ ! -d marble-source ] ; then if [[ $1 = local ]] ; then git clone $SRC/../marble-source marble-source 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 cd marble-source -git checkout Subsurface-4.4 +git checkout Subsurface-testing mkdir -p build cd build cmake -DCMAKE_BUILD_TYPE=Release -DQTONLY=TRUE -DQT5BUILD=ON \ -- cgit v1.2.3-70-g09d2