Minor, but I think tstamp is called more than once now and could end up on both sides of midnight if you start a build too late at night.
On 8/8/13 10:20 PM, "jmcl...@apache.org" <jmcl...@apache.org> wrote: >Updated Branches: > refs/heads/develop 57fffd956 -> 9f3efa466 > > >Fixed build version number not being injected into configuration file > > >Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo >Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/9f3efa46 >Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/9f3efa46 >Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/9f3efa46 > >Branch: refs/heads/develop >Commit: 9f3efa46684bf26381b3e9cb355bff61a013c8e6 >Parents: 57fffd9 >Author: Justin Mclean <jmcl...@apache.org> >Authored: Fri Aug 9 15:19:41 2013 +1000 >Committer: Justin Mclean <jmcl...@apache.org> >Committed: Fri Aug 9 15:19:41 2013 +1000 > >---------------------------------------------------------------------- > build.xml | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) >---------------------------------------------------------------------- > > >http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9f3efa46/build.xml >---------------------------------------------------------------------- >diff --git a/build.xml b/build.xml >index 6d53e54..99160d8 100644 >--- a/build.xml >+++ b/build.xml >@@ -697,9 +697,16 @@ > <!-- frameworks/tests --> > <antcall target="stage-frameworks-tests"/> > >- <!-- now that air-config.xml and flex-config.xml are in temp, >fix them up for release. --> >- <fix-config-file >file="${basedir}/temp/frameworks/air-config.xml" /> >- <fix-config-file >file="${basedir}/temp/frameworks/flex-config.xml" /> >+ <tstamp> >+ <format property="build.number.date" pattern="yyyyMMdd" /> >+ </tstamp> >+ <property name="build.version" >value="${release.version}.${build.number.date}" /> >+ >+ <!-- now that config xml files are in temp, fix them up for >release. --> >+ <echo message="Updating config file air-config.xml with version >${build.version}"/> >+ <fix-config-file >file="${basedir}/temp/frameworks/air-config.xml" >version="${build.version}" /> >+ <echo message="Updating config file flex-config.xml with version >${build.version}"/> >+ <fix-config-file >file="${basedir}/temp/frameworks/flex-config.xml" >version="${build.version}" /> > > <!-- Update all Version.as files in the kit frameworks directory >with build.number --> > <antcall target="version-update"/> >@@ -1034,6 +1041,7 @@ > > <macrodef name="fix-config-file"> > <attribute name="file"/> >+ <attribute name="version"/> > <sequential> > <replace file="@{file}"> > <replacefilter >@@ -1041,7 +1049,7 @@ > >value="<warn-no-explicit-super-call-in-constructor>false"/> > <replacefilter > token="$${build.number}" >- value="${release.version}.${build.number.date}"/> >+ value="@{version}"/> > </replace> > </sequential> > </macrodef> >
