r38259 - in /packages/pastix/trunk/debian: control libpastix-mpi1.install libpastix-seq1.install libpastix1.install rules

saramito-guest at users.alioth.debian.org saramito-guest at users.alioth.debian.org
Mon Mar 28 10:03:47 UTC 2011


Author: saramito-guest
Date: Mon Mar 28 10:03:37 2011
New Revision: 38259

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38259
Log:
pastix: build both seq and mpi libs

Added:
    packages/pastix/trunk/debian/libpastix-mpi1.install
    packages/pastix/trunk/debian/libpastix-seq1.install
Removed:
    packages/pastix/trunk/debian/libpastix1.install
Modified:
    packages/pastix/trunk/debian/control
    packages/pastix/trunk/debian/rules

Modified: packages/pastix/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/control?rev=38259&op=diff
==============================================================================
--- packages/pastix/trunk/debian/control (original)
+++ packages/pastix/trunk/debian/control Mon Mar 28 10:03:37 2011
@@ -9,12 +9,22 @@
 Vcs-Svn:      svn://svn.debian.org/svn/debian-science/packages/pastix/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/pastix/trunk/
 
-Package: libpastix1
+Package: libpastix-seq1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: pastix-doc
-Description: Parallel sparse matrix package
+Description: Parallel sparse matrix package (sequential libraries)
+ PaStiX (Parallel Sparse matriX package) is a scientific library that
+ provides a high performance parallel solver for very large sparse
+ linear systems based on direct and block ILU(k) iterative methods.
+
+Package: libpastix-mpi1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: pastix-doc
+Description: Parallel sparse matrix package (distributed libraries)
  PaStiX (Parallel Sparse matriX package) is a scientific library that
  provides a high performance parallel solver for very large sparse
  linear systems based on direct and block ILU(k) iterative methods.
@@ -22,7 +32,7 @@
 Package: libpastix-dev
 Section: libdevel
 Architecture: any
-Depends: libpastix1(= ${binary:Version}), pastix, ${misc:Depends}
+Depends: libpastix-seq1(= ${binary:Version}), libpastix-mpi1(= ${binary:Version}), pastix, ${misc:Depends}
 Recommends: pastix-doc
 Suggests:
 Description: Parallel sparse matrix package (headers)
@@ -44,7 +54,7 @@
 Package: pastix
 Section: math
 Architecture: any
-Depends: ${shlibs:Depends}, libpastix1, ${misc:Depends}
+Depends: ${shlibs:Depends}, libpastix-seq1, libpastix-mpi1, ${misc:Depends}
 Recommends: libpastix-dev, pastix-doc
 Description: Parallel sparse matrix package
  PaStiX (Parallel Sparse matriX package) is a scientific library that

Added: packages/pastix/trunk/debian/libpastix-mpi1.install
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/libpastix-mpi1.install?rev=38259&op=file
==============================================================================
--- packages/pastix/trunk/debian/libpastix-mpi1.install (added)
+++ packages/pastix/trunk/debian/libpastix-mpi1.install Mon Mar 28 10:03:37 2011
@@ -1,0 +1,2 @@
+usr/lib/libpastix_mpi_nosmp.a
+usr/lib/libpastix_murge_mpi_nosmp.a

Added: packages/pastix/trunk/debian/libpastix-seq1.install
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/libpastix-seq1.install?rev=38259&op=file
==============================================================================
--- packages/pastix/trunk/debian/libpastix-seq1.install (added)
+++ packages/pastix/trunk/debian/libpastix-seq1.install Mon Mar 28 10:03:37 2011
@@ -1,0 +1,2 @@
+usr/lib/libpastix_seq_nosmp.a
+usr/lib/libpastix_murge_seq_nosmp.a

Modified: packages/pastix/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/rules?rev=38259&op=diff
==============================================================================
--- packages/pastix/trunk/debian/rules (original)
+++ packages/pastix/trunk/debian/rules Mon Mar 28 10:03:37 2011
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
 #
 # TODO:
-# - versions mpi-nosmp & mpi-smp simultanees
-# - idem pour smp
+# - versions  {seq,mpi}-nosmp simultanees & tester avec rheolef
+# - idem pour {seq,mpi}-smp : autres paquets binaires
+# - passer a svn-buildpackage
+# - pastix-conf : revoir le script, suivant {seq,mpi} & {smp,nosmp}
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -30,7 +32,9 @@
 	dh_testdir
 	# add here commands
 #	cp debian/config-seq-nosmp.in src/config.in
-	cp debian/config-mpi-nosmp.in src/config.in
+#	cp debian/config-mpi-nosmp.in src/config.in
+	rm -rf install_seq_nosmp
+	rm -rf install_mpi_nosmp
 	cp debian/ChangeLog ChangeLog
 	touch configure-stamp
 
@@ -38,8 +42,14 @@
 
 build-stamp: configure-stamp
 	dh_testdir
