Author: assaf
Date: Tue Jul 7 00:48:04 2009
New Revision: 791663
URL: http://svn.apache.org/viewvc?rev=791663&view=rev
Log:
Added x86-mswin32 platform, so we can switch RJB over to 1.1.7 (all platforms
but Windows) to support running Buildr on Ruby 1.9.1.
Modified:
buildr/trunk/Rakefile
buildr/trunk/buildr.gemspec
buildr/trunk/rakelib/package.rake
Modified: buildr/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/buildr/trunk/Rakefile?rev=791663&r1=791662&r2=791663&view=diff
==============================================================================
--- buildr/trunk/Rakefile (original)
+++ buildr/trunk/Rakefile Tue Jul 7 00:48:04 2009
@@ -28,7 +28,7 @@
# Load the Gem specification for the current platform (Ruby or JRuby).
def spec(platform = RUBY_PLATFORM[/java/] || 'ruby')
- @specs ||= ['ruby', 'java'].inject({}) { |hash, spec_platform|
+ @specs ||= ['ruby', 'java', 'x86-mswin32'].inject({}) { |hash, spec_platform|
$platform = spec_platform
hash.update(spec_platform=>Gem::Specification.load('buildr.gemspec'))
}
Modified: buildr/trunk/buildr.gemspec
URL:
http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=791663&r1=791662&r2=791663&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Tue Jul 7 00:48:04 2009
@@ -55,7 +55,8 @@
spec.add_dependency 'highline', '1.5.1'
spec.add_dependency 'rubyforge', '1.0.3'
spec.add_dependency 'hoe', '~>2.0'
- spec.add_dependency 'rjb', '1.1.6' if spec.platform.to_s ==
'ruby'
+ spec.add_dependency 'rjb', '1.1.7' if spec.platform.to_s ==
'ruby'
+ spec.add_dependency 'rjb', '1.1.6' if spec.platform.to_s ==
'x86-mswin32'
spec.add_dependency 'Antwrap', '0.7.0'
spec.add_dependency 'rspec', '1.2.7'
spec.add_dependency 'xml-simple', '1.0.12'
Modified: buildr/trunk/rakelib/package.rake
URL:
http://svn.apache.org/viewvc/buildr/trunk/rakelib/package.rake?rev=791663&r1=791662&r2=791663&view=diff
==============================================================================
--- buildr/trunk/rakelib/package.rake (original)
+++ buildr/trunk/rakelib/package.rake Tue Jul 7 00:48:04 2009
@@ -51,9 +51,11 @@
file Rake::GemPackageTask.new(spec).package_dir=>:compile
file Rake::GemPackageTask.new(spec).package_dir_path=>:compile
-# We also need the other package (JRuby if building on Ruby, and vice versa)
+# We also need the other packages (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| }
[email protected] do |s|
+ Rake::GemPackageTask.new(s) { |task| }
+end
desc "Upload snapshot packages over to people.apache.org"
