You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2012/05/02 07:29:47 UTC
svn commit: r1332923 - in /buildr/trunk: ./ addon/buildr/ lib/
lib/buildr/core/ lib/buildr/java/ rakelib/ spec/java/
Author: donaldp
Date: Wed May 2 05:29:46 2012
New Revision: 1332923
URL: http://svn.apache.org/viewvc?rev=1332923&view=rev
Log:
BUILDR-638 Update to rake 0.9.2.2
Dervived from patch supplied by: Russell Teabeault
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/Rakefile
buildr/trunk/addon/buildr/nailgun.rb
buildr/trunk/buildr.gemspec
buildr/trunk/lib/buildr.rb
buildr/trunk/lib/buildr/core/application.rb
buildr/trunk/lib/buildr/core/shell.rb
buildr/trunk/lib/buildr/core/util.rb
buildr/trunk/lib/buildr/java/bdd.rb
buildr/trunk/lib/buildr/java/rjb.rb
buildr/trunk/rakelib/package.rake
buildr/trunk/spec/java/java_spec.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1332923&r1=1332922&r2=1332923&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Wed May 2 05:29:46 2012
@@ -1,4 +1,5 @@
1.4.7 (Pending)
+* Change: BUILDR-638 Update to rake 0.9.2.2 (Russell Teabeault)
* Added: BUILDR-316 Add a GWT extension
* Change: BUILDR-624 Update rspec version to 2.9.0 (Russell Teabeault)
* Change: BUILDR-637 Update rubyzip version to 0.9.8 (Russell Teabeault)
Modified: buildr/trunk/Rakefile
URL: http://svn.apache.org/viewvc/buildr/trunk/Rakefile?rev=1332923&r1=1332922&r2=1332923&view=diff
==============================================================================
--- buildr/trunk/Rakefile (original)
+++ buildr/trunk/Rakefile Wed May 2 05:29:46 2012
@@ -39,7 +39,7 @@ end
# Tell us if we need sudo for various commands.
def sudo_needed?
- Config::CONFIG['host_os'] !~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i && !ENV['GEM_HOME']
+ RbConfig::CONFIG['host_os'] !~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i && !ENV['GEM_HOME']
end
Modified: buildr/trunk/addon/buildr/nailgun.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/nailgun.rb?rev=1332923&r1=1332922&r2=1332923&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/nailgun.rb (original)
+++ buildr/trunk/addon/buildr/nailgun.rb Wed May 2 05:29:46 2012
@@ -49,7 +49,7 @@ module Buildr
# Returns the path to JRUBY_HOME.
def jruby_home
- ENV['JRUBY_HOME'] || Config::CONFIG['prefix']
+ ENV['JRUBY_HOME'] || RbConfig::CONFIG['prefix']
end
# Returns the path to NAILGUN_HOME.
@@ -164,7 +164,7 @@ module Buildr
attr_reader :artifact
@artifact = Buildr.artifact(ARTIFACT_SPEC).from(nailgun_jar)
- compiled_bin = file(tmp_path(NAME, NAME, 'ng' + Config::CONFIG['EXEEXT']) => dist_dir.target) do |task|
+ compiled_bin = file(tmp_path(NAME, NAME, 'ng' + RbConfig::CONFIG['EXEEXT']) => dist_dir.target) do |task|
unless task.to_s.pathmap('%x') == '.exe'
Dir.chdir(task.to_s.pathmap('%d')) do
info "Compiling #{task.to_s}"
Modified: buildr/trunk/buildr.gemspec
URL: http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=1332923&r1=1332922&r2=1332923&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Wed May 2 05:29:46 2012
@@ -52,7 +52,7 @@ for those one-off tasks, with a language
spec.required_rubygems_version = ">= 1.8.6"
# Tested against these dependencies.
- spec.add_dependency 'rake', '0.8.7'
+ spec.add_dependency 'rake', '0.9.2.2'
spec.add_dependency 'builder', '2.1.2'
spec.add_dependency 'net-ssh', '2.3.0'
spec.add_dependency 'net-sftp', '2.0.5'
Modified: buildr/trunk/lib/buildr.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr.rb?rev=1332923&r1=1332922&r2=1332923&view=diff
==============================================================================
--- buildr/trunk/lib/buildr.rb (original)
+++ buildr/trunk/lib/buildr.rb Wed May 2 05:29:46 2012
@@ -18,6 +18,8 @@ unless defined?(Buildr::VERSION)
end
require 'rake'
+include Rake::DSL
+
require 'rbconfig'
require 'pathname'
autoload :Tempfile, 'tempfile'
Modified: buildr/trunk/lib/buildr/core/application.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/application.rb?rev=1332923&r1=1332922&r2=1332923&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/application.rb (original)
+++ buildr/trunk/lib/buildr/core/application.rb Wed May 2 05:29:46 2012
@@ -275,6 +275,7 @@ module Buildr
options.show_tasks = true
options.full_description = true
options.show_task_pattern = Regexp.new(value || '')
+ Rake::TaskManager.record_task_metadata = true
}
],
['--execute', '-E CODE',
@@ -300,6 +301,7 @@ module Buildr
lambda { |value|
options.show_prereqs = true
options.show_task_pattern = Regexp.new(value || '')
+ Rake::TaskManager.record_task_metadata = true
}
],
['--quiet', '-q', "Do not log messages to standard output.",
@@ -345,6 +347,7 @@ module Buildr
options.show_tasks = true
options.show_task_pattern = Regexp.new(value || '')
options.full_description = false
+ Rake::TaskManager.record_task_metadata = true
}
],
['--trace', '-t [CATEGORIES]', "Turn on invoke/execute tracing, enable full backtrace.",
Modified: buildr/trunk/lib/buildr/core/shell.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/shell.rb?rev=1332923&r1=1332922&r2=1332923&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/shell.rb (original)
+++ buildr/trunk/lib/buildr/core/shell.rb Wed May 2 05:29:46 2012
@@ -115,7 +115,7 @@ module Buildr
private
def jruby_home
- @jruby_home ||= RUBY_PLATFORM =~ /java/ ? Config::CONFIG['prefix'] : ENV['JRUBY_HOME']
+ @jruby_home ||= RUBY_PLATFORM =~ /java/ ? RbConfig::CONFIG['prefix'] : ENV['JRUBY_HOME']
end
def jruby_artifact
Modified: buildr/trunk/lib/buildr/core/util.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/util.rb?rev=1332923&r1=1332922&r2=1332923&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/util.rb (original)
+++ buildr/trunk/lib/buildr/core/util.rb Wed May 2 05:29:46 2012
@@ -32,7 +32,7 @@ module Buildr
# For JRuby, the value for RUBY_PLATFORM will always be 'java'
# That's why this function checks on Config::CONFIG['host_os']
def win_os?
- Config::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i
+ RbConfig::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i
end
# Runs Ruby with these command line arguments. The last argument may be a hash,
@@ -43,7 +43,7 @@ module Buildr
def ruby(*args)
options = Hash === args.last ? args.pop : {}
cmd = []
- ruby_bin = normalize_path(Config::CONFIG['ruby_install_name'], Config::CONFIG['bindir'])
+ ruby_bin = normalize_path(RbConfig::CONFIG['ruby_install_name'], RbConfig::CONFIG['bindir'])
if options.delete(:sudo) && !(win_os? || Process.uid == File.stat(ruby_bin).uid)
cmd << 'sudo' << '-u' << "##{File.stat(ruby_bin).uid}"
end
Modified: buildr/trunk/lib/buildr/java/bdd.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/bdd.rb?rev=1332923&r1=1332922&r2=1332923&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/bdd.rb (original)
+++ buildr/trunk/lib/buildr/java/bdd.rb Wed May 2 05:29:46 2012
@@ -115,7 +115,7 @@ module Buildr
end
def jruby_home
- @jruby_home ||= RUBY_PLATFORM =~ /java/ ? Config::CONFIG['prefix'] :
+ @jruby_home ||= RUBY_PLATFORM =~ /java/ ? RbConfig::CONFIG['prefix'] :
( ENV['JRUBY_HOME'] || File.expand_path('~/.jruby') )
end
@@ -166,7 +166,7 @@ module Buildr
require 'jruby'
def JRuby.gem(name, version = '>0', *args)
require 'rbconfig'
- jruby_home = Config::CONFIG['prefix']
+ jruby_home = RbConfig::CONFIG['prefix']
expected_version = '#{TestFramework::JRubyBased.version}'
unless JRUBY_VERSION >= expected_version
fail "Expected JRuby version \#{expected_version} installed at \#{jruby_home} but got \#{JRUBY_VERSION}"
Modified: buildr/trunk/lib/buildr/java/rjb.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/rjb.rb?rev=1332923&r1=1332922&r2=1332923&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/rjb.rb (original)
+++ buildr/trunk/lib/buildr/java/rjb.rb Wed May 2 05:29:46 2012
@@ -74,7 +74,7 @@ module Java
# On OS X we know where the default JDK is. We can try to guess for other OS.
# We set JAVA_HOME early so we can use it without calling Java.load first.
- ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home' if Config::CONFIG['host_os'] =~ /darwin/i
+ ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home' if RbConfig::CONFIG['host_os'] =~ /darwin/i
class << self
Modified: buildr/trunk/rakelib/package.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/package.rake?rev=1332923&r1=1332922&r2=1332923&view=diff
==============================================================================
--- buildr/trunk/rakelib/package.rake (original)
+++ buildr/trunk/rakelib/package.rake Wed May 2 05:29:46 2012
@@ -25,7 +25,7 @@ end
desc "Install Buildr from source"
task :install=>["#{package.package_dir}/#{package.gem_spec.file_name}"] do |task|
print "Installing #{spec.name} ... "
- args = Config::CONFIG['ruby_install_name'], '-S', 'gem', 'install', "#{package.package_dir}/#{package.gem_spec.file_name}"
+ args = RbConfig::CONFIG['ruby_install_name'], '-S', 'gem', 'install', "#{package.package_dir}/#{package.gem_spec.file_name}"
args.unshift('sudo') if sudo_needed?
sh *args
puts "[x] Installed Buildr #{spec.version}"
@@ -34,7 +34,7 @@ end
desc "Uninstall previous rake install"
task :uninstall do |task|
puts "Uninstalling #{spec.name} ... "
- args = Config::CONFIG['ruby_install_name'], '-S', 'gem', 'uninstall', spec.name, '--version', spec.version.to_s
+ args = RbConfig::CONFIG['ruby_install_name'], '-S', 'gem', 'uninstall', spec.name, '--version', spec.version.to_s
args.unshift('sudo') if sudo_needed?
sh *args
puts "[x] Uninstalled Buildr #{spec.version}"
@@ -44,7 +44,7 @@ end
desc "Compile Java libraries used by Buildr"
task :compile do
puts "Compiling Java libraries ..."
- args = Config::CONFIG['ruby_install_name'], File.expand_path(RUBY_PLATFORM[/java/] ? '_jbuildr' : '_buildr'), '--buildfile', 'buildr.buildfile', 'compile'
+ args = RbConfig::CONFIG['ruby_install_name'], File.expand_path(RUBY_PLATFORM[/java/] ? '_jbuildr' : '_buildr'), '--buildfile', 'buildr.buildfile', 'compile'
args << '--trace' if Rake.application.options.trace
sh *args
end
Modified: buildr/trunk/spec/java/java_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/java_spec.rb?rev=1332923&r1=1332922&r2=1332923&view=diff
==============================================================================
--- buildr/trunk/spec/java/java_spec.rb (original)
+++ buildr/trunk/spec/java/java_spec.rb Wed May 2 05:29:46 2012
@@ -22,7 +22,7 @@ unless RUBY_PLATFORM =~ /java/
before do
@old_home, ENV['JAVA_HOME'] = ENV['JAVA_HOME'], nil
@old_env_java = Object.module_eval { remove_const :ENV_JAVA }
- Config::CONFIG.should_receive(:[]).with('host_os').and_return('darwin0.9')
+ RbConfig::CONFIG.should_receive(:[]).with('host_os').and_return('darwin0.9')
end
it 'should point to default JVM' do