You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2011/03/29 20:10:34 UTC
svn commit: r1086660 - /db/derby/code/trunk/build.xml
Author: rhillegas
Date: Tue Mar 29 18:10:34 2011
New Revision: 1086660
URL: http://svn.apache.org/viewvc?rev=1086660&view=rev
Log:
DERBY-2573: Create a separate target for writing the release properties.
Modified:
db/derby/code/trunk/build.xml
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1086660&r1=1086659&r2=1086660&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Tue Mar 29 18:10:34 2011
@@ -337,10 +337,27 @@
bumpID true or false, depending on whether you want to increment the last digit of the release id (defaults to false)
-->
- <target name="writeReleaseProperties" depends="init,prebuild,promptforsvncredentials,promptforreleaseid">
+ <target name="writeAndCheckinReleaseProperties" depends="writeRelProps,promptforsvncredentials">
+
+ <!-- Check in the new release id. -->
+ <antcall target="checkinfile">
+ <param name="checkinComment" value="Derby release ID set to: ${derby.release.id.new}"/>
+ <param name="fileName" value="${releasePropertyFile}"/>
+ </antcall>
+
+ </target>
+
+ <!--
+ Create the release properties file.
+
+ Args:
+
+ bumpID true or false, depending on whether you want to increment the last digit of the release id (defaults to false)
+ -->
+ <target name="writeRelProps" depends="init,prebuild,promptforreleaseid">
<taskdef
- name="writeReleaseProperties"
+ name="writeAndCheckinReleaseProperties"
classname="org.apache.derbyPreBuild.ReleaseProperties"
classpath="${out.dir}"
/>
@@ -348,7 +365,7 @@
<property name="releasePropertyFile" value="${properties.dir}/release.properties"/>
<property name="bumpID" value="false"/>
- <writeReleaseProperties
+ <writeAndCheckinReleaseProperties
releaseID="${derby.release.id}"
releasePropertiesFileName="${releasePropertyFile}"
bump="${bumpID}"
@@ -359,12 +376,6 @@
will be different from the original id passed into this target.
-->
<echo message="Derby release ID set to: ${derby.release.id.new}"/>
-
- <!-- Check in the new release id. -->
- <antcall target="checkinfile">
- <param name="checkinComment" value="Derby release ID set to: ${derby.release.id.new}"/>
- <param name="fileName" value="${releasePropertyFile}"/>
- </antcall>
</target>
@@ -2640,7 +2651,7 @@ you should not have to do this.
<delete file="${release.dir}/maintversion.properties"/>
<!-- the release candidate has been built. now we can bump the release id. -->
- <antcall target="writeReleaseProperties">
+ <antcall target="writeAndCheckinReleaseProperties">
<param name="bumpID" value="true"/>
</antcall>
@@ -2650,7 +2661,7 @@ you should not have to do this.
<target name="prepareforrelease" depends="checkdocsroot,checksvnclientsclean,promptforreleaseproperties,checkstateremoved,checksanenotset,cleanalljars,cleandocs,clobber,cleanreleasefiles">
<!-- set the release id -->
- <antcall target="writeReleaseProperties">
+ <antcall target="writeAndCheckinReleaseProperties">
<param name="bumpID" value="false"/>
</antcall>