[adios] 117/207: Support multiple python3 versions please

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit 7675f7ef7cfc900078a987f3c3f868af162be712
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 19 15:28:26 2014 +0100

    Support multiple python3 versions please
---
 debian/rules | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2708c5e..1d6afa9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,7 @@ DESTDIR:=$(shell pwd)/debian/tmp
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 BINDIR:=$(DESTDIR)/usr/bin
+PY3VERS:= $(shell py3versions -s)
 
 TOP:=$(shell pwd)
 
@@ -56,6 +57,7 @@ override_dh_auto_clean:
 	dh_clean
 	find . -name '*.pyc' -delete
 	rm -fr wrappers/numpy/build wrappers/java/build
+	rm -f debian/python3-adios.install
 
 override_dh_auto_configure:
 	dh_auto_configure --  $(WITH_LUSTRE) --enable-shared \
@@ -68,14 +70,17 @@ override_dh_auto_configure:
 	echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython2.7.so" >> wrappers/numpy/build2/CMakeCache.txt
 	echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build2/CMakeCache.txt
 	echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build2/CMakeCache.txt
-	# And repeat.
-	mkdir -p wrappers/numpy/build3
-	echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/build3/CMakeCache.txt
-	echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/python3.4" >> wrappers/numpy/build3/CMakeCache.txt
-	echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/$(DEB_HOST_MULTIARCH)/python3.4" >> wrappers/numpy/build3/CMakeCache.txt
-	echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython3.4m.so" >> wrappers/numpy/build3/CMakeCache.txt
-	echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build3/CMakeCache.txt
-	echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build3/CMakeCache.txt
+	# And repeat for python3*
+	for p in $(PY3VERS) ; do \
+	mkdir -p wrappers/numpy/build_$$p ; \
+		echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/builds_$$(p)/CMakeCache.txt ;\
+		echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/$$(p)" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
+		echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/$(DEB_HOST_MULTIARCH)/$$(p)" >> wrappers/numpy/builds_$$p/CMakeCache.txt ;\
+		echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/lib$$(p)m.so" >> wrappers/numpy/build_$$p/CMakeCache.txt ;\
+		echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build_$pp/CMakeCache.txt ;\
+		echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build_$pp/CMakeCache.txt ;\
+		echo "wrappers/numpy/build_$$p/adios.so	/usr/lib/python3/dist-packages/adios" >> debian/python3-adios.install ; \
+	done
 		
 
 override_dh_auto_build:
@@ -84,8 +89,8 @@ override_dh_auto_build:
 	# Need to hack the libs into the right place, to match adios_configs view
 	mv debian/tmp/lib/*/*.a debian/tmp/lib
 	# Now build Python wrapper. Uses adios_config and the debian/tmp install.
-	( cd wrappers/numpy/build2 && PATH=$(TOP):$(PATH) cmake .. && $(MAKE) VERBOSE=1 )
-	( cd wrappers/numpy/build3 && PATH=$(TOP):$(PATH) cmake .. && $(MAKE) VERBOSE=1 )
+	for p in $(PY3VERS) ; do \
+		( cd wrappers/numpy/build_$$p && PATH=$(TOP):$(PATH) cmake .. && $(MAKE) VERBOSE=1 ) ; done
 	# Clean up.
 	rm -r debian/tmp/*
 	# Now do the static build we want.

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