Skip to content
Browse files

Added x86-mswin32 platform, so we can switch RJB over to 1.1.7 (all p…

…latforms but Windows) to support running Buildr on Ruby 1.9.1.

git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@791663 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 7736aad commit 761abbffa1e551911fb22e87eb27a6b5be79df42 Assaf Arkin committed Jul 7, 2009
Showing with 7 additions and 4 deletions.
  1. +1 −1 Rakefile
  2. +2 −1 buildr.gemspec
  3. +4 −2 rakelib/package.rake
View
2 Rakefile
@@ -28,7 +28,7 @@ end
# 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'))
}
View
3 buildr.gemspec
@@ -55,7 +55,8 @@ for those one-off tasks, with a language that's a joy to use.
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'
View
6 rakelib/package.rake
@@ -51,9 +51,11 @@ end
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| }
+@specs.values.each do |s|
+ Rake::GemPackageTask.new(s) { |task| }
+end
desc "Upload snapshot packages over to people.apache.org"

0 comments on commit 761abbf

Please sign in to comment.
Something went wrong with that request. Please try again.