Author: donaldp
Date: Thu Feb 7 01:03:39 2013
New Revision: 1443291
URL: http://svn.apache.org/viewvc?rev=1443291&view=rev
Log:
Fix the determination of the base directory to handle an explicitly supplied
base_dir
Modified:
buildr/trunk/addon/buildr/single_intermediate_layout.rb
Modified: buildr/trunk/addon/buildr/single_intermediate_layout.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/single_intermediate_layout.rb?rev=1443291&r1=1443290&r2=1443291&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/single_intermediate_layout.rb (original)
+++ buildr/trunk/addon/buildr/single_intermediate_layout.rb Thu Feb 7 01:03:39
2013
@@ -30,10 +30,12 @@ module Buildr #nodoc
parent = parent_name.empty? ? nil :
Buildr.application.lookup(parent_name.join(':'))
# Follow the same algorithm as in project code
- if parent
+ if properties[:base_dir]
+ base_dir = properties[:base_dir]
+ elsif parent
base_dir = File.expand_path(name.split(':').last, parent.base_dir)
else
- base_dir = properties[:base_dir] || Dir.pwd
+ base_dir = Dir.pwd
end
# The top directory is the base directory of the root project
