@@ -36,15 +36,17 @@ if (tasks_dir = ROOT.parent + 'tasks').directory? end # compile the extension -begin - gem('rake-compiler') - require 'rake/extensiontask' - Rake::ExtensionTask.new('do_mysql_ext', HOE.spec) -rescue LoadError - warn "To cross-compile, install rake-compiler (gem install rake-compiler)" - if tasks_dir.directory? - require tasks_dir + 'ext_helper' - setup_extension('do_mysql_ext', HOE.spec) +unless JRUBY + begin + gem('rake-compiler') + require 'rake/extensiontask' + Rake::ExtensionTask.new('do_mysql_ext', HOE.spec) + rescue LoadError + warn "To cross-compile, install rake-compiler (gem install rake-compiler)" + if tasks_dir.directory? + require tasks_dir + 'ext_helper' + setup_extension('do_mysql_ext', HOE.spec) + end end end do_mysql/Rakefile @@ -35,15 +35,17 @@ if (tasks_dir = ROOT.parent + 'tasks').directory? end # compile the extension -begin - gem('rake-compiler') - require 'rake/extensiontask' - Rake::ExtensionTask.new('do_postgres_ext', HOE.spec) -rescue LoadError - warn "To cross-compile, install rake-compiler (gem install rake-compiler)" - if tasks_dir.directory? - require tasks_dir + 'ext_helper' - setup_extension('do_postgres_ext', HOE.spec) +unless JRUBY + begin + gem('rake-compiler') + require 'rake/extensiontask' + Rake::ExtensionTask.new('do_postgres_ext', HOE.spec) + rescue LoadError + warn "To cross-compile, install rake-compiler (gem install rake-compiler)" + if tasks_dir.directory? + require tasks_dir + 'ext_helper' + setup_extension('do_postgres_ext', HOE.spec) + end end end do_postgres/Rakefile @@ -5,27 +5,27 @@ def setup_extension_java(extension_name, gem_spec = nil) ext_name = "#{extension_name}.jar" directory 'lib' - unless File.directory?("ext/#{extension_name}") + desc 'Compile Extension for current Ruby (= compile:jruby)' + task :compile => [ 'compile:jruby' ] if JRUBY - namespace :compile do - desc "Compile Java Extension for JRuby" - #task :jruby => ["lib/#{ext_name}"] + namespace :compile do + desc "Compile Java Extension for JRuby" + #task :jruby => ["lib/#{ext_name}"] - task :jruby do - begin - # gem 'buildr', '1.3.1.1' - # require 'buildr' - # FIXME: this is throwing rspec activation errors - sh %{jruby -S buildr package} + task :jruby do + begin + # gem 'buildr', '1.3.1.1' + # require 'buildr' + # FIXME: this is throwing rspec activation errors + sh %{jruby -S buildr package} - buildr_output = extension_name.gsub(/_(ext)$/, '-\1-java-1.0.jar') - cp "ext-java/target/#{buildr_output}", "lib/#{ext_name}" - rescue LoadError - puts "#{spec.name} requires the buildr gem to compile the Java extension" - end + buildr_output = extension_name.gsub(/_(ext)$/, '-\1-java-1.0.jar') + cp "ext-java/target/#{buildr_output}", "lib/#{ext_name}" + rescue LoadError + puts "#{spec.name} requires the buildr gem to compile the Java extension" end end - file "lib/#{ext_name}" => 'compile:jruby' - end + file "lib/#{ext_name}" => 'compile:jruby' + end tasks/ext_helper_java.rb f8f2083d652821ee39f06f63ab37c9b870da506f Alex Coles alex@alexcolesportfolio.com http://github.com/sam/do/commit/bd7b3df7cdca9ab231fa5711cfcca269f681c40a bd7b3df7cdca9ab231fa5711cfcca269f681c40a 2009-01-04T16:10:27-08:00 2009-01-04T16:10:27-08:00 [do_jdbc] A few fixes to get building on JRuby working once again * Bracketed out rake-compiler requirement on JRuby. * Reinstate the "compile" alias for compile:jruby, if running on that platform. Signed-off-by: Alex Coles <alex@alexcolesportfolio.com> 2b5673ef3e56c24630502ddcbcc6b6dce85f9da2 Alex Coles alex@alexcolesportfolio.com