diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-04-06 11:40:52 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-04-08 14:15:42 -0700 |
| commit | dc47003e5b183fafd5e0052f530a6bc44ca451fb (patch) | |
| tree | f0f8dd6ca50727e54b6ac4e6c91cf835389907bc /packaging | |
| parent | 9f532edb67848a09f90639d4295e9dd3b918bea4 (diff) | |
| download | subsurface-dc47003e5b183fafd5e0052f530a6bc44ca451fb.tar.gz | |
Update the build rules for .deb based builds
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>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/ubuntu/debian/rules | 16 | ||||
| -rw-r--r-- | packaging/ubuntu/make-package.sh | 14 |
2 files changed, 21 insertions, 9 deletions
diff --git a/packaging/ubuntu/debian/rules b/packaging/ubuntu/debian/rules index ef197521c..e1ad26a3d 100755 --- a/packaging/ubuntu/debian/rules +++ b/packaging/ubuntu/debian/rules @@ -3,10 +3,11 @@ # Uncomment this to turn on verbose mode. 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: (cd libdivecomputer ; make clean || true) @@ -32,7 +33,16 @@ override_dh_auto_configure: 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 ) - 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: dh_installchangelogs diff --git a/packaging/ubuntu/make-package.sh b/packaging/ubuntu/make-package.sh index 4942f85b7..3e00f578f 100644 --- a/packaging/ubuntu/make-package.sh +++ b/packaging/ubuntu/make-package.sh @@ -92,12 +92,14 @@ sed -i "s/${prev}/${rel}/g" debian/changelog debuild -S # and now for precise (precise can't build Qt5 based packages) -prev=vivid -rel=precise -sed -i "s/${prev}/${rel}/g" debian/changelog -cp debian/12.04.control debian/control -cp debian/12.04.rules debian/rules -debuild -S +# with the switch to cmake the amount of effort to build Qt4 packages +# on precise just doesn't seem worth it anymore +#prev=vivid +#rel=precise +#sed -i "s/${prev}/${rel}/g" debian/changelog +#cp debian/12.04.control debian/control +#cp debian/12.04.rules debian/rules +#debuild -S cd .. |