[ecflow] 34/50: Do py2, py3 builds

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository ecflow.

commit f28fdc95259eee9624ae3be98832fb762d864075
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jul 15 16:11:15 2017 +0100

    Do py2, py3 builds
---
 debian/rules | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/debian/rules b/debian/rules
index 5f8161b..e867be2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,37 +16,42 @@ DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 AUTOGENERATED:= ecflow-server.install ecflow-client.install libecflow_view0.install
-PY2:= python2.7
 PY3:=$(shell py3versions -d)
-PY3AB:=$(shell py3versions -d | sed -e 's/python/py/' )
+PY3AB:=$(shell py3versions -d | sed -e 's/python3\./py3/' )
+PY3VER:=$(shell py3versions -d | sed -e 's/python//' ) 
+
+CMAKE_COMMON_FLAGS = \
+                -DCMAKE_BUILD_TYPE=Release \
+		-DBOOST_INCLUDEDIR=/usr/include \
+		-DBOOSTROOT=$(LIBDIR)	\
+		-DENABLE_STATIC_BOOST_LIBS=OFF \
+		-DENABLE_SSL=OFF \
+		-DCMAKE_C_CFLAGS="${CFLAGS} ${LDFLAGS}"  \
 
 override_dh_auto_clean:
-	rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
 	dh_auto_clean
+	rm -f $(patsubst %, debian/%, ${AUTOGENERATED}) debian/build-*
 	find . -name '*.pyc' -delete
 	find . -name '*.job*' -delete
 
 # For the moment set ENABLE_SSL=OFF. Enabling it fails tests
 
 override_dh_auto_configure:
-	echo PY3AB = ${PY3AB}
 	for f in ${AUTOGENERATED} ; do \
 		sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > debian/$$f ; \
                 done
-	dh_auto_configure -- \
-                -DCMAKE_BUILD_TYPE=Release \
-		-DBOOST_INCLUDEDIR=/usr/include \
-		-DBOOSTROOT=$(LIBDIR)	\
-		-DENABLE_STATIC_BOOST_LIBS=OFF \
-		-DENABLE_SSL=OFF \
-		-DCMAKE_C_CFLAGS="${CFLAGS} ${LDFLAGS}"  \
-		-DPYTHON_MIN_VERSION=3.5 \
-		-DBoost_PYTHON_LIBRARY_DEBUG=$(LIBDIR)/libboost_python-${PY3AB}.so \
+	dh_auto_configure -- --builddirectory=debian/build-py2 \
+		${CMAKE_COMMON_FLAGS} \
+		-DPYTHON_MIN_VERSION=2.7 \
+		-DBoost_PYTHON_LIBRARY_RELEASE=$(LIBDIR)/libboost_python-py27.so
+	dh_auto_configure -- --builddirectory=debian/build-py3 \
+		${CMAKE_COMMON_FLAGS} \
+		-DPYTHON_MIN_VERSION=${PY3VER} \
 		-DBoost_PYTHON_LIBRARY_RELEASE=$(LIBDIR)/libboost_python-${PY3AB}.so
 
-
-#		-DPYTHON_LIBRARY=$(LIBDIR)/lib$(PY3)m.so \
-# 		-DPYTHON_INCLUDE_DIR=/usr/include/$(PY3) \
+override_dh_auto_build:
+        dh_auto_build  --builddirectory=debian/build-py2
+        dh_auto_build  --builddirectory=debian/build-py3
 
 override_dh_auto_install:
 	dh_auto_install

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