svn commit: r1395209 - in /buildr/trunk: buildr.gemspec rakelib/all-in-one.rake

[do...@apache.org]

Author: donaldp
Date: Sun Oct  7 04:35:44 2012
New Revision: 1395209

URL: http://svn.apache.org/viewvc?rev=1395209&view=rev
Log:
Resort the order of actions and lock down the ffi-ncurses gem in the omnibus package

Modified:
    buildr/trunk/buildr.gemspec
    buildr/trunk/rakelib/all-in-one.rake

Modified: buildr/trunk/buildr.gemspec
URL: http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=1395209&r1=1395208&r2=1395209&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Sun Oct  7 04:35:44 2012
@@ -82,6 +82,7 @@ for those one-off tasks, with a language
 
   spec.add_development_dependency 'ci_reporter', '1.7.2'
 
+  # NOTE: Must update all-in-one.rake if this is updated
   spec.add_development_dependency 'ffi-ncurses', '0.4.0' if $platform.to_s == 'java'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'win32console' if $platform.to_s == 'x86-mswin32'

Modified: buildr/trunk/rakelib/all-in-one.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/all-in-one.rake?rev=1395209&r1=1395208&r2=1395209&view=diff
==============================================================================
--- buildr/trunk/rakelib/all-in-one.rake (original)
+++ buildr/trunk/rakelib/all-in-one.rake Sun Oct  7 04:35:44 2012
@@ -86,15 +86,15 @@ namespace :'all-in-one' do
 
   desc 'Install Buildr gem and dependencies'
   task :install_dependencies do
+    puts "Install ffi-ncurses"
+    sh "bin/jruby -S gem install -b ffi-ncurses --version 0.4.0"
+
     puts "Install rubygems-update"
-    sh "bin/jruby -S gem install rubygems-update"
+    sh "bin/jruby -S gem install -b rubygems-update"
 
     puts "Upgrade Rubygems"
     sh "bin/jruby -S gem update --system"
 
-    puts "Install ffi-ncurses"
-    sh "bin/jruby -S gem install ffi-ncurses"
-
     puts "Install Buildr gem ..."
     sh "bin/jruby", '-S', 'gem', 'install', FileList['../../pkg/*-java.gem'].first,
        '--no-rdoc', '--no-ri'