From: <and...@us...> - 2007-06-18 12:38:35
|
Revision: 7720 http://plplot.svn.sourceforge.net/plplot/?rev=7720&view=rev Author: andrewross Date: 2007-06-18 05:38:37 -0700 (Mon, 18 Jun 2007) Log Message: ----------- Re-enable building of debian python packages using CBS. Will now build python support for multiple versions of python. Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-06-18 08:22:46 UTC (rev 7719) +++ trunk/debian/rules 2007-06-18 12:38:37 UTC (rev 7720) @@ -30,7 +30,7 @@ CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ -DBUILD_DOC=ON -DCMAKE_INSTALL_PREFIX=/usr -BUILD_DIR = debian/build_tmp +BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) config: config-stamp @@ -62,12 +62,11 @@ rm -rf $(debbase)/$(libpkg) dh_clean -#install: install-stamp install-python -install: install-stamp +install: install-stamp install-python dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \ --no-package=plplot-bin --no-package=python-plplot dh_movefiles -i -# dh_movefiles --package=python-plplot + dh_movefiles --package=python-plplot dh_movefiles --package=libplplot-dev dh_movefiles --package=plplot-bin dh_movefiles --package=$(libpkg) @@ -109,7 +108,7 @@ install-python%: build-stamp ( cd $(BUILD_DIR) ; \ - PYTHON=python$* cmake $(BUILD_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON ; \ + cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DENABLE_pygcw=ON -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH=/usr/include/python$* -DNUMERIC_INCLUDE_PATH=/usr/include/python$*/Numeric ; \ for d in gnome2/python python ; do \ ( cd bindings/$$d; \ $(MAKE) clean ; \ @@ -140,8 +139,8 @@ dh_installdocs --package=$(libpkg) --package=libcsiro0 dh_installchangelogs --package=$(libpkg) --package=libcsiro0 -# dh_pycentral --package=python-plplot -# dh_python --package=python-plplot + dh_pycentral --package=python-plplot + dh_python --package=python-plplot dh_strip -a dh_compress -a -Xexamples/ dh_fixperms -a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-10-22 15:23:49
|
Revision: 7965 http://plplot.svn.sourceforge.net/plplot/?rev=7965&view=rev Author: andrewross Date: 2007-10-22 08:23:53 -0700 (Mon, 22 Oct 2007) Log Message: ----------- OCTAVE_OCT_DIR needs to be added to the cmake command line, not to the make install command line. The .oct file now appears correctly under the apiv?? directory. In theory this would allow multiple versions of octave to be supported through the debian packages. Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-10-22 15:22:00 UTC (rev 7964) +++ trunk/debian/rules 2007-10-22 15:23:53 UTC (rev 7965) @@ -34,6 +34,7 @@ -DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \ -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \ + -DOCTAVE_OCT_DIR=${OCTDIR} \ -DUSE_RPATH=OFF BUILD_DIR = $(debbase)/build_tmp @@ -84,7 +85,7 @@ dh_testroot ( cd $(BUILD_DIR) ; \ - $(MAKE) DESTDIR=$(debtmp) OCTAVE_OCT_DIR=$(OCTDIR) install ) + $(MAKE) DESTDIR=$(debtmp) install ) rm -f $(debtmp)/usr/bin/plplot-config This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-10-22 15:44:47
|
Revision: 7966 http://plplot.svn.sourceforge.net/plplot/?rev=7966&view=rev Author: andrewross Date: 2007-10-22 08:44:51 -0700 (Mon, 22 Oct 2007) Log Message: ----------- Be consistent about the use of brackets. Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-10-22 15:23:53 UTC (rev 7965) +++ trunk/debian/rules 2007-10-22 15:44:51 UTC (rev 7966) @@ -34,7 +34,7 @@ -DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \ -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \ - -DOCTAVE_OCT_DIR=${OCTDIR} \ + -DOCTAVE_OCT_DIR=$(OCTDIR) \ -DUSE_RPATH=OFF BUILD_DIR = $(debbase)/build_tmp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-10-24 09:48:07
|
Revision: 7968 http://plplot.svn.sourceforge.net/plplot/?rev=7968&view=rev Author: andrewross Date: 2007-10-24 02:48:10 -0700 (Wed, 24 Oct 2007) Log Message: ----------- Enable ctest when building Debian packages, but ignore any errors - this is just an informational check. Currently psttf driver fails due to LASi / pango issues with some missing characters. Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-10-22 17:14:54 UTC (rev 7967) +++ trunk/debian/rules 2007-10-24 09:48:10 UTC (rev 7968) @@ -58,8 +58,8 @@ #( cd src ; $(MAKE) ) #( cd bindings/octave ; \ # $(MAKE) CC="gcc -D__builtin_va_list=void" plplot_octave.oct ) - #( cd $(BUILD_DIR) ; $(MAKE) ; ctest ) ( cd $(BUILD_DIR) ; $(MAKE) ) + -( cd $(BUILD_DIR) ; ctest ) touch build-stamp clean: unpatch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2007-10-24 11:23:33
|
Revision: 7969 http://plplot.svn.sourceforge.net/plplot/?rev=7969&view=rev Author: andrewross Date: 2007-10-24 04:23:37 -0700 (Wed, 24 Oct 2007) Log Message: ----------- ./debian/rules clean should delete install-python* files. Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-10-24 09:48:10 UTC (rev 7968) +++ trunk/debian/rules 2007-10-24 11:23:37 UTC (rev 7969) @@ -66,7 +66,7 @@ dh_testdir dh_testroot rm -f build-stamp install-stamp config-stamp \ - patch-stamp debian/files + patch-stamp debian/files install-python* rm -rf $(BUILD_DIR) rm -rf $(debbase)/$(libpkg) dh_clean This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-26 09:57:55
|
Revision: 7977 http://plplot.svn.sourceforge.net/plplot/?rev=7977&view=rev Author: rlaboiss Date: 2007-10-26 02:57:51 -0700 (Fri, 26 Oct 2007) Log Message: ----------- Remove bindings/tk/tclIndex in clean rule Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-10-26 09:57:09 UTC (rev 7976) +++ trunk/debian/rules 2007-10-26 09:57:51 UTC (rev 7977) @@ -69,6 +69,8 @@ patch-stamp debian/files install-python* rm -rf $(BUILD_DIR) rm -rf $(debbase)/$(libpkg) + # FIXME: this should be fixed upstream + rm -f bindings/tk/tclIndex dh_clean install: install-stamp install-python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-26 11:54:01
|
Revision: 7978 http://plplot.svn.sourceforge.net/plplot/?rev=7978&view=rev Author: rlaboiss Date: 2007-10-26 04:54:04 -0700 (Fri, 26 Oct 2007) Log Message: ----------- Remove also CMakeFiles directory in clean rule Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-10-26 09:57:51 UTC (rev 7977) +++ trunk/debian/rules 2007-10-26 11:54:04 UTC (rev 7978) @@ -70,7 +70,7 @@ rm -rf $(BUILD_DIR) rm -rf $(debbase)/$(libpkg) # FIXME: this should be fixed upstream - rm -f bindings/tk/tclIndex + rm -rf bindings/tk/tclIndex CMakeFiles dh_clean install: install-stamp install-python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Alan W. I. <ir...@be...> - 2007-10-26 16:28:27
|
On 2007-10-26 04:54-0700 rla...@us... wrote: > Revision: 7978 > http://plplot.svn.sourceforge.net/plplot/?rev=7978&view=rev > Author: rlaboiss > Date: 2007-10-26 04:54:04 -0700 (Fri, 26 Oct 2007) > > Log Message: > ----------- > Remove also CMakeFiles directory in clean rule Rafael and/or Andrew: I may misunderstand what you are trying to do because I am unfamiliar with the Debian build, but this issue caught my eye and leads to some questions. CMakeFiles is generated by cmake in the build tree. Why are you cleaning that rather than working exclusively in the install tree after the build and install are done? If for some reason you do have to clean the build tree, is this because you tainted the source tree by building in it? If so, there are a lot of CMake specific files you would have to clean out, and a much better procedure would be to have a separate build tree that doesn't taint the source tree with a lot of generated files. Let me know what you think. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); PLplot scientific plotting software package (plplot.org); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________ |
From: <and...@us...> - 2007-10-29 10:34:44
|
Revision: 7983 http://plplot.svn.sourceforge.net/plplot/?rev=7983&view=rev Author: andrewross Date: 2007-10-29 03:34:48 -0700 (Mon, 29 Oct 2007) Log Message: ----------- bindings/tk/tclIndex now correctly generated in the build tree so no need to explicitly delete it from the source tree. Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-10-29 10:33:43 UTC (rev 7982) +++ trunk/debian/rules 2007-10-29 10:34:48 UTC (rev 7983) @@ -70,7 +70,7 @@ rm -rf $(BUILD_DIR) rm -rf $(debbase)/$(libpkg) # FIXME: this should be fixed upstream - rm -rf bindings/tk/tclIndex CMakeFiles + rm -rf CMakeFiles dh_clean install: install-stamp install-python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2007-10-29 16:13:50
|
Revision: 7985 http://plplot.svn.sourceforge.net/plplot/?rev=7985&view=rev Author: rlaboiss Date: 2007-10-29 09:13:54 -0700 (Mon, 29 Oct 2007) Log Message: ----------- Drop the bogus removal of CMakeFiles Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-10-29 16:12:08 UTC (rev 7984) +++ trunk/debian/rules 2007-10-29 16:13:54 UTC (rev 7985) @@ -69,8 +69,6 @@ patch-stamp debian/files install-python* rm -rf $(BUILD_DIR) rm -rf $(debbase)/$(libpkg) - # FIXME: this should be fixed upstream - rm -rf CMakeFiles dh_clean install: install-stamp install-python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-03-24 10:33:52
|
Revision: 8330 http://plplot.svn.sourceforge.net/plplot/?rev=8330&view=rev Author: rlaboiss Date: 2008-03-24 03:33:59 -0700 (Mon, 24 Mar 2008) Log Message: ----------- debian/control is a prerequisit of config-stamp, not of config Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-03-24 10:11:14 UTC (rev 8329) +++ trunk/debian/rules 2008-03-24 10:33:59 UTC (rev 8330) @@ -61,8 +61,8 @@ slice -o UNDEF:$@ $< endif -config: config-stamp debian/control -config-stamp: +config: config-stamp +config-stamp: debian/control mkdir $(BUILD_DIR) (cd $(BUILD_DIR) ; \ PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-03-24 10:38:46
|
Revision: 8332 http://plplot.svn.sourceforge.net/plplot/?rev=8332&view=rev Author: rlaboiss Date: 2008-03-24 03:38:53 -0700 (Mon, 24 Mar 2008) Log Message: ----------- Force generation of debian/control, always Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-03-24 10:34:16 UTC (rev 8331) +++ trunk/debian/rules 2008-03-24 10:38:53 UTC (rev 8332) @@ -54,15 +54,15 @@ BUILD_DIR = $(debbase)/build_tmp SRC_DIR = $(shell pwd) -debian/control: debian/control.in +control: ifneq ($(DEB_BUILD_ARCH),arm) - slice -o UNDEF+JAVA+ADA:$@ $< + slice -o UNDEF+JAVA+ADA:debian/control debian/control.in else - slice -o UNDEF:$@ $< + slice -o UNDEF:debian/control debian/control.in endif config: config-stamp -config-stamp: debian/control +config-stamp: control mkdir $(BUILD_DIR) (cd $(BUILD_DIR) ; \ PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \ @@ -215,4 +215,4 @@ binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary config \ - patch unpatch + patch unpatch control This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-03-24 10:50:34
|
Revision: 8335 http://plplot.svn.sourceforge.net/plplot/?rev=8335&view=rev Author: rlaboiss Date: 2008-03-24 03:50:41 -0700 (Mon, 24 Mar 2008) Log Message: ----------- Fix logic around dh_movefiles Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-03-24 10:47:22 UTC (rev 8334) +++ trunk/debian/rules 2008-03-24 10:50:41 UTC (rev 8335) @@ -102,14 +102,16 @@ install-arch: install-arch-stamp install-python dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \ --no-package=plplot-bin --no-package=python-plplot \ - --no-package=libplplot-ada + --no-package=libplplot9-java --no-package=libplplot-ada dh_movefiles --package=python-plplot - dh_movefiles --package=libplplot-dev dh_movefiles --package=plplot-bin dh_movefiles --package=$(libpkg) ifneq ($(DEB_BUILD_ARCH),arm) dh_movefiles --package=libplplot-ada + dh_movefiles --package=libplplot9-java dh_movefiles --package=libplplot-dev usr/share/ada +else + dh_movefiles --package=libplplot-dev endif install-arch-stamp: build-arch-stamp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-03-24 11:23:11
|
Revision: 8336 http://plplot.svn.sourceforge.net/plplot/?rev=8336&view=rev Author: rlaboiss Date: 2008-03-24 04:23:16 -0700 (Mon, 24 Mar 2008) Log Message: ----------- dh_movefiles libplplot9 should be the last command in the series Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-03-24 10:50:41 UTC (rev 8335) +++ trunk/debian/rules 2008-03-24 11:23:16 UTC (rev 8336) @@ -105,7 +105,6 @@ --no-package=libplplot9-java --no-package=libplplot-ada dh_movefiles --package=python-plplot dh_movefiles --package=plplot-bin - dh_movefiles --package=$(libpkg) ifneq ($(DEB_BUILD_ARCH),arm) dh_movefiles --package=libplplot-ada dh_movefiles --package=libplplot9-java @@ -113,6 +112,7 @@ else dh_movefiles --package=libplplot-dev endif + dh_movefiles --package=$(libpkg) install-arch-stamp: build-arch-stamp dh_testdir This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-05-04 08:58:44
|
Revision: 8386 http://plplot.svn.sourceforge.net/plplot/?rev=8386&view=rev Author: rlaboiss Date: 2008-05-04 01:58:50 -0700 (Sun, 04 May 2008) Log Message: ----------- Simplify conditional logic around BUILD_ADA and BUILD_JAVA by using findstring Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-05-02 13:45:55 UTC (rev 8385) +++ trunk/debian/rules 2008-05-04 08:58:50 UTC (rev 8386) @@ -32,46 +32,23 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) -BUILD_ADA = yes -BUILD_JAVA = yes - # Disable java and ada build on arm - problems with java-gcj-compat-dev # at the moment. Also gnat not available on arm, mips, and mipsel. -ifeq ($(DEB_BUILD_ARCH),alpha) +ifneq (,$(findstring $(DEB_BUILD_ARCH):,alpha:arm:armeb:armel:mips:mipsel:)) BUILD_ADA = no -BUILD_JAVA = no +else +BUILD_ADA = yes endif -ifeq ($(DEB_BUILD_ARCH),arm) -BUILD_ADA = no +ifneq (,$(findstring $(DEB_BUILD_ARCH):,alpha:arm:hppa:hurd-i386:)) BUILD_JAVA = no +else +BUILD_JAVA = yes endif -ifeq ($(DEB_BUILD_ARCH),armeb) -BUILD_ADA = no -endif +# Configure options -ifeq ($(DEB_BUILD_ARCH),armel) -BUILD_ADA = no -endif - -ifeq ($(DEB_BUILD_ARCH),hppa) -BUILD_JAVA = no -endif - -ifeq ($(DEB_BUILD_ARCH),hurd-i386) -BUILD_JAVA = no -endif - -ifeq ($(DEB_BUILD_ARCH),mips) -BUILD_ADA = no -endif - -ifeq ($(DEB_BUILD_ARCH),mipsel) -BUILD_ADA = no -endif - ifeq ($(BUILD_ADA),yes) ADA_OPTIONS = -DENABLE_ada=ON else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rla...@us...> - 2008-05-04 09:17:52
|
Revision: 8387 http://plplot.svn.sourceforge.net/plplot/?rev=8387&view=rev Author: rlaboiss Date: 2008-05-04 02:17:59 -0700 (Sun, 04 May 2008) Log Message: ----------- Use Emacs' makefile-gmake-mode for editing Modified Paths: -------------- trunk/debian/rules Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2008-05-04 08:58:50 UTC (rev 8386) +++ trunk/debian/rules 2008-05-04 09:17:59 UTC (rev 8387) @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# -*- Makefile -*- +# -*- gmake -*- # Made with the aid of dh_make, by Craig Small # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. # This version is for a hypothetical package that builds an This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |