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

Update INSTALL and build.sh

Browse source 
They now reference the Subsurface-branch branches of Marble and
libdivecomputer and v0.23.1 of libgit2.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-08-26 11:44:56 -07:00
parent 57e15bf789
commit 80e7213582
2 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/build.sh
View file

@ -78,8 +78,8 @@ fi
cd libgit2
# let's build with a recent enough version of master for the latest features
git pull origin master
if ! git checkout c11daac9de2 ; then
echo "Can't find the right commit in libgit2 - giving up"
if ! git checkout v0.23.1 ; then
echo "Can't find the right tag in libgit2 - giving up"
exit 1
fi
mkdir -p build
@ -106,13 +106,13 @@ if [ ! -d libdivecomputer ] ; then
if [[ $1 = local ]] ; then
git clone $SRC/../libdivecomputer libdivecomputer
else
git clone -b Subsurface-testing git://subsurface-divelog.org/libdc libdivecomputer
git clone -b Subsurface-branch git://subsurface-divelog.org/libdc libdivecomputer
fi
fi
cd libdivecomputer
git pull --rebase
if ! git checkout Subsurface-testing ; then
echo "can't check out the Subsurface-testing branch of libdivecomputer -- giving up"
if ! git checkout Subsurface-branch ; then
echo "can't check out the Subsurface-branch branch of libdivecomputer -- giving up"
exit 1
fi
if [ ! -f configure ] ; then
@ -130,13 +130,13 @@ if [ ! -d marble-source ] ; then
if [[ $1 = local ]] ; then
git clone $SRC/../marble-source marble-source
else
git clone -b Subsurface-testing git://subsurface-divelog.org/marble marble-source
git clone -b Subsurface-branch git://subsurface-divelog.org/marble marble-source
fi
fi
cd marble-source
git pull --rebase
if ! git checkout Subsurface-testing ; then
echo "can't check out the Subsurface-testing branch of marble -- giving up"
if ! git checkout Subsurface-branch ; then
echo "can't check out the Subsurface-branch branch of marble -- giving up"
exit 1
fi
mkdir -p build