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-system: remove support for local cloning in build.sh

Browse source 
It wasn't documented in the first place (magic first argument, anyone?).

This used to be available for quite a few of the dependency and had
somehow kept around only for Grantlee and Googlemaps. Let's just kill
this and be consistent for all dependencies.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-10-06 09:42:58 +02:00
parent a83a2d8b1f
commit 5c2181daa7
1 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scripts/build.sh
View file

@ -406,19 +406,8 @@ if [ "$BUILDGRANTLEE" = "1" ] ; then
PRINTING="-DNO_PRINTING=OFF" PRINTING="-DNO_PRINTING=OFF"
cd $SRC cd $SRC
./subsurface/scripts/get-dep-lib.sh single . grantlee
if [ ! -d grantlee ] ; then pushd grantlee
if [[ $1 = local ]] ; then
git clone $SRC/../grantlee grantlee
else
git clone https://github.com/steveire/grantlee.git
fi
fi
cd grantlee
if ! git checkout v5.0.0 ; then
echo "can't check out v5.0.0 of grantlee -- giving up"
exit 1
fi
mkdir -p build mkdir -p build
cd build cd build
cmake $OLDER_MAC_CMAKE -DCMAKE_BUILD_TYPE=$DEBUGRELEASE \ cmake $OLDER_MAC_CMAKE -DCMAKE_BUILD_TYPE=$DEBUGRELEASE \
@ -427,6 +416,7 @@ if [ "$BUILDGRANTLEE" = "1" ] ; then
$SRC/grantlee $SRC/grantlee
make -j4 make -j4
make install make install
popd
else else
PRINTING="-DNO_PRINTING=ON" PRINTING="-DNO_PRINTING=ON"
fi fi
@ -435,17 +425,8 @@ if [ "$SKIP_GOOGLEMAPS" != "1" ] ; then
# build the googlemaps map plugin # build the googlemaps map plugin
cd $SRC cd $SRC
if [ ! -d googlemaps ] ; then ./subsurface/scripts/get-dep-lib.sh single . googlemaps
if [[ $1 = local ]] ; then pushd googlemaps
git clone $SRC/../googlemaps googlemaps
else
git clone https://github.com/Subsurface-divelog/googlemaps.git
fi
fi
cd googlemaps
git checkout master
git pull --rebase
mkdir -p build mkdir -p build
mkdir -p J10build mkdir -p J10build
cd build cd build
@ -458,6 +439,7 @@ if [ "$SKIP_GOOGLEMAPS" != "1" ] ; then
cat Makefile.bak | sed -e 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' > Makefile cat Makefile.bak | sed -e 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' > Makefile
make -j4 make -j4
make install make install
popd
fi fi
# finally, build Subsurface # finally, build Subsurface