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

[Micah Anderson]

Author: micah
Date: 2010-03-16 22:38:21 +0000 (Tue, 16 Mar 2010)
New Revision: 4945

Modified:
   trunk/libffi-ruby/debian/post-install.rb
Log:
fixes to ruby minor version detection

Modified: trunk/libffi-ruby/debian/post-install.rb
===================================================================
--- trunk/libffi-ruby/debian/post-install.rb	2010-03-16 21:22:16 UTC (rev 4944)
+++ trunk/libffi-ruby/debian/post-install.rb	2010-03-16 22:38:21 UTC (rev 4945)
@@ -1,15 +1,21 @@
 require "fileutils"
 # Load the fresh installed ffi release
 
-RUBY_MAJOR = RUBY_VERSION.match(/^\d+\.\d+/)
+RUBY_MAJOR = RUBY_VERSION.match(/^\d+\.\d+/).to_s
+if RUBY_MAJOR == "1.9"
+then
+	RUBY_MINOR = "." + RUBY_VERSION.match(/\d+\Z/).to_s
+else	
+	RUBY_MINOR = ""
+end
 
-paths = %w["./debian/libffi-ruby#{RUBY_MAJOR}/usr/lib/ruby/ ./debian/libffi-ruby#{RUBY_MAJOR}/usr/lib/ruby/#{RUBY_MAJOR}/ ./debian/libffi-ruby#{RUBY_MAJOR}/usr/lib/ruby/#{RUBY_MAJOR}/ffi/ ./debian/libffi-ruby#{RUBY_MAJOR}/usr/lib/ruby/#{RUBY_MAJOR}/#{RUBY_PLATFORM}/"]
+paths = %w["./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/ ./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}/ffi/ ./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/#{RUBY_MAJOR}#{RUBY_MINOR}/#{RUBY_PLATFORM}/"]
 
 paths.each {|i| $:.unshift(i)}
 
-require "./debian/libffi-ruby#{RUBY_MAJOR}/usr/lib/ruby/#{RUBY_MAJOR}/ffi.rb"
-require "./debian/libffi-ruby#{RUBY_MAJOR}/usr/lib/ruby/#{RUBY_MAJOR}/ffi/tools/types_generator"
+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"
 
-File.open(File.join('./debian/libffi-ruby#{RUBY_MAJOR}/usr/lib/ruby/#{RUBY_MAJOR}/ffi', 'types.conf'),'w') do |f|
+File.open(File.join("./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/#{RUBY_MAJOR}#{RUBY_MINOR}/ffi", 'types.conf'),'w') do |f|
   f.puts FFI::TypesGenerator.generate
 end