mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-07 19:43:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update the build rules for .deb based builds

Browse source 
With this we also give up on building daily builds on Ubuntu 12.04
The cmake based infrastructure very much assumes Qt5 at this point.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-04-06 11:40:52 -07:00
parent 9f532edb67
commit dc47003e5b
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
packaging/ubuntu/debian/rules
View file

@ -3,10 +3,11 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
export DH_VERBOSE=1 export DH_VERBOSE=1
export DEB_BUILD_OPTIONS+=nocheck
export DEB_CMAKE_INSTALL_PREFIX=/usr
%: %:
dh $@ dh $@ --buildsystem=cmake --builddirectory=subsurface-build --parallel
override_dh_auto_clean: override_dh_auto_clean:
(cd libdivecomputer ; make clean || true) (cd libdivecomputer ; make clean || true)
@ -32,7 +33,16 @@ override_dh_auto_configure:
ln -s src/lib/marble lib ; \ ln -s src/lib/marble lib ; \
mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; done ; \ mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; done ; \
ln -s . marble ) ln -s . marble )
qmake LIBDCDEVEL=./libdivecomputer LIBGIT2DEVEL=./libgit2 LIBGIT2STATIC=1 LIBMARBLEDEVEL=./marble-build SPECIAL_MARBLE_PREFIX=1 subsurface.pro (mkdir subsurface-build ; cd subsurface-build ; \
cmake -DCMAKE_BUILD_TYPE=Release \
-DPREFER_GIT_FROMSOURCE=1 \
-DLIBGIT2_INCLUDE_DIR=$$(pwd)/../libgit2/include \
-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: override_dh_installchangelogs:
dh_installchangelogs dh_installchangelogs

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

@ -92,12 +92,14 @@ sed -i "s/${prev}/${rel}/g" debian/changelog
debuild -S debuild -S
# and now for precise (precise can't build Qt5 based packages) # and now for precise (precise can't build Qt5 based packages)
prev=vivid # with the switch to cmake the amount of effort to build Qt4 packages
rel=precise # on precise just doesn't seem worth it anymore
sed -i "s/${prev}/${rel}/g" debian/changelog #prev=vivid
cp debian/12.04.control debian/control #rel=precise
cp debian/12.04.rules debian/rules #sed -i "s/${prev}/${rel}/g" debian/changelog
debuild -S #cp debian/12.04.control debian/control
#cp debian/12.04.rules debian/rules
#debuild -S
cd .. cd ..