[clasp] 03/11: debian/rules: build with cmake

Thomas Krennwallner tkren-guest at moszumanska.debian.org
Sun May 7 13:53:47 UTC 2017


This is an automated email from the git hooks/post-receive script.

tkren-guest pushed a commit to branch devel
in repository clasp.

commit 1d40176d6d4bcc4a4d9a54a68b6b9e62361bc46d
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sun May 7 12:22:57 2017 +0000

    debian/rules: build with cmake
---
 debian/rules | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 510d243..5f97d79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ arch = $(shell dpkg-architecture -qDEB_BUILD_ARCH | egrep -x "(powerpc|powerpcsp
 
 # use custom hardening config flags for compiling clasp
 CONFIG=hardening
-CONFIGPARMS = --prefix=/usr --with-mt=std
+CONFIGPARMS = -DLIB_POTASSCO_BUILD_APP=OFF -DCLASP_BUILD_TESTS=ON -DLIB_POTASSCO_BUILD_TESTS=ON -DCLASP_BUILD_EXAMPLES=ON
 TOPBUILDDIR = build/$(CONFIG)_mt
 
 #
@@ -39,22 +39,27 @@ CXXFLAGS += $(CPPFLAGS)
 %:
 	dh $@
 
-# call ./configure.sh $(CONFIGPARMS)
+# configure with cmake
 override_dh_auto_configure:
-	./configure.sh --config=$(CONFIG) $(CONFIGPARMS)
+	dh_auto_configure --builddirectory=$(TOPBUILDDIR) -- $(CONFIGPARMS)
 
-# build in $(TOPBUILDDIR)
+# build with cmake in $(TOPBUILDDIR)
 override_dh_auto_build:
 	dh_auto_build --builddirectory=$(TOPBUILDDIR)
 
 # install clasp binary built in $(TOPBUILDDIR)
 override_dh_auto_install:
-	dh_auto_install --builddirectory=$(TOPBUILDDIR) -- INSTALL_DIR=$(CURDIR)/debian/clasp/usr/bin
+	dh_auto_install --builddirectory=$(TOPBUILDDIR)
 
 # remove the whole build dir
 override_dh_auto_clean:
 	rm -rf ./build
 
+# run and output test results
+override_dh_auto_test:
+	dh_auto_test --builddirectory=$(TOPBUILDDIR)
+	test -d $(TOPBUILDDIR)/Testing/Temporary && tail -n +1 -v -- $(TOPBUILDDIR)/Testing/Temporary/*
+
 # install CHANGES as changelog
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clasp.git



More information about the debian-science-commits mailing list