diff options
| author |  Dirk Hohndel (Intel) <dhohndel@dhohndel-mac02.jf.intel.com> | 2015-06-02 10:41:29 -0700 |
|---|---|---|
| committer | Dirk Hohndel (Intel) <dhohndel@dhohndel-mac02.jf.intel.com> | 2015-06-02 10:41:29 -0700 |
| commit | 582368322966146368300fd4281a9fdd9ff669ec (patch) | |
| tree | 6738749a4dbdcd8cba13d20f68e66822e98997a3 /scripts | |
| parent | 3de62f5275ff5979a37ba8288d72301ad8a23ba9 (diff) | |
| download | subsurface-582368322966146368300fd4281a9fdd9ff669ec.tar.gz | |
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) <dhohndel@dhohndel-mac02.jf.intel.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.sh | 8 |
1 files changed, 4 insertions, 4 deletions
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 \ |