[Pkg-libvirt-commits] [libguestfs] 36/37: Corrected package name for Ruby bindings, started building Ruby bindings for 1.8 and 1.9

Hilko Bengen bengen at moszumanska.debian.org
Sun Dec 22 18:13:50 UTC 2013


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

bengen pushed a commit to annotated tag debian/1%1.15.10-1
in repository libguestfs.

commit 6be9177418a8a97ecf755ff1a341a5a07f7c80bc
Author: Hilko Bengen <bengen at debian.org>
Date:   Mon Dec 5 23:41:03 2011 +0100

    Corrected package name for Ruby bindings, started building Ruby bindings for 1.8 and 1.9
---
 debian/control                                     |  4 +-
 .../{guestfs-ruby.install => ruby-guestfs.install} |  0
 debian/rules                                       | 89 +++++++++++++---------
 3 files changed, 57 insertions(+), 36 deletions(-)

diff --git a/debian/control b/debian/control
index c17f914..34c811b 100644
--- a/debian/control
+++ b/debian/control
@@ -468,12 +468,12 @@ Description: guest disk image management system - Java bindings
  .
  This package contains Java bindings to libguestfs.
 
-Package: guestfs-ruby
+Package: ruby-guestfs
 Section: ruby
 XB-Ruby-Versions: ${ruby:Versions}
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Description: guest disk image management system - Java bindings
+Description: guest disk image management system - Ruby bindings
  The libguestfs library allows accessing and modifying guest disk
  images. It offers the following features, among many others:
   * making batch configuration changes to guests;
diff --git a/debian/guestfs-ruby.install b/debian/ruby-guestfs.install
similarity index 100%
rename from debian/guestfs-ruby.install
rename to debian/ruby-guestfs.install
diff --git a/debian/rules b/debian/rules
index 5b87255..22ba944 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,36 +4,48 @@
 
 PYTHONS        := $(shell pyversions --installed; py3versions --installed)
 PYTHON_DEFAULT := $(shell pyversions --default)
+RUBIES         := ruby1.8 ruby1.9.1
+RUBY_DEFAULT   := ruby1.8
 
-COMMON_CONFIG_FLAGS = \
+DEFAULT_CONFIG_FLAGS = \
 	--disable-appliance  \
 	--with-readline	     \
 	--disable-haskell    \
 	--disable-php
 
+BARE_CONFIG_FLAGS = \
+	$(DEFAULT_CONFIG_FLAGS) \
+	--disable-daemon --disable-fuse \
+	--disable-ocaml --disable-perl \
+	--disable-erlang --with-java-home=no
+
 override_dh_auto_clean:
 	set -e; for p in $(PYTHONS); do \
 	    dh_auto_clean --builddir=$(CURDIR)/debian/build-$$p ; \
 	done
 
 override_dh_auto_configure:
-	set -e; for p in $(PYTHONS); do \
-	    if [ $$p = $(PYTHON_DEFAULT) ]; then \
+
+	dh_auto_configure --builddir=$(CURDIR)/debian/build-default \
+		-- \
+		$(DEFAULT_CONFIG_FLAGS) \
+		--enable-install-daemon \
+		--with-java-home=/usr/lib/jvm/default-java \
+		RAKE=rake \
+		PYTHON=$(PYTHON_DEFAULT)
+
+	set -e; for v in $(patsubst ruby%,%,$(filter-out $(RUBY_DEFAULT), $(RUBIES))) \
+	; do \
+		dh_auto_configure --builddir=$(CURDIR)/debian/build-ruby$$v \
+			-- \
+			$(BARE_CONFIG_FLAGS) --disable-python RUBY=ruby$$v RAKE=rake$$v; \
+	done
+
+	set -e; for p in $(filter-out $(PYTHON_DEFAULT), $(PYTHONS)) \
+	; do \
 		dh_auto_configure --builddir=$(CURDIR)/debian/build-$$p \
