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: remove --skip-googlemaps build option

Browse source 
The scripts/build.sh script has an option --skip-googlemaps. Introduced
in 2017 at a moment the Travis Mac build failed on this. Interestingly,
when Mac building of the maps plugin was possible again (commit 79e3f69f48)
the --skip-googlemaps stayed. Obviously, this hack was never intended
to be used for anything else then getting it passed Travis on
some point in time for a specific Mac build.

So, remove this option.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2019-01-06 18:39:02 +01:00 • committed by Dirk Hohndel
parent 0903bef9db
commit 4b7b0f2dec
1 changed files with 18 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

42
scripts/build.sh
View file

@ -59,17 +59,13 @@ while [[ $# -gt 0 ]] ; do
# we are building an AppImage as by product # we are building an AppImage as by product
CREATE_APPDIR="1" CREATE_APPDIR="1"
;; ;;
-skip-googlemaps)
# hack for Travix Mac build
SKIP_GOOGLEMAPS="1"
;;
-release) -release)
# don't build Debug binaries # don't build Debug binaries
DEBUGRELEASE="Release" DEBUGRELEASE="Release"
;; ;;
*) *)
echo "Unknown command line argument $arg" echo "Unknown command line argument $arg"
echo "Usage: build.sh [-no-bt] [-build-deps] [-build-with-webkit] [-mobile] [-desktop] [-both] [-create-appdir] [-skip-googlemaps] [-release]" echo "Usage: build.sh [-no-bt] [-build-deps] [-build-with-webkit] [-mobile] [-desktop] [-both] [-create-appdir] [-release]"
exit 1 exit 1
;; ;;
esac esac
@ -421,27 +417,25 @@ else
PRINTING="-DNO_PRINTING=ON" PRINTING="-DNO_PRINTING=ON"
fi fi
if [ "$SKIP_GOOGLEMAPS" != "1" ] ; then # build the googlemaps map plugin
# build the googlemaps map plugin
cd $SRC cd $SRC
./subsurface/scripts/get-dep-lib.sh single . googlemaps ./subsurface/scripts/get-dep-lib.sh single . googlemaps
pushd googlemaps pushd googlemaps
mkdir -p build mkdir -p build
mkdir -p J10build mkdir -p J10build
cd build cd build
$QMAKE "INCLUDEPATH=$INSTALL_ROOT/include" ../googlemaps.pro $QMAKE "INCLUDEPATH=$INSTALL_ROOT/include" ../googlemaps.pro
# on Travis the compiler doesn't support c++1z, yet qmake adds that flag; # on Travis the compiler doesn't support c++1z, yet qmake adds that flag;
# since things compile fine with c++11, let's just hack that away # since things compile fine with c++11, let's just hack that away
# similarly, don't use -Wdata-time # similarly, don't use -Wdata-time
if [ "$TRAVIS" = "true" ] ; then if [ "$TRAVIS" = "true" ] ; then
mv Makefile Makefile.bak mv Makefile Makefile.bak
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
fi
make -j4
make install
popd
fi fi
make -j4
make install
popd
# finally, build Subsurface # finally, build Subsurface