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

remove Marble from packaging and build scripts

Browse source 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>

---
please note, that i have no way to test most of the scripts ATM.
This commit is contained in:
Lubomir I. Ivanov 2017-09-02 14:39:37 +03:00 • committed by Dirk Hohndel
parent 4bb180b117
commit 2b40e15713
10 changed files with 15 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

13
packaging/ubuntu/debian/rules
View file

@ -13,7 +13,6 @@ override_dh_auto_clean:
(cd libdivecomputer ; make clean || true)
make clean || true
rm -rf libgit2/build
rm -rf marble-build
rm -f ssrf-version.h
rm -f subsurface
rm -f Makefile
@ -23,16 +22,6 @@ override_dh_auto_configure:
(mkdir libgit2/build ; cd libgit2/build ; \
cmake -DBUILD_SHARED_LIBS=OFF -DBUILD_CLAR=OFF -DBUILD_EXAMPLES=OFF .. ; \
sed -i 's/.so$/.a/' CMakeCache.txt ; make -j8 )
(mkdir marble-build ; cd marble-build ; \
cmake -DQTONLY=ON -DQT5BUILD=ON \
-DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF \
-DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF \
-DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \
-DBUILD_WITH_DBUS=OFF ../marble-source ; \
make -j8 ; \
ln -s src/lib/marble lib ; \
mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; done ; \
ln -s . marble )
(mkdir subsurface-build ; cd subsurface-build ; \
cmake -DCMAKE_BUILD_TYPE=Release \
-DPREFER_GIT_FROMSOURCE=1 \
@ -40,8 +29,6 @@ override_dh_auto_configure:
-DLIBGIT2_LIBRARIES=$$(pwd)/../libgit2/build/libgit2.a \
-DLIBDIVECOMPUTER_INCLUDE_DIR=$$(pwd)/../libdivecomputer/include \
-DLIBDIVECOMPUTER_LIBRARIES=$$(pwd)/../libdivecomputer/src/.libs/libdivecomputer.a \
-DMARBLE_INCLUDE_DIR=$$(pwd)/../marble-build/include \
-DMARBLE_LIBRARIES=$$(pwd)/../marble-build/lib/libssrfmarblewidget.so \
$$(pwd)/.. ; )
override_dh_installchangelogs:

2
packaging/ubuntu/make-package.sh
View file

@ -38,7 +38,7 @@ if [[ ! -d subsurface_$VERSION ]]; then
#
(cd subsurface ; tar cf - . ) | (cd subsurface_$VERSION ; tar xf - )
cd subsurface_$VERSION;
rm -rf .git libdivecomputer/.git libgit2/.git marble-source/.git
rm -rf .git libdivecomputer/.git libgit2/.git
echo $GITVERSION > .gitversion
echo $LIBDCREVISION > libdivecomputer/revision
# dh_make --email dirk@hohndel.org -c gpl2 --createorig --single --yes -p subsurface_$VERSION