Remove unused/warning-generating versions of the FFI generators

rubinius · Oct 21, 2008 · febffe3 · febffe3
1 parent 4bc13b2
commit febffe3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 291 deletions.
diff --git a/lib/ffi/generator_task.rb b/lib/ffi/generator_task.rb
@@ -1,18 +1,12 @@
-begin
-  require 'ffi/struct_generator'
-  require 'ffi/const_generator'
-  require 'ffi/generator'
-rescue LoadError
-  # from Rakefile
-  require 'lib/ffi/struct_generator'
-  require 'lib/ffi/const_generator'
-  require 'lib/ffi/generator'
-end
-
 require 'rake'
 require 'rake/tasklib'
 require 'tempfile'
 
+require 'ffi/struct_generator'
+require 'ffi/const_generator'
+require 'ffi/generator'
+
+
 ##
 # Rake task that calculates C structs for FFI::Struct.
 

diff --git a/rakelib/const_generator.rb b/rakelib/const_generator.rb
diff --git a/rakelib/platform.rake b/rakelib/platform.rake
@@ -1,6 +1,6 @@
-require 'lib/ffi/struct_generator'
-require 'lib/ffi/const_generator'
-require 'lib/ffi/types_generator'
+require 'ffi/struct_generator'
+require 'ffi/const_generator'
+require 'ffi/types_generator'
 
 deps = %w[Rakefile] + Dir['lib/ffi/*rb']
 

diff --git a/rakelib/struct_generator.rb b/rakelib/struct_generator.rb