diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-06 09:42:58 +0200 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-10-07 14:00:45 -0700 |
| commit | 5c2181daa796b50901272cb74843cf575c3e90eb (patch) | |
| tree | 8388699abd275501a45572618a27b83a494ebb7f /scripts/build.sh | |
| parent | a83a2d8b1f1609b3ad6f2eef5fa5c0202bae41e5 (diff) | |
| download | subsurface-5c2181daa796b50901272cb74843cf575c3e90eb.tar.gz | |
build-system: remove support for local cloning in build.sh
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>
Diffstat (limited to 'scripts/build.sh')
| -rwxr-xr-x | scripts/build.sh | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 54c194b10..96179bcc4 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -406,19 +406,8 @@ if [ "$BUILDGRANTLEE" = "1" ] ; then PRINTING="-DNO_PRINTING=OFF" cd $SRC - - if [ ! -d grantlee ] ; then - 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 + ./subsurface/scripts/get-dep-lib.sh single . grantlee + pushd grantlee mkdir -p build cd build cmake $OLDER_MAC_CMAKE -DCMAKE_BUILD_TYPE=$DEBUGRELEASE \ @@ -427,6 +416,7 @@ if [ "$BUILDGRANTLEE" = "1" ] ; then $SRC/grantlee make -j4 make install + popd else PRINTING="-DNO_PRINTING=ON" fi @@ -435,17 +425,8 @@ if [ "$SKIP_GOOGLEMAPS" != "1" ] ; then # build the googlemaps map plugin cd $SRC - if [ ! -d googlemaps ] ; then - if [[ $1 = local ]] ; then - 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 - + ./subsurface/scripts/get-dep-lib.sh single . googlemaps + pushd googlemaps mkdir -p build mkdir -p J10build 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 make -j4 make install + popd fi # finally, build Subsurface |