flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [2/2] git commit: [flex-falcon] [refs/heads/develop] - fix release target
Date Mon, 16 Nov 2015 07:27:52 GMT
fix release target


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/51e55e6c
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/51e55e6c
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/51e55e6c

Branch: refs/heads/develop
Commit: 51e55e6c0edc30008aeb40464de1eafb42ad59df
Parents: 5ecf114
Author: Alex Harui <aharui@apache.org>
Authored: Sun Nov 15 23:27:45 2015 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Sun Nov 15 23:27:45 2015 -0800

----------------------------------------------------------------------
 releasecandidate.xml | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/51e55e6c/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/releasecandidate.xml b/releasecandidate.xml
index c66a78d..2343675 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -296,7 +296,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" />
@@ -443,7 +443,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}" />
@@ -454,23 +454,10 @@ ${my.name}
 		<exec executable="${svn}" dir="${dist.release}/flex" failonerror="true" >
 			<arg value="update" />
 		</exec>
-		<mkdir dir="${dist.release}/flex/falcon/${release.version}" />
-		<mkdir dir="${dist.release}/flex/falcon/${release.version}/binaries" />
-		<copy todir="${dist.release}/flex/falcon/${release.version}/binaries" >
-			<fileset dir="${dist.dev}/flex/falcon/rc${rc}/binaries" >
-				<include name="apache-flex-falconjx-${release.version}-bin*" />
-				<include name="apache-flex-falconjx-installer-config.xml" />
-			</fileset>
-		</copy>
-		<copy todir="${dist.release}/flex/falcon/${release.version}" >
-			<fileset dir="${dist.dev}/flex/falcon/rc${rc}" >
-				<include name="READme" />
-				<include name="apache-flex-falconjx-${release.version}-src*" />
-			</fileset>
-		</copy>
 		<exec executable="${svn}" dir="${dist.release}/flex/falcon" failonerror="true" >
-			<arg value="add" />
-			<arg value="${release.version}" />
+			<arg value="mv" />
+			<arg value="${dist.dev}/flex/falcon/${release.version}/rc${rc}" />
+            <arg value="${dist.release}/flex/falcon/${release.version}" />
 		</exec>
 		<exec executable="${svn}" dir="${dist.release}/flex/falcon" failonerror="true" >
 			<arg value="commit" />
@@ -481,13 +468,7 @@ ${my.name}
 			<arg value="-m" />
 			<arg value="Apache Flex Falcon ${release.version}" />
 		</exec>
-		<exec executable="${git}" dir="${basedir}" failonerror="true" >
-			<arg value="tag" />
-			<arg value="-a" />
-			<arg value="apache-flex-falcon-${release.version}" />
-			<arg value="-m" />
-			<arg value="&quot;Official release of apache-flex-falcon-${release.version}&quot;"
/>
-		</exec>
+        <antcall target="release.tag" />
 		<exec executable="${git}" dir="${basedir}" failonerror="true" >
 			<arg value="push" />
 			<arg value="--tags" />
@@ -495,4 +476,20 @@ ${my.name}
 		<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-falcon-${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-falcon-${release.version}" />
+            <arg value="${releasehash}" />
+            <arg value="-m" />
+            <arg value="&quot;Official release of apache-flex-falcon-${release.version}&quot;"
/>
+        </exec>
+    </target>
 </project>


Mime
View raw message