[DRE-commits] r5858 - trunk/libffi-ruby/debian

[Laurent Arnoud]

Author: spk-guest
Date: 2010-09-22 20:34:03 +0000 (Wed, 22 Sep 2010)
New Revision: 5858

Modified:
   trunk/libffi-ruby/debian/post-install.rb
   trunk/libffi-ruby/debian/rules
Log:
debian/post-install.rb: Fix problem with RUBY_VERSION on 1.9.2 (Closes: #593038)

Signed-off-by: Laurent Arnoud <laurent at spkdev.net>

Modified: trunk/libffi-ruby/debian/post-install.rb
===================================================================
--- trunk/libffi-ruby/debian/post-install.rb	2010-09-18 06:47:14 UTC (rev 5857)
+++ trunk/libffi-ruby/debian/post-install.rb	2010-09-22 20:34:03 UTC (rev 5858)
@@ -1,16 +1,24 @@
 require "fileutils"
 # Load the fresh installed ffi release
+# First ARGV is a custom Ruby version
 
-RUBY_MAJOR = RUBY_VERSION.match(/^\d+\.\d+/).to_s
-RUBY_MINOR = RUBY_MAJOR == "1.9" ? "." + RUBY_VERSION.match(/\d+$/).to_s : ''
+ruby_version = nil
+if ARGV.first
+  ruby_version = ARGV.first
+else
+  RUBY_MAJOR = RUBY_VERSION.match(/^\d+\.\d+/).to_s
+  RUBY_MINOR = RUBY_MAJOR == "1.9" ? "." + RUBY_VERSION.match(/\d+$/).to_s : ''
+  ruby_version = "#{RUBY_MAJOR}#{RUBY_MINOR}"
+end
 
-paths = ["./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/#{RUBY_MAJOR}#{RUBY_MINOR}/", "./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/#{RUBY_MAJOR}#{RUBY_MINOR}/#{RUBY_PLATFORM}/"]
+paths = ["./debian/libffi-ruby#{ruby_version}/usr/lib/ruby/#{ruby_version}/",
+  "./debian/libffi-ruby#{ruby_version}/usr/lib/ruby/#{ruby_version}/#{RUBY_PLATFORM}/"]
 
 paths.each {|i| $:.unshift(i)}
 
-require "./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/#{RUBY_MAJOR}#{RUBY_MINOR}/ffi.rb"
-require "./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/#{RUBY_MAJOR}#{RUBY_MINOR}/ffi/tools/types_generator"
+require "./debian/libffi-ruby#{ruby_version}/usr/lib/ruby/#{ruby_version}/ffi"
+require "./debian/libffi-ruby#{ruby_version}/usr/lib/ruby/#{ruby_version}/ffi/tools/types_generator"
 
-File.open(File.join("./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/#{RUBY_MAJOR}#{RUBY_MINOR}/ffi", 'types.conf'),'w') do |f|
+File.open(File.join("./debian/libffi-ruby#{ruby_version}/usr/lib/ruby/#{ruby_version}/ffi", 'types.conf'),'w') do |f|
   f.puts FFI::TypesGenerator.generate
 end

Modified: trunk/libffi-ruby/debian/rules
===================================================================
--- trunk/libffi-ruby/debian/rules	2010-09-18 06:47:14 UTC (rev 5857)
+++ trunk/libffi-ruby/debian/rules	2010-09-22 20:34:03 UTC (rev 5858)
@@ -8,6 +8,4 @@
 	/usr/bin/ruby1.8 ./debian/post-install.rb
 
 install/libffi-ruby1.9.1::
-	/usr/bin/ruby1.9.1 ./debian/post-install.rb
-	
-
+	/usr/bin/ruby1.9.1 ./debian/post-install.rb 1.9.1