Author: vborja
Date: Wed Mar 5 14:41:27 2008
New Revision: 634068
URL: http://svn.apache.org/viewvc?rev=634068&view=rev
Log:
Fallback to rubygems/installer if no rubygems/uinstaller (rubygems < 1.1.0)
Added nailgun jar for release:compile
Comment dependency_installer require on lib/core/addon.rb
Modified:
incubator/buildr/trunk/Rakefile
incubator/buildr/trunk/buildfile
incubator/buildr/trunk/lib/core/addon.rb
Modified: incubator/buildr/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/Rakefile?rev=634068&r1=634067&r2=634068&view=diff
==============================================================================
--- incubator/buildr/trunk/Rakefile (original)
+++ incubator/buildr/trunk/Rakefile Wed Mar 5 14:41:27 2008
@@ -1,5 +1,4 @@
require 'rubygems'
-require 'rubygems/uninstaller'
require 'rake/gempackagetask'
require 'rake/rdoctask'
require 'spec/rake/spectask'
@@ -103,6 +102,11 @@
desc 'Uninstall previously installed packaged'
task 'uninstall' do |task|
say "Uninstalling #{ruby_spec.name} ... "
+ begin
+ require 'rubygems/uninstaller'
+ rescue LoadError # < rubygems 1.0.1
+ require 'rubygems/installer'
+ end
Gem::Uninstaller.new(ruby_spec.name, :executables=>true, :ignore=>true
).uninstall
say 'OK'
end
Modified: incubator/buildr/trunk/buildfile
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/buildfile?rev=634068&r1=634067&r2=634068&view=diff
==============================================================================
--- incubator/buildr/trunk/buildfile (original)
+++ incubator/buildr/trunk/buildfile Wed Mar 5 14:41:27 2008
@@ -23,7 +23,8 @@
compile.using :source=>'1.4', :target=>'1.4', :debug=>false
define 'java' do
- compile.using(:javac).from(FileList['lib/java/**/*.java']).into('lib/java')
+ require 'java/nailgun'
+
compile.using(:javac).from(FileList['lib/java/**/*.java']).into('lib/java').with(Buildr::Nailgun.artifact)
end
desc 'ANTLR grammar generation tasks.'
Modified: incubator/buildr/trunk/lib/core/addon.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/core/addon.rb?rev=634068&r1=634067&r2=634068&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/core/addon.rb (original)
+++ incubator/buildr/trunk/lib/core/addon.rb Wed Mar 5 14:41:27 2008
@@ -19,7 +19,6 @@
require 'rubygems/source_info_cache'
require 'rubygems/doc_manager'
require 'rubygems/format'
-require 'rubygems/dependency_installer'
module Buildr
@@ -59,6 +58,7 @@
# but installing the documenation requires RDoc, and RDoc defines
# one too many top-level classes which mess with our stuff.
=begin
+ require 'rubygems/dependency_installer'
installer = Gem::DependencyInstaller.new(path || name, version.to_s).tap
do |installer|
installer.install
say 'Installed'
