Author: assaf
Date: Mon Oct 20 16:27:13 2008
New Revision: 706454
URL: http://svn.apache.org/viewvc?rev=706454&view=rev
Log:
Allow Buildr.settings.build/profile when using --generate option.
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=706454&r1=706453&r2=706454&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/application.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/application.rb Mon Oct 20 16:27:13
2008
@@ -384,14 +384,15 @@
end
def raw_generate_buildfile(source)
- buildfile = File.expand_path(DEFAULT_BUILDFILES.first)
- fail "Buildfile already exists" if File.exist?(buildfile) &&
!(tty_output? && agree('Buildfile exists, overwrite?'))
+ # We need rakefile to be known, for settings.build to be accessible.
+ @rakefile = File.expand_path(DEFAULT_BUILDFILES.first)
+ fail "Buildfile already exists" if File.exist?(@rakefile) &&
!(tty_output? && agree('Buildfile exists, overwrite?'))
script = File.directory?(source) ? Generate.from_directory(source) :
Generate.from_maven2_pom(source)
- File.open buildfile, 'w' do |file|
+ File.open @rakefile, 'w' do |file|
file.puts script
end
- puts "Created #{buildfile}" if verbose
- buildfile
+ puts "Created [EMAIL PROTECTED]" if verbose
+ @rakefile
end
def raw_load_buildfile # replaces raw_load_rakefile