svn commit: r753062 - in /buildr/trunk: CHANGELOG lib/buildr/ide/idea7x.rb

[as...@apache.org]

Author: assaf
Date: Thu Mar 12 23:47:00 2009
New Revision: 753062

URL: http://svn.apache.org/viewvc?rev=753062&view=rev
Log:
Fixed:  BUILDR-241 IDEA7X IPR generation does not pay attention to base_dir for submodules (Rhett Sutphin).

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/ide/idea7x.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=753062&r1=753061&r2=753062&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Thu Mar 12 23:47:00 2009
@@ -49,6 +49,8 @@
 * Fixed:  BUILDR-235 JRuby download link is broke (Alexis Midon).
 * Fixed:  BUILDR-239 HTTP redirects lose authentication information (Joel
 Muzzerall).
+* Fixed:  BUILDR-241 IDEA7X IPR generation does not pay attention to base_dir
+for submodules (Rhett Sutphin).
 * Fixed:  BUILDR-247 OpenObject does not work with Hash#only (Rhett Sutphin).
 * Fixed:  BUILDR-253 ZipTask now uses Zlib::DEFAULT_COMPRESSION instead of NO_COMPRESSION
 * Fixed:  BUILDR-261 ScalaSpecs should be run with Scala dependencies

Modified: buildr/trunk/lib/buildr/ide/idea7x.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/idea7x.rb?rev=753062&r1=753061&r2=753062&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/idea7x.rb (original)
+++ buildr/trunk/lib/buildr/ide/idea7x.rb Thu Mar 12 23:47:00 2009
@@ -181,8 +181,8 @@
             xml.modules do
               project.projects.each do |subp|
                 module_name = subp.name.gsub(":", "-")
-                module_path = subp.name.split(":"); module_path.shift
-                module_path = module_path.join(File::SEPARATOR)
+                module_path = subp.base_dir ? subp.base_dir.gsub(/^#{project.base_dir}\//, '') :
+                                              subp.name.split(":")[1 .. -1].join(FILE::SEPARATOR)
                 path = "#{module_path}/#{module_name}#{IML_SUFFIX}"
                 xml.module :fileurl=>"#{PROJECT_DIR_URL}/#{path}", :filepath=>"#{PROJECT_DIR}/#{path}"
               end