-		    -- \
-		    $(COMMON_CONFIG_FLAGS) \
-		    --enable-install-daemon \
-		    --with-java-home=/usr/lib/jvm/default-java ; \
-	    else \
-	        dh_auto_configure --builddir=$(CURDIR)/debian/build-$$p \
-	            -- \
-		    $(COMMON_CONFIG_FLAGS) \
-	            --disable-daemon --disable-fuse \
-	            --disable-ocaml --disable-perl \
-		    --disable-erlang --with-java-home=no \
-		    --disable-ruby \
-	            PYTHON=$$p ; \
-	    fi ; \
+			-- \
+			$(BARE_CONFIG_FLAGS) --disable-ruby PYTHON=$$p ; \
 	done
 
 override_dh_strip:
@@ -41,22 +53,27 @@ override_dh_strip:
 
 override_dh_auto_build:
 # also build part of appliance
-	set -e; for p in $(PYTHONS); do \
-	    if [ $$p = $(PYTHON_DEFAULT) ]; then \
-		dh_auto_build --builddir=$(CURDIR)/debian/build-$$p \
-		    -- \
-		    INSTALLDIRS=vendor LD_RUN_PATH="" ; \
-	        $(MAKE) -C $(CURDIR)/debian/build-$$p/appliance \
-		    make.sh \
-		    packagelist excludelist \
-		    supermin.d/daemon.img supermin.d/init.img ; \
-	    else \
+	dh_auto_build --builddir=$(CURDIR)/debian/build-default \
+		-- INSTALLDIRS=vendor LD_RUN_PATH=""
+
+	$(MAKE) -C $(CURDIR)/debian/build-default/appliance \
+	    make.sh \
+	    packagelist excludelist \
+	    supermin.d/daemon.img supermin.d/init.img
+
+	set -e; for p in \
+		$(filter-out $(PYTHON_DEFAULT), $(PYTHONS)) \
+		$(filter-out $(RUBY_DEFAULT), $(RUBIES)) \
+	; do \
 		dh_auto_build --builddir=$(CURDIR)/debian/build-$$p ; \
-	    fi ; \
 	done
 
 override_dh_auto_test:
-	set -e; for p in $(PYTHONS); do \
+	set -e; for p in \
+		default \
+		$(filter-out $(PYTHON_DEFAULT), $(PYTHONS)) \
+		$(filter-out $(RUBY_DEFAULT), $(RUBIES)) \
+	; do \
 		dh_auto_test --builddir=$(CURDIR)/debian/build-$$p ; \
 	done
 
@@ -64,7 +81,11 @@ override_dh_auto_install:
 # All build trees contain the library plus guestfish and C virt tools.
 # We assume that the Python version used for building the Python
 # bindings doesn't affect the outcome of those builds.
-	set -e; for p in $(PYTHONS); do \
+	set -e; for p in \
+		default \
+		$(filter-out $(PYTHON_DEFAULT), $(PYTHONS)) \
+		$(filter-out $(RUBY_DEFAULT), $(RUBIES)) \
+	; do \
 		dh_auto_install --builddir=$(CURDIR)/debian/build-$$p ; \
 	done
 
@@ -82,13 +103,13 @@ override_dh_install:
 # We do not install supermin.d/base.img, but ship make.sh which can be
 # used to build it.
 	mkdir -p debian/tmp/usr/lib/guestfs/supermin.d
-	install -m755 debian/build-${PYTHON_DEFAULT}/appliance/make.sh \
+	install -m755 debian/build-default/appliance/make.sh \
 		debian/tmp/usr/lib/guestfs
-	install -m644 debian/build-${PYTHON_DEFAULT}/appliance/*list \
+	install -m644 debian/build-default/appliance/*list \
 		debian/tmp/usr/lib/guestfs
 	install -m644 \
-		debian/build-${PYTHON_DEFAULT}/appliance/supermin.d/init.img \
-		debian/build-${PYTHON_DEFAULT}/appliance/supermin.d/daemon.img \
+		debian/build-default/appliance/supermin.d/init.img \
+		debian/build-default/appliance/supermin.d/daemon.img \
 		debian/tmp/usr/lib/guestfs/supermin.d/
 
 	erlang-depends -perlang-guestfs

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



More information about the Pkg-libvirt-commits mailing list