buildr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From as...@apache.org
Subject svn commit: r758503 - in /buildr/trunk: CHANGELOG rakelib/package.rake
Date Thu, 26 Mar 2009 02:27:01 GMT
Author: assaf
Date: Thu Mar 26 02:26:58 2009
New Revision: 758503

URL: http://svn.apache.org/viewvc?rev=758503&view=rev
Log:
Fixed: BUILDR-272 'rake gem' does not build gem under JRuby (Clinton R. Nixon).

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/rakelib/package.rake

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=758503&r1=758502&r2=758503&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Thu Mar 26 02:26:58 2009
@@ -69,6 +69,8 @@
 * Fixed:  BUILDR-271 Using buildr --environment leads to "Don't know how to
 build task XXX".
 * Fixed:  BUILDR-269 rspec bdd is broken (Jeff Hodges)
+* Fixed:  BUILDR-272 'rake gem' does not build gem under JRuby (Clinton R.
+Nixon).
 * Remove: BUILDR-215 buildr:freeze and unfreeze tasks don't work since we're
 no longer running with the rake command.
 

Modified: buildr/trunk/rakelib/package.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/package.rake?rev=758503&r1=758502&r2=758503&view=diff
==============================================================================
--- buildr/trunk/rakelib/package.rake (original)
+++ buildr/trunk/rakelib/package.rake Thu Mar 26 02:26:58 2009
@@ -44,7 +44,7 @@
 desc "Compile Java libraries used by Buildr"
 task :compile do
   puts "Compiling Java libraries ..."
-  args = File.expand_path('_buildr'), '--buildfile=buildr.buildfile', 'compile'
+  args = File.expand_path(RUBY_PLATFORM[/java/] ? '_jbuildr' : '_buildr'), '--buildfile',
'buildr.buildfile', 'compile'
   args << '--trace' if Rake.application.options.trace
   sh *args
 end
@@ -53,7 +53,7 @@
 
 # We also need the other package (JRuby if building on Ruby, and vice versa)
 # Must call new with block, even if block does nothing, otherwise bad things happen.
-Rake::GemPackageTask.new(spec(RUBY_PLATFORM =~ /java/ ? 'ruby' : 'java')) { |task| }
+Rake::GemPackageTask.new(spec(RUBY_PLATFORM[/java/] ? 'ruby' : 'java')) { |task| }
 
 
 desc "Upload snapshot packages over to people.apache.org"



Mime
View raw message