svn commit: r1457942 - /db/derby/code/trunk/tools/release/build.xml

[rh...@apache.org]

Author: rhillegas
Date: Mon Mar 18 19:50:24 2013
New Revision: 1457942

URL: http://svn.apache.org/r1457942
Log:
DERBY-6104: Cleanup source distributions by removing the jirasoap cruft left behind by release notes generation.

Modified:
    db/derby/code/trunk/tools/release/build.xml

Modified: db/derby/code/trunk/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/build.xml?rev=1457942&r1=1457941&r2=1457942&view=diff
==============================================================================
--- db/derby/code/trunk/tools/release/build.xml (original)
+++ db/derby/code/trunk/tools/release/build.xml Mon Mar 18 19:50:24 2013
@@ -26,6 +26,7 @@
   <property name="properties.dir" value="tools/ant/properties"/>
   <!-- Significant dirs -->
   <property file="${properties.dir}/dirs.properties"/>
+  <property name="jirasoap.generated" value="${basedir}/tools/release/jirasoap/target"/>
   <!-- Compiler settings -->
   <property file="${properties.dir}/sane${sanity}.properties"/>
   <property file="${properties.dir}/defaultcompiler.properties"/>
@@ -134,7 +135,7 @@
         <taskdef
             name="jirasoapclient"
             classname="org.apache.derbyBuild.jirasoap.FilteredIssueListerAntWrapper"
-            classpath="${basedir}/tools/release/jirasoap/target/JiraSOAP-LATEST-jar-with-dependencies.jar"
+            classpath="${jirasoap.generated}/JiraSOAP-LATEST-jar-with-dependencies.jar"
         />
 
         <!-- Set default for jira.filter.id (0 to use JQL). -->
@@ -162,6 +163,8 @@
      />
     <echo message="Release notes written to ${relnotes.out.filename}"/>
 
+    <!-- Remove cruft so that it does not turn up in source distributions -->
+    <antcall target="clean-jirasoap"/>
   </target>
 
   <!-- Execute this target if one or more of the required properties are missing -->
@@ -502,7 +505,7 @@
   <!-- remove all the files generated by the release targets. -->
   <target name="clean"
       description="Cleans up resources generated by the relaese targets."
-      depends="maven-exec-windows,maven-exec-unix">
+      depends="maven-exec-windows,maven-exec-unix,clean-jirasoap">
     <delete dir="${release.dir}"/>
     <exec executable="${mvn.exec}"
             dir="${basedir}/tools/release/jirasoap">
@@ -512,6 +515,13 @@
     </exec>
   </target>
 
+  <!-- remove files generated by the jirasoap machinery -->
+  <target name="clean-jirasoap"
+      description="Cleans up resources generated for jirasoap."
+  >
+     <delete dir="${jirasoap.generated}" />
+  </target>
+
   <!-- bumps the last part of the version string to the next digit. -->
   <target name="bumplastdigit">
     <propertyfile file="${basedir}/tools/ant/properties/release.properties">