[Pkg-ruby-extras-maintainers] r788 -
tools/ruby-pkg-tools/trunk/1/class
Esteban Manchado Velázquez
zoso at costa.debian.org
Sun Aug 20 02:29:38 UTC 2006
Author: zoso
Date: 2006-08-20 02:29:37 +0000 (Sun, 20 Aug 2006)
New Revision: 788
Modified:
tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk
tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
Log:
* Create new variable: DEB_RUBY_DEFAULT_VERSION, set to 1.8
* Make the cdbs_ruby_ver variable smarter (use DEB_RUBY_DEFAULT_VERSION's value
when the current package doesn't specify any version)
* In DEB_RUBY_CONFIG_ARGS, also set --siterubyver, using the new cdbs_ruby_ver.
***PLEASE TEST THIS CHANGE WITH YOUR PACKAGES. IT SHOULD NOT BREAK ANYTHING,
BUT YOU NEVER KNOW.***
Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk 2006-08-13 22:09:37 UTC (rev 787)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk 2006-08-20 02:29:37 UTC (rev 788)
@@ -44,6 +44,7 @@
DEB_RUBY_COMPILE_VERSION =
DEB_RUBY_VERSIONS = 1.8 1.9
+DEB_RUBY_DEFAULT_VERSION = 1.8
DEB_RUBY_LIBDIR=$(strip $(shell ruby -rrbconfig -e 'puts Config::CONFIG["libdir"]')/ruby)
DEB_RUBY_ARCHDIR=$(strip $(shell ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]'))/ruby
@@ -58,7 +59,8 @@
DEB_RUBY_SIMPLE_PACKAGES := $(strip $(filter-out $(LIB_PACKAGE_FILTER),$(DEB_ALL_PACKAGES)))
endif
-cdbs_ruby_ver = $(filter-out %-,$(subst -ruby,- ,$(cdbs_curpkg)))
+cdbs_ruby_ver_aux = $(filter-out %-,$(subst -ruby,- ,$(cdbs_curpkg)))
+cdbs_ruby_ver = $(if $(findstring $(cdbs_curpkg),$(cdbs_ruby_ver_aux)),$(DEB_RUBY_DEFAULT_VERSION),$(or $(cdbs_ruby_ver_aux),$(DEB_RUBY_DEFAULT_VERSION)))
push_cfg_file = if [ -f $(DEB_SRCDIR)/.config ]; then mv -f $(DEB_SRCDIR)/.config $(DEB_SRCDIR)/.config-$(1); fi
pop_cfg_file = if [ -f $(DEB_SRCDIR)/.config-$(1) ]; then mv -f $(DEB_SRCDIR)/.config-$(1) $(DEB_SRCDIR)/.config; fi
Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk 2006-08-13 22:09:37 UTC (rev 787)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk 2006-08-20 02:29:37 UTC (rev 788)
@@ -35,7 +35,7 @@
include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
DEB_RUBY_SETUP_CMD = setup.rb
-DEB_RUBY_CONFIG_ARGS = --siteruby=$(DEB_RUBY_LIBDIR)
+DEB_RUBY_CONFIG_ARGS = --siteruby=$(DEB_RUBY_LIBDIR) --siterubyver=$(DEB_RUBY_LIBDIR)/$(cdbs_ruby_ver)
DEB_RUBY_CLEAN_TARGET = distclean
More information about the pkg-ruby-extras-maintainers
mailing list