Permalink
Browse files

Move MRI C extension into 'mri' subdirectory.

Signed-off-by: Coda Hale <coda.hale@gmail.com>
  • Loading branch information...
1 parent b4024d4 commit 7e4f6e0afadfe4fcafb532df1846f9f05c340463 @FooBarWidget FooBarWidget committed with Aug 12, 2009
View
@@ -1,6 +1,7 @@
-ext/*.o
-ext/*.bundle
-ext/Makefile
+*.o
+*.bundle
+*.so
+ext/mri/Makefile
doc
pkg
*.class
View
@@ -13,18 +13,20 @@ PKG_FILES = FileList[
'[A-Z]*',
'lib/**/*.rb',
'spec/**/*.rb',
- 'ext/*.c',
- 'ext/*.h',
- 'ext/*.rb',
+ 'ext/mri/*.c',
+ 'ext/mri/*.h',
+ 'ext/mri/*.rb',
'ext/jruby/bcrypt_jruby/BCrypt.java',
'ext/jruby/bcrypt_jruby/BCrypt.class'
]
CLEAN.include(
- "ext/*.o",
- "ext/*.bundle",
- "ext/*.so"
+ "ext/mri/*.o",
+ "ext/mri/*.bundle",
+ "ext/mri/*.so",
+ "ext/jruby/bcrypt_jruby/*.class"
)
CLOBBER.include(
+ "ext/mri/Makefile",
"doc/coverage"
)
@@ -70,7 +72,7 @@ spec = Gem::Specification.new do |s|
s.rdoc_options = rd.options
s.extra_rdoc_files = rd.rdoc_files.to_a
- s.extensions = FileList["ext/extconf.rb"].to_a
+ s.extensions = FileList["ext/mri/extconf.rb"].to_a
s.authors = ["Coda Hale"]
s.email = "coda.hale@gmail.com"
@@ -96,7 +98,7 @@ namespace :compile do
desc "Clean, then compile the MRI extension"
task :mri => :clean do
- Dir.chdir('ext') do
+ Dir.chdir('ext/mri') do
ruby "extconf.rb"
sh "make"
end
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -4,8 +4,7 @@
require 'java'
$CLASSPATH << File.expand_path(File.join(File.dirname(__FILE__), "..", "ext", "jruby"))
else
- $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "ext")))
- puts $LOAD_PATH
+ $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "ext", "mri")))
require "bcrypt_ext"
require "openssl"
end

0 comments on commit 7e4f6e0

Please sign in to comment.