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

[Micah Anderson]

Author: micah
Date: 2010-03-06 21:29:54 +0000 (Sat, 06 Mar 2010)
New Revision: 4914

Modified:
   trunk/libffi-ruby/debian/post-install.rb
Log:
update post-install to get the ruby version dynamically

Modified: trunk/libffi-ruby/debian/post-install.rb
===================================================================
--- trunk/libffi-ruby/debian/post-install.rb	2010-03-06 21:23:34 UTC (rev 4913)
+++ trunk/libffi-ruby/debian/post-install.rb	2010-03-06 21:29:54 UTC (rev 4914)
@@ -1,26 +1,14 @@
 require "fileutils"
 # Load the fresh installed ffi release
 
-if RUBY_VERSION == '1.8.7'
-  $:.unshift "./debian/libffi-ruby1.8/usr/lib/ruby/"
-  $:.unshift "./debian/libffi-ruby1.8/usr/lib/ruby/1.8/"
-  $:.unshift "./debian/libffi-ruby1.8/usr/lib/ruby/1.8/ffi/"
-  $:.unshift "./debian/libffi-ruby1.8/usr/lib/ruby/1.8/#{RUBY_PLATFORM}/"
-  require "./debian/libffi-ruby1.8/usr/lib/ruby/1.8/ffi.rb"
-  require "./debian/libffi-ruby1.8/usr/lib/ruby/1.8/ffi/tools/types_generator"
-  
-  File.open(File.join('./debian/libffi-ruby1.8/usr/lib/ruby/1.8/ffi', 'types.conf'),'w') do |f|
-    f.puts FFI::TypesGenerator.generate
-  end
-else
-  $:.unshift "./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/"
-  $:.unshift "./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/1.8/"
-  $:.unshift "./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/1.8/ffi/"
-  $:.unshift "./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/1.8/#{RUBY_PLATFORM}"
-  require "./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/#{RUBY_VERSION}/ffi.rb"
-  require "./debian/libffi-ruby#{RUBY_VERSION}/usr/lib/ruby/#{RUBY_VERSION}/ffi/tools/types_generator"
+RUBY_MAJOR = RUBY_VERSION.match(/^\d+\.\d+/)
 
-  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
-end
+$:.unshift "./debian/libffi-ruby#{RUBY_MAJOR}/usr/lib/ruby/"
+$:.unshift "./debian/libffi-ruby#{RUBY_MAJOR}/usr/lib/ruby/#{RUBY_MAJOR}/"
+$:.unshift "./debian/libffi-ruby#{RUBY_MAJOR}/usr/lib/ruby/#{RUBY_MAJOR}/ffi/"
+$:.unshift "./debian/libffi-ruby#{RUBY_MAJOR}/usr/lib/ruby/#{RUBY_MAJOR}/#{RUBY_PLATFORM}/"
+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"
+  
+File.open(File.join('./debian/libffi-ruby#{RUBY_MAJOR}/usr/lib/ruby/#{RUBY_MAJOR}/ffi', 'types.conf'),'w') do |f|
+  f.puts FFI::TypesGenerator.generate