@@ -2,18 +2,30 @@ require 'rake/testtask' desc "Run the tests" Rake::TestTask.new(:test) do |t| + t.libs << 'ext' t.test_files = FileList['test/test*.rb'] t.warning = true end -OBJ = "llvmruby." + Config::CONFIG["DLEXT"] +OBJ = "ext/llvmruby." + Config::CONFIG["DLEXT"] -file "Makefile" do - ruby "extconf.rb --with-llvm-include=`llvm-config --includedir` --with-llvm-lib=`llvm-config --libdir`" +file "ext/Makefile" do + #cmd = "extconf.rb --with-llvm-include=`llvm-config --includedir` --with-llvm-lib=`llvm-config --libdir`" + cmd = 'extconf.rb' + Dir.chdir("ext") { ruby(cmd) } end -file OBJ => %w(Makefile) + FileList["*.{cpp,c,h}"] do - sh "make" + +file OBJ => %w(ext/Makefile) + FileList["ext/*.{cpp,c,h}"] do + Dir.chdir("ext") { sh "make" } end + desc "Compile llvmruby extensions" task :compile => OBJ -task :default => :compile \ No newline at end of file +task :default => :compile + +desc "Remove compiled files" +task :clean do |t| + for file in FileList.new("ext/*.o", "ext/Makefile", "ext/mkmf.log", OBJ) + File.delete(file) rescue true + end +end Rakefile @@ -3,12 +3,11 @@ require 'mkmf' extension_name = 'llvmruby' dir_config(extension_name) +dir_config('llvm', `llvm-config --includedir`.strip, `llvm-config --libdir`.strip) have_library('stdc++') have_library('pthread') -dir_config('llvm') - with_ldflags(`llvm-config --libs all`) do create_makefile(extension_name) end ext/extconf.rb @@ -8,7 +8,7 @@ spec = Gem::Specification.new do |s| s.authors = [ "Thomas Bagby" ] s.email = [ "tomatobagby@gmail.com" ] s.files = Dir.glob("{doc,ext,lib,test}/**/*") - s.require_path = "lib" + s.require_path = "lib" s.extensions << 'ext/extconf.rb' @@ -19,4 +19,4 @@ spec = Gem::Specification.new do |s| "COPYING" ] -end \ No newline at end of file +end llvmruby.gemspec @@ -1,6 +1,3 @@ -$:.unshift "#{File.dirname(__FILE__)}/../lib" -$:.unshift "#{File.dirname(__FILE__)}/../ext" - require 'test/unit' require 'llvm' test/test_basic.rb @@ -1,6 +1,3 @@ -$:.unshift "#{File.dirname(__FILE__)}/../lib" -$:.unshift "#{File.dirname(__FILE__)}/../ext" - require 'test/unit' require 'llvm' test/test_basic_block.rb @@ -1,6 +1,3 @@ -$:.unshift "#{File.dirname(__FILE__)}/../lib" -$:.unshift "#{File.dirname(__FILE__)}/../ext" - require 'test/unit' require 'llvm' test/test_instructions.rb @@ -1,6 +1,3 @@ -$:.unshift "#{File.dirname(__FILE__)}/../lib" -$:.unshift "#{File.dirname(__FILE__)}/../ext" - require 'test/unit' require 'llvm' test/test_read_bitcode.rb @@ -1,6 +1,3 @@ -$:.unshift "#{File.dirname(__FILE__)}/../lib" -$:.unshift "#{File.dirname(__FILE__)}/../ext" - require 'test/unit' require 'llvm' require 'ruby_vm' test/test_ruby_vm.rb test.rb d7a547a81ced50d5240f0d1da5f7c354513dcf7c Tom Bagby tomatobagby@gmail.com http://github.com/tombagby/llvmruby/commit/94350f26cd34c20324353193f32abdb1d0de1dd1 94350f26cd34c20324353193f32abdb1d0de1dd1 2008-10-18T13:27:23-07:00 2008-10-18T13:27:23-07:00 merge gemify changes, fix up build and package stuff 2013ad1f6221d6571cdc8993b3da4c0ffc9276e1 Tom Bagby tomatobagby@gmail.com