You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by as...@apache.org on 2008/07/01 05:14:40 UTC
svn commit: r672981 - in /incubator/buildr/trunk: CHANGELOG
lib/buildr/ide/idea7x.rb
Author: assaf
Date: Mon Jun 30 20:14:39 2008
New Revision: 672981
URL: http://svn.apache.org/viewvc?rev=672981&view=rev
Log:
BUILDR-92 IDEA 7x: add resources directories to classpath.
Modified:
incubator/buildr/trunk/CHANGELOG
incubator/buildr/trunk/lib/buildr/ide/idea7x.rb
Modified: incubator/buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/CHANGELOG?rev=672981&r1=672980&r2=672981&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Mon Jun 30 20:14:39 2008
@@ -14,6 +14,7 @@
* Fixed: BUILDR-89 JUnit (and all other Java frameworks) no longer include
abstract classes.
* Fixed: BUILDR-90 Installing from source doesn't work with JRuby.
+* Fixed: BUILDR-91 IDEA 7x: add resources directories to classpath.
* Fixed: Installation instructions updated for RubyGems 1.2.0.
1.3.1.1 (2008-06-04)
Modified: incubator/buildr/trunk/lib/buildr/ide/idea7x.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/ide/idea7x.rb?rev=672981&r1=672980&r2=672981&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/ide/idea7x.rb (original)
+++ incubator/buildr/trunk/lib/buildr/ide/idea7x.rb Mon Jun 30 20:14:39 2008
@@ -90,9 +90,11 @@
Buildr::Idea7x.generate_order_entries(project_libs, xml)
- ext_libs = m2_libs.map { |path| path.to_s.sub(m2repo, "$M2_REPO$") }
+ ext_libs = m2_libs.map { |path| "jar://#{path.to_s.sub(m2repo, "$M2_REPO$")}!/" }
+ ext_libs << "#{MODULE_DIR_URL}/#{relative[project.test.resources.target.to_s]}" if project.test.resources.target
+ ext_libs << "#{MODULE_DIR_URL}/#{relative[project.resources.target.to_s]}" if project.resources.target
+
Buildr::Idea7x.generate_module_libs(xml, ext_libs)
-
xml.orderEntryProperties
end
end
@@ -122,6 +124,7 @@
def generate_compile_output(project, xml, relative)
xml.output(:url=>"#{MODULE_DIR_URL}/#{relative[project.compile.target.to_s]}") if project.compile.target
xml.tag!("output-test", :url=>"#{MODULE_DIR_URL}/#{relative[project.test.compile.target.to_s]}") if project.test.compile.target
+ xml.tag!("exclude-output")
end
def generate_content(project, xml, relative)
@@ -147,7 +150,8 @@
end
end
end
- xml.excludeFolder :url=>"#{MODULE_DIR_URL}/#{relative[project.compile.target.to_s]}" if project.compile.target
+ xml.excludeFolder :url=>"#{MODULE_DIR_URL}/#{relative[project.resources.target.to_s]}" if project.resources.target
+ xml.excludeFolder :url=>"#{MODULE_DIR_URL}/#{relative[project.test.resources.target.to_s]}" if project.test.resources.target
end
end
@@ -156,7 +160,7 @@
xml.orderEntry :type=>"module-library" do
xml.library do
xml.CLASSES do
- xml.root :url=>"jar://#{path}!/"
+ xml.root :url=> path
end
xml.JAVADOC
xml.SOURCES