flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [4/5] git commit: [flex-utilities] [refs/heads/develop] - more changes for 64-bit
Date Wed, 20 Jun 2018 21:28:11 GMT
more changes for 64-bit


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

Branch: refs/heads/develop
Commit: c9c5785929038f7140833f79178318cd53efabf4
Parents: 679b4c7
Author: Alex Harui <aharui@apache.org>
Authored: Wed Jun 20 14:26:49 2018 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Wed Jun 20 14:26:49 2018 -0700

----------------------------------------------------------------------
 flex-installer/build.xml            | 30 ++++++++++++++++++++++++++++--
 flex-installer/releasecandidate.xml |  2 +-
 2 files changed, 29 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c9c57859/flex-installer/build.xml
----------------------------------------------------------------------
diff --git a/flex-installer/build.xml b/flex-installer/build.xml
index 74c516f..b63cdff 100644
--- a/flex-installer/build.xml
+++ b/flex-installer/build.xml
@@ -679,9 +679,14 @@
         <checksum algorithm="SHA-512" file="${RELEASE_DIR}/${source.kit}.zip" forceOverwrite="yes"/>
         <checksum algorithm="SHA-512" file="${RELEASE_DIR}/${source.kit}.tar.gz" forceOverwrite="yes"/>
         <checksum algorithm="SHA-512" file="${RELEASE_DIR}/${binary.kit}.${extension}"
forceOverwrite="yes"/>
+        <antcall target="create-SHA-512-64bit" />
     </target>
     
-	<target name="sign" depends="create-SHA-512">
+    <target name="create-SHA-512-64Bit" if="isWindows">
+        <checksum algorithm="SHA-512" file="${RELEASE_DIR}/${kit.prefix64}-bin.zip" forceOverwrite="yes"/>
+    </target>
+
+    <target name="sign" depends="create-SHA-512">
         <echo message="Signing sources"/>
 
 		<exec executable="gpg">
@@ -707,9 +712,20 @@
 			<arg value="--detach-sig" />
 			<arg value="${RELEASE_DIR}/${binary.kit}.${extension}" />
 		</exec>
+                <antcall target="sign64" />
 	</target>
 
-	<target name="sign_exe" description="sign exe when on mac" >
+    <target name="sign64">
+		<exec executable="gpg">
+			<arg value="--armor" />
+			<arg value="--output" />
+			<arg value="${RELEASE_DIR}/${kit.prefix64}-bin.zip.asc" />
+			<arg value="--detach-sig" />
+			<arg value="${RELEASE_DIR}/${kit.prefix64}-bin.zip" />
+		</exec>
+    </target>
+
+    <target name="sign_exe" description="sign exe when on mac" >
         <echo message="Signing exe"/>
 
 		<checksum file="${RELEASE_DIR}/${binary.kit}.exe" algorithm="SHA-512" forceOverwrite="yes"
/>
@@ -721,6 +737,16 @@
 			<arg value="--detach-sig" />
 			<arg value="${RELEASE_DIR}/${binary.kit}.exe" />
 		</exec>
+
+		<checksum file="${RELEASE_DIR}/${kit.prefix64}-bin.zip" algorithm="SHA-512" forceOverwrite="yes"
/>
+
+		<exec executable="gpg">
+			<arg value="--armor" />
+			<arg value="--output" />
+			<arg value="${RELEASE_DIR}/${kit.prefix64}-bin.zip.asc" />
+			<arg value="--detach-sig" />
+			<arg value="${RELEASE_DIR}/${kit.prefix64}-bin.zip" />
+		</exec>
 	</target>
 
 	<target name="sign_dmg" description="sign dmg when on win" >

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c9c57859/flex-installer/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/flex-installer/releasecandidate.xml b/flex-installer/releasecandidate.xml
index 5bd0e0b..5e29ea9 100644
--- a/flex-installer/releasecandidate.xml
+++ b/flex-installer/releasecandidate.xml
@@ -230,7 +230,7 @@
 		</copy>
 		<copy todir="${dist.dev}/flex/installer/${release.version}/rc${rc}/binaries" >
 			<fileset dir="${basedir}/release" >
-				<include name="apache-flex-sdk-installer-${release.version}-bin*" />
+				<include name="apache-flex-sdk-installer-${release.version}-*bin*" />
 			</fileset>
 		</copy>
 		<copy file="${basedir}/README" tofile="${dist.dev}/flex/installer/${release.version}/rc${rc}/READme"
/>


Mime
View raw message