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

sebastic-guest pushed a commit to branch master
in repository mapserver.

commit 0a442a76f4eccc537d59a1e8e92dee5def3927b5
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Feb 28 01:40:20 2014 +0000

    Build Ruby extension for all supported versions.
---
 debian/changelog              |  1 +
 debian/control                | 11 ++++++-----
 debian/patches/series         |  2 +-
 debian/ruby-mapscript.install |  1 +
 debian/rules                  | 40 +++++++++++++++++++++++++++++++++-------
 5 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 465eea8..05dcbaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mapserver (6.4.1-2) UNRELEASED; urgency=low
   * Drop lintian override for debian-watch-may-check-gpg-signature,
     shouldn't override pedantic tags.
   * Add patched FindRuby.cmake to also support Ruby 2.0 and 2.1.
+  * Build mapscript extension for all supported Ruby versions.
 
  -- Bas Couwenberg <sebas...@xs4all.nl>  Sat, 22 Feb 2014 16:26:42 +0100
 
diff --git a/debian/control b/debian/control
index 1f70e3c..f80c256 100644
--- a/debian/control
+++ b/debian/control
@@ -26,8 +26,9 @@ Build-Depends: debhelper (>= 9),
                libperl-dev,
                python-all (>= 2.6.6-3~),
                python-all-dev (>= 2.6.6-3~),
-               ruby1.9.1,
-               ruby1.9.1-dev,
+               ruby,
+               ruby-all-dev,
+               gem2deb,
                libfcgi-dev,
                libxml2-dev,
                libxslt1-dev,
@@ -40,7 +41,7 @@ Build-Depends: debhelper (>= 9),
                docbook-xml,
                xsltproc
 Build-Conflicts: libcurl3-openssl-dev
-XS-Ruby-Versions: ruby1.9.1
+XS-Ruby-Versions: all
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mapserver.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/mapserver.git
@@ -226,7 +227,7 @@ Description: Transitional package from 
libmapscript-ruby1.9.1 to ruby-mapscript
 Package: ruby-mapscript
 Architecture: any
 Section: ruby
-Depends: ruby1.9.1,
+Depends: ruby | ruby-interpreter,
          ${shlibs:Depends},
          ${misc:Depends}
 Suggests: mapserver-bin,
@@ -240,7 +241,7 @@ Provides: libmapscript-ruby,
 Replaces: libmapscript-ruby (<< 6.4.0-1~),
           libmapscript-ruby1.8 (<< 6.4.0-1~),
           libmapscript-ruby1.9.1 (<< 6.4.0-1~)
-XB-Ruby-Versions: ruby1.9.1
+XB-Ruby-Versions: all
 Description: MapServer library for Ruby
  Ruby MapScript provides MapServer functions for Ruby scripts.
  .
diff --git a/debian/patches/series b/debian/patches/series
index d01fc66..2b6db3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 hardening.patch
-ruby-shebang.patch
+#ruby-shebang.patch
 perl-mapscript-install.patch
 ruby-mapscript-install.patch
 cmake-mapserver-export.patch
diff --git a/debian/ruby-mapscript.install b/debian/ruby-mapscript.install
index f3e7ea1..6de8167 100644
--- a/debian/ruby-mapscript.install
+++ b/debian/ruby-mapscript.install
@@ -1 +1,2 @@
 usr/lib/ruby/vendor_ruby/*/*/mapscript.so
+usr/lib/*/ruby/vendor_ruby/*/mapscript.so
diff --git a/debian/rules b/debian/rules
index e1dff7f..4a947d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS+=$(CPPFLAGS)
 CFLAGS+=$(LDFLAGS)
 
+RUBYVERSIONS=$(shell dh_ruby --print-supported)
 PHP5API=$(shell php-config5 --phpapi)
 MANPAGES:=$(wildcard debian/man/*.*.xml)
 
@@ -56,12 +57,6 @@ CMAKE_OPTS:= \
                -DWITH_LIBXML2=1 \
                -DWITH_THREAD_SAFETY=1 \
                -DWITH_GIF=1 \
-               -DWITH_PYTHON=1 \
-               -DWITH_PHP=1 \
-               -DWITH_PERL=1 \
-               -DWITH_RUBY=1 \
-               -DWITH_JAVA=0 \
-               -DWITH_CSHARP=0 \
                -DWITH_ORACLESPATIAL=0 \
                -DWITH_ORACLE_PLUGIN=0 \
                -DWITH_MSSQL2008=0 \
@@ -80,9 +75,29 @@ override_dh_auto_clean:
 
        -$(RM) -f $(CURDIR)/debian/man/*.1
        -$(RM) -rf obj-*/
+       -$(RM) -rf build-ruby*/ debian/tmp-ruby*/
 
 override_dh_auto_configure:
-       dh_auto_configure -- $(CMAKE_OPTS)
+       dh_auto_configure -- $(CMAKE_OPTS) \
+                            -DWITH_PYTHON=1 \
+                            -DWITH_PHP=1 \
+                            -DWITH_PERL=1 \
+                            -DWITH_RUBY=0 \
+                            -DWITH_JAVA=0 \
+                            -DWITH_CSHARP=0
+
+       for RUBY in $(RUBYVERSIONS); do \
+               dh_auto_configure --builddirectory=build-$$RUBY -- 
$(CMAKE_OPTS) \
+                                                                  
-DWITH_PYTHON=0 \
+                                                                  -DWITH_PHP=0 
\
+                                                                  
-DWITH_PERL=0 \
+                                                                  
-DWITH_RUBY=1 \
+                                                                  
-DWITH_JAVA=0 \
+                                                                  
-DWITH_CSHARP=0 \
+                                                                  
-DRUBY_EXECUTABLE=/usr/bin/$$RUBY \
+               ; \
+       done
+       
 
 override_dh_auto_build:
        # Create man pages from DocBook XML
@@ -93,12 +108,23 @@ override_dh_auto_build:
 
        dh_auto_build
 
+       for RUBY in $(RUBYVERSIONS); do \
+               dh_auto_build --builddirectory=build-$$RUBY ; \
+       done
+
 override_dh_auto_test:
        # msautotest submodule is not used
 
 override_dh_auto_install:
        dh_auto_install
 
+       for RUBY in $(RUBYVERSIONS); do \
+               dh_auto_install --builddirectory=build-$$RUBY 
--destdir=debian/tmp-$$RUBY ; \
+               mkdir -p debian/tmp/`$$RUBY -r rbconfig -e "print 
RbConfig::CONFIG['vendorarchdir']"` ; \
+               mv -v debian/tmp-$$RUBY`$$RUBY -r rbconfig -e "print 
RbConfig::CONFIG['vendorarchdir']"`/mapscript.so \
+                     debian/tmp`$$RUBY -r rbconfig -e "print 
RbConfig::CONFIG['vendorarchdir']"`/ ; \
+       done
+
        -mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
        -mv -v $(CURDIR)/debian/tmp/usr/lib/libmapserver*.so* 
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
        -sed -i 
"s/lib\/libmapserver/lib\/$(DEB_HOST_MULTIARCH)\/libmapserver/g" 
$(CURDIR)/debian/tmp/usr/share/*/cmake/*.cmake

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mapserver.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to