[adios] 110/207: Prep python3 test

[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 a5c29a156c6431208ea82cafc73d81b8c354753c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 19 14:12:06 2014 +0100

    Prep python3 test
---
 debian/control               | 21 +++++++++++++++++++--
 debian/python3-adios.install |  1 +
 debian/rules                 | 25 +++++++++++++++++--------
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index ab0ab54..0e49d49 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), libnetcdf-dev, gfortran, libhdf5-mpi-dev | libhdf5-dev, libmxml-dev, 
   mpi-default-dev, autotools-dev, cmake, libbz2-dev, libibverbs-dev, 
-  python-dev, python-numpy, python3-dev, cython,  dh-python, python-mpi4py
+  python-dev, python-numpy, dh-python, python3-mpi4py, cython,
+  python3-dev, python3-numpy,  dh-python, python3-mpi4py, cython3
 Standards-Version: 3.9.5
 Homepage: http://www.olcf.ornl.gov/center-projects/adios/
 X-Python-Version: 2.7
@@ -45,7 +46,7 @@ Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Section: python
 Architecture: any
 Provides: ${python:Provides}
-Description: Python interace to the ADISO IO system
+Description: Python interace to the ADIOS IO system
  This is a Python2 interface to ADIOS.
  .
  The Adaptable IO System (ADIOS) provides a simple, flexible way for scientists
@@ -56,3 +57,19 @@ Description: Python interace to the ADISO IO system
  (either Fortran or C) can transparently change how they process the data.
  .
 
+Package: python3-adios
+Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Section: python
+Architecture: any
+Provides: ${python:Provides}
+Description: Python3 interace to the ADIOS IO system
+ This is a Python3 interface to ADIOS.
+ .
+ The Adaptable IO System (ADIOS) provides a simple, flexible way for scientists
+ to describe the data in their code that may need to be written, read,
+ or processed outside of the running simulation. By providing an external
+ to the code XML file describing the various elements, their types, and
+ how you wish to process them this run, the routines in the host code
+ (either Fortran or C) can transparently change how they process the data.
+ .
+
diff --git a/debian/python3-adios.install b/debian/python3-adios.install
new file mode 100644
index 0000000..6c0fe10
--- /dev/null
+++ b/debian/python3-adios.install
@@ -0,0 +1 @@
+wrappers/numpy/build3/adios.so	/usr/lib/python3.4/adios
diff --git a/debian/rules b/debian/rules
index 2afa000..c6d385a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,13 +61,21 @@ override_dh_auto_configure:
 	dh_auto_configure --  $(WITH_LUSTRE) --enable-shared \
 		--with-hdf5=/usr --with-bzip2=/usr --prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) CFLAGS='-fPIC'
 	# Prep python wrapper. Cache these for cmake otherwise it will get 2.7, 3.* confused
-	mkdir -p wrappers/numpy/build
-	echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/build/CMakeCache.txt
-	echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7" >> wrappers/numpy/build/CMakeCache.txt
-	echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/x86_64-linux-gnu/python2.7" >> wrappers/numpy/build/CMakeCache.txt
-	echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython2.7.so" >> wrappers/numpy/build/CMakeCache.txt
-	echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build/CMakeCache.txt
-	echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build/CMakeCache.txt
+	mkdir -p wrappers/numpy/build2
+	echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/build2CMakeCache.txt
+	echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7" >> wrappers/numpy/build2/CMakeCache.txt
+	echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/$(DEB_HOST_MULTIARCH)/python2.7" >> wrappers/numpy/build2/CMakeCache.txt
+	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.
+	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
+		
 
 override_dh_auto_build:
 	# First do a build shared, with -fPIC, for the python lib.
@@ -75,7 +83,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/build && PATH=$(TOP):$(PATH) cmake .. && $(MAKE) VERBOSE=1 )
+	( cd wrappers/numpy/build2 && PATH=$(TOP):$(PATH) cmake .. && $(MAKE) VERBOSE=1 )
+	( cd wrappers/numpy/build3 && PATH=$(TOP):$(PATH) cmake .. && $(MAKE) VERBOSE=1 )
 	# 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