diff options
author | Lubomir I. Ivanov <neolit123@gmail.com> | 2017-09-02 14:39:37 +0300 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2017-09-04 07:46:35 -0700 |
commit | 2b40e15713e2ccb8963ff8c1eb57f9374e04547d (patch) | |
tree | 1da96921b5d5bd887a20b83c13f17089fca5445b /scripts | |
parent | 4bb180b1178d293de4c55099a23d70d385e517d9 (diff) | |
download | subsurface-2b40e15713e2ccb8963ff8c1eb57f9374e04547d.tar.gz |
remove Marble from packaging and build scripts
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
---
please note, that i have no way to test most of the scripts ATM.
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/build.sh | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index cf58b659a..0fd8de8d7 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -3,7 +3,6 @@ # this should be run from the src directory, the layout is supposed to # look like this: #.../src/subsurface -# /marble-source # /libdivecomputer # # the script will build these three libraries from source, even if @@ -37,11 +36,6 @@ while [[ $# -gt 0 ]] ; do # is still available on Linux distros) BUILD_WITH_WEBKIT="1" ;; - -build-with-marble) - # by default we build with QtLocation based maps - # in order to use the old maps, you need to enable this option but also have webkit (see previous option) - BUILD_WITH_MARBLE="1" - ;; -mobile) # we are building Subsurface-mobile BUILD_MOBILE="1" @@ -397,51 +391,6 @@ else EXTRA_OPTS="-DNO_USERMANUAL=ON -DFBSUPPORT=OFF" fi -# build libssrfmarblewidget - -if [ "$BUILD_WITH_MARBLE" = "1" ]; then - EXTRA_OPTS="-DMARBLE_INCLUDE_DIR=$INSTALL_ROOT/include \ - -DMARBLE_LIBRARIES=$INSTALL_ROOT/lib/libssrfmarblewidget.$SH_LIB_EXT \ - -DNO_MARBLE=OFF $EXTRA_OPTS" - if [ ! -d marble-source ] ; then - if [[ $1 = local ]] ; then - git clone $SRC/../marble-source marble-source - else - git clone -b Subsurface-branch https://github.com/Subsurface-divelog/marble.git marble-source - fi - fi - cd marble-source - git pull --rebase - 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 - cd build - - cmake $OLDER_MAC_CMAKE -DCMAKE_BUILD_TYPE=Release -DQTONLY=TRUE -DQT5BUILD=ON \ - -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT \ - -DBUILD_MARBLE_TESTS=NO \ - -DWITH_DESIGNER_PLUGIN=NO \ - -DBUILD_MARBLE_APPS=NO \ - $SRC/marble-source - cd src/lib/marble - make -j4 - make install - - if [ $PLATFORM = Darwin ] ; then - # in order for macdeployqt to do its job correctly, we need the full path in the dylib ID - cd $INSTALL_ROOT/lib - NAME=$(otool -L libssrfmarblewidget.dylib | grep -v : | head -1 | cut -f1 -d\ | tr -d '\t' | cut -f3 -d/ ) - echo $NAME | grep / > /dev/null 2>&1 - if [ $? -eq 1 ] ; then - install_name_tool -id "$INSTALL_ROOT/lib/$NAME" "$INSTALL_ROOT/lib/$NAME" - fi - fi -else - EXTRA_OPTS="-DNO_MARBLE=ON $EXTRA_OPTS" -fi - if [ "$BUILDGRANTLEE" = "1" ] ; then # build grantlee PRINTING="-DNO_PRINTING=OFF" |