Author: nickboldt
Date: 2010-05-11 16:50:40 -0400 (Tue, 11 May 2010)
New Revision: 22028
Modified:
branches/modular_build/genpom.xml
Log:
report when pom.xml files exist and are not overwritten by pomgen
Modified: branches/modular_build/genpom.xml
===================================================================
--- branches/modular_build/genpom.xml 2010-05-11 20:30:21 UTC (rev 22027)
+++ branches/modular_build/genpom.xml 2010-05-11 20:50:40 UTC (rev 22028)
@@ -90,6 +90,8 @@
</classpath>
</taskdef>
+ <var name="show.pom.exists.warning" value="" />
+
<!-- = = = = = = = = = = = = = = = = =
macrodef: write out a pom.xml which aggregates subdirs
= = = = = = = = = = = = = = = = = -->
@@ -134,6 +136,17 @@
/>
<echo level="verbose"> Agg dir: ${activeDir}, artifactType:
${artifactType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion},
parentpom: @{parentpom}</echo>
<if>
+ <and>
+ <available file="(a){dir}/pom.xml" type="file" />
+ <not>
+ <istrue value="${overwrite.existing.pom.xml}" />
+ </not>
+ </and>
+ <then>
+ <var name="show.pom.exists.warning"
value="${show.pom.exists.warning}1" />
+ </then>
+ </if>
+ <if>
<or>
<not>
<available file="(a){dir}/pom.xml" type="file" />
@@ -223,6 +236,17 @@
/>
<echo level="verbose"> Mod dir: ${activeDir}, artifactType:
${artifactType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion},
parentpom: @{parentpom}</echo>
<if>
+ <and>
+ <available file="(a){dir}/pom.xml" type="file" />
+ <not>
+ <istrue value="${overwrite.existing.pom.xml}" />
+ </not>
+ </and>
+ <then>
+ <var name="show.pom.exists.warning"
value="${show.pom.exists.warning}1" />
+ </then>
+ </if>
+ <if>
<or>
<not>
<available file="(a){dir}/pom.xml" type="file" />
@@ -505,7 +529,15 @@
<length string="${modulecountstring}" property="modulecount"
/>
<length string="${aggregatorcountstring}"
property="aggregatorcount" />
<echo level="info">${WORKINGDIR}/${COMPONENT} :: Modules:
${modulecount}, Aggregations: ${aggregatorcount}</echo>
-
+ <if>
+ <not>
+ <equals arg1="${show.pom.exists.warning}" arg2="" />
+ </not>
+ <then>
+ <length property="show.pom.exists.warning.count"
string="${show.pom.exists.warning}" />
+ <echo level="warning">${show.pom.exists.warning.count} pom.xml
file(s) already exist. To overwrite, use -Doverwrite.existing.pom.xml=true</echo>
+ </then>
+ </if>
</target>
<target name="getArtifactType">