[magics] 13/63: Do 2 builds, py2 and py3

[Alastair McKinstry]

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

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

commit f38e675b3b308b59d8b98461b79f06655310a9bb
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 13 03:54:32 2016 +0100

    Do 2 builds, py2 and py3
---
 debian/rules | 56 +++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/debian/rules b/debian/rules
index c442e7b..f69f11f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,30 @@
 #!/usr/bin/make -f
 
-BUILDDIR = $(CURDIR)/debian/build
+export DH_VERBOSE=1
 
 # To enable all, uncomment following line
-
 # DEB_BUILD_MAINT_OPTIONS:= hardening=+all,-pie
-CXXFLAGS:= -fPIC $(shell dpkg-buildflags --get CXXFLAGS)
+CXXFLAGS:= -fPIC $(shell dpkg-buildflags --get CXXFLAGS) # -std=c++11
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export QT_SELECT=5
 
-PYVERS:=$(shell pyversions -s)
-PY3VERS:=$(shell py3versions -s)
-
 LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 AUTOGENERATED:= libmagplus3v5.links libmagics++-dev.links libmagplus3v5.install
 # Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 %:
-	dh $@  --with python2,python3 --with-buildsystem=cmake --builddirectory=$(BUILDDIR)
+	dh $@ --parallel --with python2,python3 --with-buildsystem=cmake
 
-export extra_flags += \
+# To fix cmake output change these
+OLD_GF_PATH=$(shell gfortran -print-search-dirs | grep install | cut -f2 -d' '  )libgfortran.so
+NEW_GF_PATH:=$(LIBDIR)/libgfortran.so.3
+
+export extra_flags +=  \
+	-DCMAKE_PREFIX_PATH=${LIBDIR}/cmake/grib_api \
 	-DBUILD_SITE=debian \
-	-DHAVE_LIBGD=1 \
+	-DENABLE_LIBGD=1 \
 	-DHAVE_BOOST=1 \
 	-DHAVE_DLFCN_H=1 \
 	-DHAVE_INTTYPES_H=1 \
@@ -45,7 +46,6 @@ export extra_flags += \
 	-DMAGICS_JSON=1 \
 	-DMAGICS_METVIEW=1 \
 	-DMAGICS_GIF=1 \
-	-DMAGICS_QT=1 \
 	-DMAGICS_GIF_ANIMATED=1 \
 	-DMAGICS_TIFF=1 \
 	-DMAGICS_TTF=1 \
@@ -62,19 +62,22 @@ export extra_flags += \
 	-DENABLE_PYTHON=ON \
 	-DBUILD_EXAMPLES=ON \
 	-DBUILD_SHARED_LIBS=ON \
-	-DENABLE_TESTS=OFF \
+	-DENABLE_TESTS=ON \
+	-DENABLE_GEOTIFF=ON \
 	-DENABLE_RPATHS=OFF \
 	-DENABLE_CAIRO=ON \
 	-DENABLE_BUFR=ON \
 	-DENABLE_GRIB=ON \
 	-DENABLE_METVIEW=ON \
+	-DENABLE_QT5=ON \
 	-DENABLE_NETCDF=ON \
-	-DCMAKE_CXX_FLAGS='$(CXXFLAGS) -I/usr/include/terralib -I/usr/include/terralib/kernel' \
-	-DMAGICS_EXTRA_LIBRARIES='-lterralib -lgd'
+	-DCMAKE_CXX_FLAGS='$(CXXFLAGS) -I/usr/include/terralib -I/usr/include/terralib/kernel -I/usr/include/geotiff' \
+	-DMAGICS_EXTRA_LIBRARIES='-lterralib -lgd -lemosR64' 
 
 export LD_LIBRARY_PATH:=$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)
 
 override_dh_auto_clean:
+	rm -rf debian/build-py*
 	find . -type l -delete
 	rm -f src/params/*.h src/decoders/*Attributes.h
 	rm -rf share/magics/ttf src/terralib debian/build
@@ -83,22 +86,30 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	# link for font for tesing.
 	mkdir -p share/fonts/truetype/ttf-dejavu/
-	cp -a python python3
 	ln -sf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf share/fonts/truetype/ttf-dejavu/
 	# Link terralib
 	[ -e src/terralib ] || ln -sf  /usr/include/terralib src/terralib
 	for f in ${AUTOGENERATED} ; do \
                 sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > debian/$$f ; \
                 done
-	dh_auto_configure -- $(extra_flags)
-	(cd python/Magics && ln -s $(BUILDDIR)/python/Magics/Magics.i )
+	dh_auto_configure --builddirectory=debian/build-py3 -- \
+		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
+	       	$(extra_flags) 
+	dh_auto_configure --builddirectory=debian/build-py2 -- \
+		-DPYTHON_EXECUTABLE=/usr/bin/python \
+	       	$(extra_flags) 
+	(cd python/Magics && ln -s $(CURDIR)/debian/build-py3/python/Magics/Magics.i )
+
+override_dh_auto_build:
+	dh_auto_build  --builddirectory=debian/build-py2
+	dh_auto_build  --builddirectory=debian/build-py3
 
 override_dh_auto_test check:
 	# echo "Tests disabled; see README-testfailures.txt for details"
 	# (ulimit -s 8192; export PYTHONPATH=$(shell pwd)/swig ; export MAGPLUS_HOME=$(shell pwd) ; $(MAKE) check )
 
 override_dh_auto_install:
-	$(MAKE) -C debian/build/python/Magics clean install PYTHON_INCLUDE_DIR=/usr/include/$(PYVERS) \
+	$(MAKE) -C debian/build/python/Magics clean install PYTHON_INCLUDE_DIR=/usr/include/python2.7 \
 			DESTDIR=$(CURDIR)/debian/python-magics++ \ MAGPLUS_HOME=$(CURDIR) 
 	dh_auto_install
 	# Move lib stuff
@@ -111,11 +122,10 @@ override_dh_auto_install:
 	sed -e 's%$${_IMPORT_PREFIX}/lib%$(LIBDIR)%' \
 		< debian/tmp/usr/share/magics/cmake/magics-targets-none.cmake \
 	| sed -e 's%$${_IMPORT_PREFIX}/bin%/usr/bin%' \
+	| sed -e 's%$(OLD_GF_PATH)%$(NEW_GF_PATH)%'   \
 		> debian/tmp/$(LIBDIR)/cmake/magics/magics-targets-none.cmake
 	rm -r debian/tmp/usr/share/magics/cmake
-	dh_python2 /usr/lib/$(PYVERS)/site-packages/Magics
-	dh_python3 /usr/lib/$(PY3VERS)/site-packages/Magics
+	dh_python2 /usr/lib/python2.7/site-packages/Magics
 	dh_numpy -p python-magics++
-	dh_numpy3 -p python3-magics++
-	find debian/tmp debian/python-magics++ debian/python3-magics++  -name '*.so*' -exec chrpath -d {} \;
-	find debian/tmp/usr/bin -type f  -exec chrpath -d {} \;
+	find debian/tmp debian/python-magics++  -name '*.so*' -exec chrpath -d {} \;
+	-find debian/tmp/usr/bin -type f  -exec chrpath -d {} \;

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