svn commit: r655759 - in /incubator/buildr/trunk: Rakefile rakelib/setup.rake

[as...@apache.org]

Author: assaf
Date: Tue May 13 00:26:44 2008
New Revision: 655759

URL: http://svn.apache.org/viewvc?rev=655759&view=rev
Log:
Force Buildr to ignore RJB 1.1.3 (no Windows support).

Modified:
    incubator/buildr/trunk/Rakefile
    incubator/buildr/trunk/rakelib/setup.rake

Modified: incubator/buildr/trunk/Rakefile
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/Rakefile?rev=655759&r1=655758&r2=655759&view=diff
==============================================================================
--- incubator/buildr/trunk/Rakefile (original)
+++ incubator/buildr/trunk/Rakefile Tue May 13 00:26:44 2008
@@ -27,7 +27,8 @@
       spec.add_dependency 'jruby-openssl', '~> 0.2'
       spec.add_dependency 'ci_reporter', '~> 1.5'
     else
-      spec.add_dependency 'rjb', '~>1.1'
+      # Place first on the dependency list, otherwise AntWrap picks the latest RJB.
+      spec.dependencies.unshift Gem::Dependency.new('rjb', ['~>1.1', '!= 1.1.3'])
     end
     spec
   end

Modified: incubator/buildr/trunk/rakelib/setup.rake
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/setup.rake?rev=655759&r1=655758&r2=655759&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/setup.rake (original)
+++ incubator/buildr/trunk/rakelib/setup.rake Tue May 13 00:26:44 2008
@@ -40,7 +40,7 @@
   dep = Gem::Dependency.new(name, ver_requirement)
   rb_bin = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
   if Gem::SourceIndex.from_installed_gems.search(dep).empty?
-    spec = Gem::SourceInfoCache.search(dep).last
+    spec = Gem::SourceInfoCache.search(dep, true, true).last
     fail "#{dep} not found in local or remote repository!" unless spec
     puts "Installing #{spec} ..."
     args = [rb_bin, '-S', 'gem', 'install', spec.name, '-v', spec.version.to_s]