ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1491502 - /ace/trunk/build/build.xml
Date Mon, 10 Jun 2013 15:33:22 GMT
Author: marrs
Date: Mon Jun 10 15:33:22 2013
New Revision: 1491502

URL: http://svn.apache.org/r1491502
Log:
ACE-360 Changed the signing process so the md5 and sha files no longer contain the 'generated'
folder as a prefix.

Modified:
    ace/trunk/build/build.xml

Modified: ace/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/ace/trunk/build/build.xml?rev=1491502&r1=1491501&r2=1491502&view=diff
==============================================================================
--- ace/trunk/build/build.xml (original)
+++ ace/trunk/build/build.xml Mon Jun 10 15:33:22 2013
@@ -2,12 +2,10 @@
 <project name="project" default="build"> 
 	<import file="../cnf/build.xml"/>
 	
-	<property name="version" value="1.0.0" />
-	<property name="src.zip" value="generated/apache-ace-${version}-src.zip" />
-	<property name="deps.zip" value="generated/apache-ace-${version}-deps.zip" />
-	<property name="src.asc" value="${src.zip}.asc" />
-	<property name="src.md5" value="${src.zip}.md5" />
-	<property name="src.sha" value="${src.zip}.sha" />
+	<property name="version" value="1.0.1" />
+	<property name="target.dir" value="generated" />
+	<property name="src.zip" value="apache-ace-${version}-src.zip" />
+	<property name="deps.zip" value="apache-ace-${version}-deps.zip" />
 	<property name="svn.release.path" value="https://dist.apache.org/repos/dist/release/ace"
/>
 	<property name="svn.staging.path" value="https://dist.apache.org/repos/dist/dev/ace"
/>
 	
@@ -17,24 +15,25 @@
 	<property name="target.client.dir" value="${target.base.dir}/client" />
 	<property name="target.obr.dir" value="${target.base.dir}/obr" />
 	<property name="target.target.dir" value="${target.base.dir}/target" />
-	<property name="bin.zip" value="generated/apache-ace-${version}-bin.zip" />
+	<property name="bin.zip" value="apache-ace-${version}-bin.zip" />
 
 	<macrodef name="sign-archive">
+		<attribute name="dir" />
 		<attribute name="archive" />
 		<sequential>
-			<exec executable="gpg">
+			<exec executable="gpg" dir="@{dir}">
 				<arg value="--armor" />
 				<arg value="--output" />
 				<arg value="@{archive}.asc" />
 				<arg value="--detach-sig" />
 				<arg value="@{archive}" />
 			</exec>
-			<exec executable="gpg" output="@{archive}.md5">
+			<exec executable="gpg" dir="@{dir}" output="@{dir}/@{archive}.md5">
 				<arg value="--print-md" />
 				<arg value="MD5" />
 				<arg value="@{archive}" />
 			</exec>
-			<exec executable="gpg" output="@{archive}.sha">
+			<exec executable="gpg" dir="@{dir}" output="@{dir}/@{archive}.sha">
 				<arg value="--print-md" />
 				<arg value="SHA512" />
 				<arg value="@{archive}" />
@@ -45,7 +44,7 @@
 	<target name="package" depends="package-src, package-bin" description="Packages the source
and binary distributions." />
 	
 	<target name="package-src" description="Packages the source distributions.">
-		<zip destfile="${src.zip}">
+		<zip destfile="${target.dir}/${src.zip}">
 			<zipfileset prefix="apache-ace-${version}-src" dir="resources/src" includes="
 				NOTICE, LICENSE, README
 				" />
@@ -63,7 +62,7 @@
 				cnf/ext/**
 				" />
 		</zip>
-		<zip destfile="${deps.zip}">
+		<zip destfile="${target.dir}/${deps.zip}">
 			<zipfileset prefix="apache-ace-${version}-src" dir="resources/deps" includes="
 				NOTICE, LICENSE, README
 				" />
@@ -77,9 +76,9 @@
 	</target>
 	
 	<target name="sign" description="Signs the source and binary distributions (provided
you have gpg setup).">
-		<sign-archive archive="${src.zip}" />
-		<sign-archive archive="${deps.zip}" />
-		<sign-archive archive="${bin.zip}" />
+		<sign-archive dir="${target.dir}" archive="${src.zip}" />
+		<sign-archive dir="${target.dir}" archive="${deps.zip}" />
+		<sign-archive dir="${target.dir}" archive="${bin.zip}" />
 	</target>
 	
 	<target name="commit-to-staging" description="Moves the source and binary distributions
to staging.">
@@ -140,7 +139,7 @@
 		<bndpackage runfile="../run-target/target.bndrun" output="${target.target.dir}/target.jar"
/>
 
 		<!-- create one giant ZIP-file with everything in it -->
-		<zip destfile="${bin.zip}">
+		<zip destfile="${target.dir}/${bin.zip}">
 			<zipfileset prefix="apache-ace-${version}-bin" dir="resources/bin" includes="
 				NOTICE, LICENSE, README
 				" />



Mime
View raw message