svn commit: r697545 - /incubator/buildr/trunk/_buildr

[vb...@apache.org]

Author: vborja
Date: Sun Sep 21 09:47:30 2008
New Revision: 697545

URL: http://svn.apache.org/viewvc?rev=697545&view=rev
Log:
Fix _buildr to use _BUILDR_RB, so that we can run it using jruby

Modified:
    incubator/buildr/trunk/_buildr

Modified: incubator/buildr/trunk/_buildr
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/_buildr?rev=697545&r1=697544&r2=697545&view=diff
==============================================================================
--- incubator/buildr/trunk/_buildr (original)
+++ incubator/buildr/trunk/_buildr Sun Sep 21 09:47:30 2008
@@ -14,23 +14,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-start = Time.now
-require 'rubygems'
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib'), File.join(File.dirname(__FILE__), 'addon')
-gem 'rake', '0.8.1' # Required since Buildr won't run with 0.8.2 for now.
-require 'buildr'
-Buildr.application.run
-if verbose
-  elapsed = Time.now - start
-  real = []
-  real << ("%ih" % (elapsed / 3600)) if elapsed >= 3600
-  real << ("%im" % ((elapsed / 60) % 60)) if elapsed >= 60
-  real << ("%.3fs" % (elapsed % 60))
-  puts $terminal.color("Completed in #{real.join}", :green)
-end
-
-
-=begin
 # Run buildr from source, specifically for testing stuff without doing a rake install.
 # The _BUILDR_RB environment variable can be used to set the path to the ruby/jruby executable.
 # For example to use jruby:
@@ -38,12 +21,30 @@
 
 buildr_root = File.dirname(__FILE__)
 buildr_ruby = ENV['_BUILDR_RB'] || 'ruby'
+
 cmd = [
     buildr_ruby,
     "-I"+File.join(buildr_root, 'lib'),
     "-I"+File.join(buildr_root, 'addon'),
-    File.join(buildr_root, 'bin', 'buildr'),
-] + ARGV
+]
+
+cmd.push '-e', %q{
+  start = Time.now
+  require 'rubygems'
+  gem 'rake', '0.8.1' # Required since Buildr won't run with 0.8.2 for now.
+  require 'buildr'
+  Buildr.application.run
+  if verbose
+    elapsed = Time.now - start
+    real = []
+    real << ("%ih" % (elapsed / 3600)) if elapsed >= 3600
+    real << ("%im" % ((elapsed / 60) % 60)) if elapsed >= 60
+    real << ("%.3fs" % (elapsed % 60))
+    puts $terminal.color("Completed in #{real.join}", :green)
+  end
+}
+
+cmd.push *ARGV
 
 exec *cmd
-=end
\ No newline at end of file
+