You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2013/10/01 11:28:04 UTC
svn commit: r1527986 - /buildr/trunk/lib/buildr/ide/idea.rb
Author: donaldp
Date: Tue Oct 1 09:28:03 2013
New Revision: 1527986
URL: http://svn.apache.org/r1527986
Log:
Ensure that the artifacts are stored relative to the top level projects directory
Modified:
buildr/trunk/lib/buildr/ide/idea.rb
Modified: buildr/trunk/lib/buildr/ide/idea.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/idea.rb?rev=1527986&r1=1527985&r2=1527986&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/idea.rb (original)
+++ buildr/trunk/lib/buildr/ide/idea.rb Tue Oct 1 09:28:03 2013
@@ -722,8 +722,8 @@ module Buildr #:nodoc:
libraries, projects = partition_dependencies(dependencies)
## The content here can not be indented
- output_dir = options[:output_dir] || project._(:artifacts, artifact_name)
- xml.tag!('output-path', output_dir)
+ output_dir = options[:output_dir] || buildr_project._(:artifacts, artifact_name)
+ xml.tag!('output-path', resolve_path(output_dir))
xml.root :id => "root" do
xml.element :id => "directory", :name => "WEB-INF" do
@@ -769,8 +769,8 @@ module Buildr #:nodoc:
libraries, projects = partition_dependencies(dependencies)
## The content here can not be indented
- output_dir = options[:output_dir] || project._(:artifacts, artifact_name)
- xml.tag!('output-path', output_dir)
+ output_dir = options[:output_dir] || buildr_project._(:artifacts, artifact_name)
+ xml.tag!('output-path', resolve_path(output_dir))
xml.root :id => "root" do
@@ -802,8 +802,8 @@ module Buildr #:nodoc:
jar_name = "#{artifact_name}.jar"
add_artifact(jar_name, "jar", build_on_make) do |xml|
- output_dir = options[:output_dir] || project._(:artifacts, artifact_name)
- xml.tag!('output-path', output_dir)
+ output_dir = options[:output_dir] || buildr_project._(:artifacts, artifact_name)
+ xml.tag!('output-path', resolve_path(output_dir))
xml.root(:id => "archive", :name => jar_name) do
artifact_content(xml, project, projects, options)
end
@@ -820,8 +820,8 @@ module Buildr #:nodoc:
libraries, projects = partition_dependencies(dependencies)
## The content here can not be indented
- output_dir = options[:output_dir] || project._(:artifacts, artifact_name)
- xml.tag!('output-path', output_dir)
+ output_dir = options[:output_dir] || buildr_project._(:artifacts, artifact_name)
+ xml.tag!('output-path', resolve_path(output_dir))
xml.root :id => "root" do