You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/11/15 08:05:03 UTC
git commit: [flex-asjs] [refs/heads/develop] - fix release target
Repository: flex-asjs
Updated Branches:
refs/heads/develop 5abf5baec -> 88d8c37ca
fix release target
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/88d8c37c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/88d8c37c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/88d8c37c
Branch: refs/heads/develop
Commit: 88d8c37caab4b0056bf1250297d305f6944f0626
Parents: 5abf5ba
Author: Alex Harui <ah...@apache.org>
Authored: Sat Nov 14 23:04:51 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Nov 14 23:04:51 2015 -0800
----------------------------------------------------------------------
releasecandidate.xml | 55 ++++++++++++++++++++---------------------------
1 file changed, 23 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88d8c37c/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 6fa4d65..a789267 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -333,7 +333,7 @@
<delete file="${basedir}/getresult.txt" />
</target>
- <target name="update-installer-config-release" >
+ <target name="update-installer-config-release" depends="credentials">
<exec executable="${svn}" dir="${site}" failonerror="true" >
<arg value="update" />
<arg value="trunk/content/installer/sdk-installer-config-4.0.xml" />
@@ -528,7 +528,7 @@ ${my.name}
<delete file="${basedir}/discussthread.properties" />
</target>
- <target name="release" >
+ <target name="release" depends="credentials">
<available file="${svn.dist.release}"
type="dir"
property="dist.release" value="${svn.dist.release}" />
@@ -539,29 +539,10 @@ ${my.name}
<exec executable="${svn}" dir="${dist.release}/flex" failonerror="true" >
<arg value="update" />
</exec>
- <mkdir dir="${dist.release}/flex/flexjs/${release.version}" />
- <mkdir dir="${dist.release}/flex/flexjs/${release.version}/binaries" />
- <mkdir dir="${dist.release}/flex/flexjs/${release.version}/doc" />
- <copy todir="${dist.release}/flex/flexjs/${release.version}/doc" >
- <fileset dir="${dist.dev}/flex/flexjs/rc${rc}/doc" >
- <include name="apache-flex-flexjs-${release.version}-asdoc*" />
- </fileset>
- </copy>
- <copy todir="${dist.release}/flex/flexjs/${release.version}/binaries" >
- <fileset dir="${dist.dev}/flex/flexjs/rc${rc}/binaries" >
- <include name="apache-flex-flexjs-${release.version}-bin*" />
- <include name="apache-flex-flexjs-installer-config.xml" />
- </fileset>
- </copy>
- <copy todir="${dist.release}/flex/flexjs/${release.version}" >
- <fileset dir="${dist.dev}/flex/flexjs/rc${rc}" >
- <include name="READme" />
- <include name="apache-flex-flexjs-${release.version}-src*" />
- </fileset>
- </copy>
<exec executable="${svn}" dir="${dist.release}/flex/flexjs" failonerror="true" >
- <arg value="add" />
- <arg value="${release.version}" />
+ <arg value="mv" />
+ <arg value="${dist.dev}/flex/flexjs/${release.version}/rc${rc}" />
+ <arg value="${dist.release}/flex/flexjs/${release.version}" />
</exec>
<exec executable="${svn}" dir="${dist.release}/flex/flexjs" failonerror="true" >
<arg value="commit" />
@@ -572,18 +553,28 @@ ${my.name}
<arg value="-m" />
<arg value="Apache FlexJS ${release.version}" />
</exec>
- <exec executable="${git}" dir="${basedir}" failonerror="true" >
- <arg value="tag" />
- <arg value="-a" />
- <arg value="apache-flex-flexjs-${release.version}" />
- <arg value="-m" />
- <arg value=""Official release of apache-flex-flexjs-${release.version}"" />
- </exec>
+ <antcall target="release.tag" />
<exec executable="${git}" dir="${basedir}" failonerror="true" >
<arg value="push" />
<arg value="--tags" />
</exec>
<echo>Wait at least 24 hours before running update-installer-config-release target</echo>
</target>
-
+
+ <target name="release.tag" >
+ <exec executable="${git}" dir="${basedir}" failonerror="true" output="${basedir}/taghash.txt">
+ <arg value="show" />
+ <arg value="apache-flex-flexjs-${release.version}-rc${rc}" />
+ </exec>
+ <replaceregexp file="${basedir}/taghash.txt" match="(.*).commit (.*).Author(.*)" replace="\2" byline="false" flags="s" />
+ <loadfile srcFile="${basedir}/taghash.txt" property="releasehash" />
+ <exec executable="${git}" dir="${basedir}" failonerror="true" >
+ <arg value="tag" />
+ <arg value="-a" />
+ <arg value="apache-flex-flexjs-${release.version}" />
+ <arg value="${releasehash}" />
+ <arg value="-m" />
+ <arg value=""Official release of apache-flex-flexjs-${release.version}"" />
+ </exec>
+ </target>
</project>