svn commit: r645976 - in /incubator/buildr/trunk: Rakefile lib/buildr.rb lib/buildr/core/checks.rb rakelib/package.rake

[as...@apache.org]

Author: assaf
Date: Tue Apr  8 08:44:16 2008
New Revision: 645976

URL: http://svn.apache.org/viewvc?rev=645976&view=rev
Log:
Minor tweaks to get it back to building/installing order.


Modified:
    incubator/buildr/trunk/Rakefile
    incubator/buildr/trunk/lib/buildr.rb
    incubator/buildr/trunk/lib/buildr/core/checks.rb
    incubator/buildr/trunk/rakelib/package.rake

Modified: incubator/buildr/trunk/Rakefile
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/Rakefile?rev=645976&r1=645975&r2=645976&view=diff
==============================================================================
--- incubator/buildr/trunk/Rakefile (original)
+++ incubator/buildr/trunk/Rakefile Tue Apr  8 08:44:16 2008
@@ -14,8 +14,9 @@
 # the License.
 
 
-def spec(platform = 'ruby')
+def spec(platform = nil)
   @specs ||= {}
+  platform ||= RUBY_PLATFORM =~ /java/ ? 'java' : 'ruby'
   @specs[platform] ||= Gem::Specification.new do |spec|
     spec.name           = 'buildr'
     spec.version        = File.read(__FILE__.pathmap('%d/lib/buildr.rb')).scan(/VERSION\s*=\s*(['"])(.*)\1/)[0][1]

Modified: incubator/buildr/trunk/lib/buildr.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr.rb?rev=645976&r1=645975&r2=645976&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr.rb (original)
+++ incubator/buildr/trunk/lib/buildr.rb Tue Apr  8 08:44:16 2008
@@ -29,7 +29,7 @@
 end
 
 require 'buildr/core'
-require 'buildr/tasks'
+require 'buildr/packaging'
 require 'buildr/java'
 require 'buildr/ide'
 

Modified: incubator/buildr/trunk/lib/buildr/core/checks.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/checks.rb?rev=645976&r1=645975&r2=645976&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/checks.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/checks.rb Tue Apr  8 08:44:16 2008
@@ -15,7 +15,7 @@
 
 
 require 'buildr/core/project'
-require 'buildr/tasks/zip'
+require 'buildr/packaging/zip'
 require 'test/unit'
 require 'spec/matchers'
 require 'spec/expectations'

Modified: incubator/buildr/trunk/rakelib/package.rake
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/package.rake?rev=645976&r1=645975&r2=645976&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/package.rake (original)
+++ incubator/buildr/trunk/rakelib/package.rake Tue Apr  8 08:44:16 2008
@@ -44,7 +44,7 @@
 
 desc 'Uninstall previously installed packaged'
 task 'uninstall' do |task|
-  print "Uninstalling #{$spec.name} ... "
+  print "Uninstalling #{spec.name} ... "
   args = [Config::CONFIG['ruby_install_name'], '-S', 'gem', 'uninstall', spec.name, '--version', spec.version]
   args.unshift('sudo') unless windows?
   sh *args