Author: toulmean
Date: Sat Jul 17 01:26:18 2010
New Revision: 964992
URL: http://svn.apache.org/viewvc?rev=964992&view=rev
Log:
adding reference to Util to repair the breakage
Modified:
buildr/trunk/lib/buildr/core/util.rb
buildr/trunk/lib/buildr/java/commands.rb
Modified: buildr/trunk/lib/buildr/core/util.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/util.rb?rev=964992&r1=964991&r2=964992&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/util.rb (original)
+++ buildr/trunk/lib/buildr/core/util.rb Sat Jul 17 01:26:18 2010
@@ -54,7 +54,7 @@ module Buildr
def ruby(*args)
options = Hash === args.last ? args.pop : {}
cmd = []
- ruby_bin = File.expand_path(Config::CONFIG['ruby_install_name'],
Config::CONFIG['bindir'])
+ ruby_bin = File.normalize_path(Config::CONFIG['ruby_install_name'],
Config::CONFIG['bindir'])
if options.delete(:sudo) && !(win_os? || Process.uid ==
File.stat(ruby_bin).uid)
cmd << 'sudo' << '-u' << "##{File.stat(ruby_bin).uid}"
end
Modified: buildr/trunk/lib/buildr/java/commands.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/commands.rb?rev=964992&r1=964991&r2=964992&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/commands.rb (original)
+++ buildr/trunk/lib/buildr/java/commands.rb Sat Jul 17 01:26:18 2010
@@ -199,9 +199,9 @@ module Java
# Returns the path to the specified Java command (with no argument to
java itself).
def path_to_bin(name = nil)
home = ENV['JAVA_HOME'] or fail 'Are we forgetting something?
JAVA_HOME not set.'
- bin = File.normalize_path(File.join(home, 'bin'))
+ bin = Util.normalize_path(File.join(home, 'bin'))
fail 'JAVA_HOME environment variable does not point to a valid JRE/JDK
installation.' unless File.exist? bin
- File.normalize_path(File.join(bin, name.to_s))
+ Util.normalize_path(File.join(bin, name.to_s))
end
# :call-seq:
