[DebianGIS-dev] r2230 - packages/gdal/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-05-23 18:22:29 +0000 (Sat, 23 May 2009)
New Revision: 2230

Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/rules
Log:
Switching to python swig specific management.


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2009-05-23 10:14:19 UTC (rev 2229)
+++ packages/gdal/trunk/debian/changelog	2009-05-23 18:22:29 UTC (rev 2230)
@@ -1,8 +1,9 @@
 gdal (1.6.1-2) experimental; urgency=low
 
   * Removed superfluous patches, applied upstream: mysql5.1, swig1338
-  * Do not regenerate swig stuff, the upstream enclosed is more recent than
-    sid/experimental which are broken on some regards.
+  * Do not regenerate swig stuff for python, the upstream enclosed is
+    more recent than sid/experimental which are broken on some regards.
+    Note that perl swig stuff enclosed within upstream tarball is still broken.
     (closes: #529745)
   * Fixed watch file url.
     (closes: #504715)

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules	2009-05-23 10:14:19 UTC (rev 2229)
+++ packages/gdal/trunk/debian/rules	2009-05-23 18:22:29 UTC (rev 2230)
@@ -17,12 +17,14 @@
 PERLDEF=$(shell perl -V:version|cut -d\' -f2)
 SWIGVER=$(shell swig -version |grep Version|cut -d' ' -f3|sed -e 's/\.//g')
 SWIGOK=$(shell test $(SWIGVER) -ge 1338 && echo yes)
-GENERATE_SWIG=no
 
-ifneq ($(GENERATE_SWIG),yes)
-SWIG_TAG=build
+# This is a silly hack to avoid swig stuff rebuild for python
+GENERATE_SWIG_PYTHON=no
+
+ifneq ($(GENERATE_SWIG_PYTHON),yes)
+PYTHON_SWIG_TAG=build
 else
-SWIG_TAG=generate build
+PYTHON_SWIG_TAG=generate build
 endif
 
 versions:
@@ -96,8 +98,8 @@
 	
 	cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
 	$(MAKE) lib-target apps-target 
-	$(MAKE) -C $(CURDIR)/swig/perl $(SWIG_TAG)
-	$(MAKE) -C $(CURDIR)/swig/ruby $(SWIG_TAG)
+	$(MAKE) -C $(CURDIR)/swig/perl generate build
+	$(MAKE) -C $(CURDIR)/swig/ruby generate build
 	
 	# It needs pre-installing just after the building due to intermediate cleaning.
 	# Apply conditionally an on-fly patch for pre 1.3.38 swig versions.
@@ -105,7 +107,7 @@
 	for V in $(PYVERS); do \
 		cp GDALmake.opt-$$V GDALmake.opt; \
 		$(MAKE) -C $(CURDIR)/swig/python clean; \
-		$(MAKE) -C $(CURDIR)/swig/python $(SWIG_TAG); \
+		$(MAKE) -C $(CURDIR)/swig/python $(PYTHON_SWIG_TAG); \
 		$(MAKE) -C $(CURDIR)/swig/python install DESTDIR=$(CURDIR)/debian/python-tmp; \
 		echo "Patching ogr.py" ; \
 		patch $(CURDIR)/debian/python-tmp/usr/lib/python$$V/site-packages/osgeo/ogr.py $(CURDIR)/debian/ogr.py.diff; \
@@ -114,7 +116,7 @@
 	for V in $(PYVERS); do \
 		cp GDALmake.opt-$$V GDALmake.opt; \
 		$(MAKE) -C $(CURDIR)/swig/python clean; \
-		$(MAKE) -C $(CURDIR)/swig/python $(SWIG_TAG); \
+		$(MAKE) -C $(CURDIR)/swig/python $(PYTHON_SWIG_TAG); \
 		$(MAKE) -C $(CURDIR)/swig/python install DESTDIR=$(CURDIR)/debian/python-tmp; \
 	done
 endif