mcconnell 2004/02/03 01:19:12
Modified: util maven.xml
Log:
Correct my initial type and add missing existance tests.
Revision Changes Path
1.9 +30 -22 avalon/util/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/util/maven.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- maven.xml 3 Feb 2004 04:53:41 -0000 1.8
+++ maven.xml 3 Feb 2004 09:19:12 -0000 1.9
@@ -62,8 +62,8 @@
<j:set var="path"
value="${child.artifactId}-${child.currentVersion}.jar"/>
<checksum file="${maven.build.dir}/jars/${path}"/>
- <j:if test="${maven.gpg.exec != null}">
- <ant:exec executable="${maven.gpg.exec}">
+ <j:if test="${maven.gpg.exe != null}">
+ <ant:exec executable="${maven.gpg.exe}">
<ant:arg value="--armour"/>
<ant:arg value="--yes"/>
<ant:arg value="-b"/>
@@ -139,22 +139,26 @@
/>
<ant:delete file="${maven.dist.dir}/${build.name}-bin.tar"/>
<checksum file="${maven.dist.dir}/${build.name}-bin.tar.gz"/>
- <ant:exec executable="${maven.gpg.exec}">
- <ant:arg value="--armour"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.dist.dir}/${build.name}-bin.tar.gz"/>
- </ant:exec>
+ <j:if test="${maven.gpg.exe != null}">
+ <ant:exec executable="${maven.gpg.exe}">
+ <ant:arg value="--armour"/>
+ <ant:arg value="-b"/>
+ <ant:arg value="${maven.dist.dir}/${build.name}-bin.tar.gz"/>
+ </ant:exec>
+ </j:if>
<!-- Create a zip file -->
<ant:zip zipfile="${maven.dist.dir}/${build.name}-bin.zip">
<ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
</ant:zip>
<checksum file="${maven.dist.dir}/${build.name}-bin.zip"/>
- <ant:exec executable="${maven.gpg.exec}">
- <ant:arg value="--armour"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.dist.dir}/${build.name}-bin.zip"/>
- </ant:exec>
+ <j:if test="${maven.gpg.exe != null}">
+ <ant:exec executable="${maven.gpg.exe}">
+ <ant:arg value="--armour"/>
+ <ant:arg value="-b"/>
+ <ant:arg value="${maven.dist.dir}/${build.name}-bin.zip"/>
+ </ant:exec>
+ </j:if>
</goal>
<goal
@@ -172,22 +176,26 @@
/>
<ant:delete file="${maven.dist.dir}/${build.name}-src.tar"/>
<checksum file="${maven.dist.dir}/${build.name}-src.tar.gz"/>
- <ant:exec executable="${maven.gpg.exec}">
- <ant:arg value="--armour"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.dist.dir}/${build.name}-src.tar.gz"/>
- </ant:exec>
+ <j:if test="${maven.gpg.exe != null}">
+ <ant:exec executable="${maven.gpg.exe}">
+ <ant:arg value="--armour"/>
+ <ant:arg value="-b"/>
+ <ant:arg value="${maven.dist.dir}/${build.name}-src.tar.gz"/>
+ </ant:exec>
+ </j:if>
<!-- Create a zip file -->
<ant:zip zipfile="${maven.dist.dir}/${build.name}-src.zip">
<ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
</ant:zip>
<checksum file="${maven.dist.dir}/${build.name}-src.zip"/>
- <ant:exec executable="${maven.gpg.exec}">
- <ant:arg value="--armour"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.dist.dir}/${build.name}-src.zip"/>
- </ant:exec>
+ <j:if test="${maven.gpg.exe != null}">
+ <ant:exec executable="${maven.gpg.exe}">
+ <ant:arg value="--armour"/>
+ <ant:arg value="-b"/>
+ <ant:arg value="${maven.dist.dir}/${build.name}-src.zip"/>
+ </ant:exec>
+ </j:if>
</goal>
<goal
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
