Author: assaf
Date: Tue Aug 26 00:46:48 2008
New Revision: 688988
URL: http://svn.apache.org/viewvc?rev=688988&view=rev
Log:
Shorted paths for buildr.rb, build.yml, looks better when running rake --prereq
Modified:
incubator/buildr/trunk/lib/buildr/core/application.rb
Modified: incubator/buildr/trunk/lib/buildr/core/application.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/application.rb?rev=688988&r1=688987&r2=688988&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/application.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/application.rb Tue Aug 26 00:46:48
2008
@@ -93,7 +93,8 @@
private
def load_from(base_name, dir = nil)
- file_name = ['yaml', 'yml'].map { |ext|
File.expand_path("#{base_name}.#{ext}", dir) }.find { |fn| File.exist?(fn) }
+ base_name = File.expand_path(base_name, dir) if dir
+ file_name = ['yaml', 'yml'].map { |ext| "#{base_name}.#{ext}" }.find {
|fn| File.exist?(fn) }
return {} unless file_name
yaml = YAML.load(File.read(file_name)) || {}
fail "Expecting #{file_name} to be a map (name: value)!" unless Hash ===
yaml
@@ -255,7 +256,7 @@
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}'" }
#Load local tasks that can be used in the Buildfile.
- files += Dir["#{Dir.pwd}/tasks/*.rake"]
+ files += Dir['tasks/*.rake']
files.each do |file|
unless $LOADED_FEATURES.include?(file)
load file
