Author: boisvert
Date: Mon Feb 4 19:14:39 2013
New Revision: 1442302
URL: http://svn.apache.org/viewvc?rev=1442302&view=rev
Log:
Fixed: BUILDR-660 possible build issue when using build.yaml and tasks/*.rake
(Félix Enrique Llorente Pastora)
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/core/application.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1442302&r1=1442301&r2=1442302&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Mon Feb 4 19:14:39 2013
@@ -1,4 +1,6 @@
1.4.10 (Pending)
+* Fixed: BUILDR-660 possible build issue when using build.yaml and
tasks/*.rake
+ (Félix Enrique Llorente Pastora)
* Added: Support the :dir option in the Java::Commands.java method.
* Fixed: Scala 2.10 support - compiler now uses additional/separate jars
introduced in 2.10 such as scala-reflect.jar and scala-actor.jar
Modified: buildr/trunk/lib/buildr/core/application.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/application.rb?rev=1442302&r1=1442301&r2=1442302&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/application.rb (original)
+++ buildr/trunk/lib/buildr/core/application.rb Mon Feb 4 19:14:39 2013
@@ -91,7 +91,7 @@ module Buildr
def load_from(name, path = nil)
unless path
fail "Internal error: attempting to access local setting before
buildfile located" unless @application.rakefile
- path = File.dirname(@application.rakefile)
+ path = File.expand_path(File.dirname(@application.rakefile))
end
file_name = ['yaml', 'yml'].map { |ext| File.join(path,
"#{name}.#{ext}") }.find { |fn| File.exist?(fn) }
return {} unless file_name
@@ -483,7 +483,7 @@ module Buildr
files = [ File.exist?(new) ? new : old, 'buildr.rb' ].select { |file|
File.exist?(file) }
files += [ File.expand_path('buildr.rake', ENV['HOME']),
File.expand_path('buildr.rake') ].
select { |file| File.exist?(file) }.each { |file| warn "Please use
'#{file.ext('rb')}' instead of '#{file}'" }
- files += (options.rakelib || []).collect { |rlib| Dir["#{rlib}/*.rake"]
}.flatten
+ files += (options.rakelib || []).collect { |rlib|
Dir["#{File.expand_path(rlib)}/*.rake"] }.flatten
# Load .buildr/_buildr.rb same directory as buildfile
%w{.buildr.rb _buildr.rb}.each do |f|
