Author: assaf
Date: Fri Apr 25 17:48:46 2008
New Revision: 651758
URL: http://svn.apache.org/viewvc?rev=651758&view=rev
Log:
Fixed rake setup to work properly for RJB, still testing how to skip RJB 1.1.3
Modified:
incubator/buildr/trunk/Rakefile
incubator/buildr/trunk/buildr.gemspec
incubator/buildr/trunk/rakelib/package.rake
incubator/buildr/trunk/rakelib/setup.rake
Modified: incubator/buildr/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/Rakefile?rev=651758&r1=651757&r2=651758&view=diff
==============================================================================
--- incubator/buildr/trunk/Rakefile (original)
+++ incubator/buildr/trunk/Rakefile Fri Apr 25 17:48:46 2008
@@ -26,13 +26,12 @@
if platform =~ /java/
spec.add_dependency 'ci_reporter', '~> 1.5'
else
- #spec.add_dependency 'rjb', '~> 1.1', '!= 1.1.3' # TODO: look at
this
- spec.add_dependency 'rjb', '~> 1.1'
+ #spec.add_dependency 'rjb', '1.1.2'
+ spec.add_dependency 'rjb', '~>1.1', '!=1.1.3' # 1.1.3 is missing Windows
Gem.
end
spec
end
end
-
desc 'Compile Java libraries used by Buildr'
Modified: incubator/buildr/trunk/buildr.gemspec
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/buildr.gemspec?rev=651758&r1=651757&r2=651758&view=diff
==============================================================================
--- incubator/buildr/trunk/buildr.gemspec (original)
+++ incubator/buildr/trunk/buildr.gemspec Fri Apr 25 17:48:46 2008
@@ -31,4 +31,5 @@
spec.add_dependency 'xml-simple', '~> 1.0'
spec.add_dependency 'archive-tar-minitar', '~> 0.5'
spec.add_dependency 'rubyforge', '~> 0.4'
+ spec.add_dependency 'rjb', '~>1.1', '!=1.1.3' # 1.1.3 is missing Windows Gem.
end
Modified: incubator/buildr/trunk/rakelib/package.rake
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/package.rake?rev=651758&r1=651757&r2=651758&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/package.rake (original)
+++ incubator/buildr/trunk/rakelib/package.rake Fri Apr 25 17:48:46 2008
@@ -26,7 +26,7 @@
end
desc 'Install the package locally'
-task 'install'=>"#{package.package_dir}/#{package.gem_file}" do |task|
+task 'install'=>['setup', "#{package.package_dir}/#{package.gem_file}"] do
|task|
print "Installing #{spec.name} ... "
args = [Config::CONFIG['ruby_install_name'], '-S', 'gem', 'install',
"#{package.package_dir}/#{package.gem_file}"]
args.unshift('sudo') unless windows?
Modified: incubator/buildr/trunk/rakelib/setup.rake
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/setup.rake?rev=651758&r1=651757&r2=651758&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/setup.rake (original)
+++ incubator/buildr/trunk/rakelib/setup.rake Fri Apr 25 17:48:46 2008
@@ -43,7 +43,7 @@
fail "#{dep} not found in local or remote repository!" unless spec
puts "Installing #{spec} ..."
args = [Config::CONFIG['ruby_install_name'], '-S', 'gem', 'install',
spec.name, '-v', spec.version.to_s]
- args.unshift('sudo') unless windows?
+ args.unshift('sudo', 'env', 'JAVA_HOME=' + ENV['JAVA_HOME']) unless
windows?
sh *args
end
end
