Permalink
Browse files

+ moved C code into a more standard location

  • Loading branch information...
1 parent f7817be commit 49a34b0b33130a4151be7c614b12989b10830680 @floere committed Jul 18, 2012
@@ -14,5 +14,5 @@
abort 'need ruby.h' unless have_header("ruby.h")
- create_makefile('picky/ext/ruby19/performant')
+ create_makefile('performant')
end
@@ -1,17 +1,20 @@
+# Note: This is handled toplevel to not confuse compilers.
+#
failed = 0
begin
- require File.expand_path '../ruby19/performant', __FILE__
+ require File.expand_path '../performant', __FILE__
rescue LoadError => e
failed += 1
- require File.expand_path '../ruby19/extconf', __FILE__
+ # Have Makefile built.
+ #
+ require File.expand_path '../extconf', __FILE__
- # For some reason we need to enter ./ruby19
- # via external command (see issue #81).
+ # Run make.
#
Dir.chdir File.expand_path('..', __FILE__) do
- puts %x(cd ruby19; make)
+ puts %x(make)
end
# Try again.
File renamed without changes.
@@ -53,7 +53,7 @@ def load_application file = 'app'
def load_framework_internals
# Load compiled C code.
#
- load_relative 'ext/maybe_compile'
+ load_relative '../maybe_compile'
# Load extensions.
#
View
@@ -18,10 +18,10 @@ Gem::Specification.new do |s|
s.executables = ['picky']
s.default_executable = "picky"
- s.files = Dir["aux/**/*.rb", "lib/**/*.rb", "lib/tasks/*.rake", "lib/picky/ext/ruby19/performant.c"]
+ s.files = Dir["aux/**/*.rb", "lib/**/*.rb", "lib/tasks/*.rake", "lib/performant.c"]
s.test_files = Dir["spec/**/*_spec.rb"]
- s.extensions << 'lib/picky/ext/ruby19/extconf.rb'
+ s.extensions << 'lib/extconf.rb'
s.add_development_dependency 'rspec'
s.add_development_dependency 'picky-client', "~> #{Picky::VERSION}"

0 comments on commit 49a34b0

Please sign in to comment.