Author: vborja
Date: Mon Sep 1 12:18:57 2008
New Revision: 691034
URL: http://svn.apache.org/viewvc?rev=691034&view=rev
Log:
BUILDR-129. Modifying a project manifest should not alter it's
parent project manifest.
Modified:
incubator/buildr/trunk/CHANGELOG
incubator/buildr/trunk/lib/buildr/java/packaging.rb
Modified: incubator/buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/CHANGELOG?rev=691034&r1=691033&r2=691034&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Mon Sep 1 12:18:57 2008
@@ -17,6 +17,8 @@
* Change: Buildr.application.buildfile returns a task instead of a String.
* Change: BUILDR-139 Incremental test run.
* Change: BUILDR-141 Removed NEXT_VERSION from release task.
+* Fixed: BUILDR-129. Modifying a project manifest should not alter it's
+ parent project manifest.
* Fixed: BUILDR-106 download(artifact(...)=>url) broken in certain cases
(Lacton).
* Fixed: BUILDR-108 Trace to explain why a compile is done (Lacton).
Modified: incubator/buildr/trunk/lib/buildr/java/packaging.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/packaging.rb?rev=691034&r1=691033&r2=691034&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/packaging.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/packaging.rb Mon Sep 1 12:18:57 2008
@@ -572,12 +572,19 @@
before_define do |project|
::Java.load
- project.manifest ||= project.parent && project.parent.manifest ||
- { 'Build-By'=>ENV['USER'], 'Build-Jdk'=>ENV_JAVA['java.version'],
+ if project.parent && project.parent.manifest
+ project.manifest = project.parent.manifest.dup
+ else
+ project.manifest = {
+ 'Build-By'=>ENV['USER'], 'Build-Jdk'=>ENV_JAVA['java.version'],
'Implementation-Title'=>project.comment || project.name,
'Implementation-Version'=>project.version }
- project.meta_inf ||= project.parent && project.parent.meta_inf ||
- [project.file('LICENSE')].select { |file| File.exist?(file.to_s) }
+ end
+ if project.parent && project.parent.meta_inf
+ project.meta_inf = project.parent.meta_inf.dup
+ else
+ project.meta_inf = [project.file('LICENSE')].select { |file|
File.exist?(file.to_s) }
+ end
end