-	# add here commands
-	cd src; $(MAKE)
+	# (seq,nosmp)
+	cp debian/config-seq-nosmp.in src/config.in
+	cd src; $(MAKE) clean; $(MAKE); cd ..
+	cp -a install install_seq_nosmp
+	# (mpi,nosmp)
+	cp debian/config-mpi-nosmp.in src/config.in
+	cd src; $(MAKE) clean; $(MAKE); cd ..
+	cp -a install install_mpi_nosmp
 	touch build-stamp
 
 clean:
@@ -47,6 +57,11 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	rm -f ChangeLog
+	rm -f src/config.in
+	rm -f `find src/ -name "*.d"`
+	rm -f `find src/ -name "*.tmp"`
+	rm -rf install_seq_nosmp
+	rm -rf install_mpi_nosmp
 	dh_clean
 	rm -Rf $(TMPDIR)
 
@@ -58,22 +73,29 @@
 
 	# add here commands to install the package into DESTDIR
 	#	$(MAKE) install DESTDIR=$(CURDIR)/$(TMPDIR)
-	mkdirhier                     $(CURDIR)/$(TMPDIR)/usr/include/pastix
-	cp install/pastix.h           $(CURDIR)/$(TMPDIR)/usr/include/pastix
-	cp install/pastix_nompi.h     $(CURDIR)/$(TMPDIR)/usr/include/pastix
-	cp install/pastix_fortran.h   $(CURDIR)/$(TMPDIR)/usr/include/pastix
-	cp install/murge.h            $(CURDIR)/$(TMPDIR)/usr/include/pastix
-	cp install/murge.inc          $(CURDIR)/$(TMPDIR)/usr/include/pastix
-	mkdirhier                     $(CURDIR)/$(TMPDIR)/usr/lib
-	cp install/libpastix.a        $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_mpi_nosmp.a
-	cp install/libpastix_murge.a  $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_murge_mpi_nosmp.a
-	mkdirhier                     $(CURDIR)/$(TMPDIR)/usr/bin
-	cp -p install/p*.sh           $(CURDIR)/$(TMPDIR)/usr/bin/pastix-conf
-	mkdirhier                     $(CURDIR)/$(TMPDIR)/usr/share/man/man1
-	cp -p debian/*.1              $(CURDIR)/$(TMPDIR)/usr/share/man/man1
-	gzip -9                       $(CURDIR)/$(TMPDIR)/usr/share/man/man1/*
-	mkdirhier                     $(CURDIR)/$(TMPDIR)/usr/share/doc/pastix-doc
-	cp -p doc/refcard/refcard.pdf $(CURDIR)/$(TMPDIR)/usr/share/doc/pastix-doc/pastix-refcard.pdf
+	mkdirhier                       $(CURDIR)/$(TMPDIR)/usr/include/pastix
+	cp install/pastix.h             $(CURDIR)/$(TMPDIR)/usr/include/pastix
+	cp install/pastix_nompi.h       $(CURDIR)/$(TMPDIR)/usr/include/pastix
+	cp install/pastix_fortran.h     $(CURDIR)/$(TMPDIR)/usr/include/pastix
+	cp install/murge.h              $(CURDIR)/$(TMPDIR)/usr/include/pastix
+	cp install/murge.inc            $(CURDIR)/$(TMPDIR)/usr/include/pastix
+	cp src/sopalin/src/cscd_utils.h $(CURDIR)/$(TMPDIR)/usr/include/pastix
+
+	mkdirhier                       $(CURDIR)/$(TMPDIR)/usr/bin
+	cp -p install/pastix-conf       $(CURDIR)/$(TMPDIR)/usr/bin/pastix-conf
+	mkdirhier                       $(CURDIR)/$(TMPDIR)/usr/share/man/man1
+	cp -p debian/pastix-conf.1      $(CURDIR)/$(TMPDIR)/usr/share/man/man1
+	gzip -9                         $(CURDIR)/$(TMPDIR)/usr/share/man/man1/*
+
+	mkdirhier                       $(CURDIR)/$(TMPDIR)/usr/share/doc/pastix-doc
+	cp -p doc/refcard/refcard.pdf   $(CURDIR)/$(TMPDIR)/usr/share/doc/pastix-doc/pastix-refcard.pdf
+
+	# (seq/mpi,nosmp)
+	mkdirhier                               $(CURDIR)/$(TMPDIR)/usr/lib
+	cp install_seq_nosmp/libpastix.a        $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_seq_nosmp.a
+	cp install_seq_nosmp/libpastix_murge.a  $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_murge_seq_nosmp.a
+	cp install_mpi_nosmp/libpastix.a        $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_mpi_nosmp.a
+	cp install_mpi_nosmp/libpastix_murge.a  $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_murge_mpi_nosmp.a
 
 	dh_movefiles --sourcedir=$(TMPDIR)
 




More information about the debian-science-commits mailing list