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 2014/08/08 08:44:11 UTC

[2/3] git commit: [flex-utilities] [refs/heads/develop] - allow platform override of variables

allow platform override of variables


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

Branch: refs/heads/develop
Commit: f37a23d4d3f41eac5de16f7e9fa29816f896c7f2
Parents: 845126a
Author: Alex Harui <ah...@apache.org>
Authored: Thu Aug 7 13:15:02 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Aug 7 23:39:48 2014 -0700

----------------------------------------------------------------------
 installer/build.xml | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f37a23d4/installer/build.xml
----------------------------------------------------------------------
diff --git a/installer/build.xml b/installer/build.xml
index 3c9aec1..6d76076 100644
--- a/installer/build.xml
+++ b/installer/build.xml
@@ -25,6 +25,39 @@
 
     <!--location of property file -->
     <property file="${basedir}/local.properties" />
+	<condition property="CERT_PASSWORD_FILE" value="${CERT_PASSWORD_FILE_WIN}" >
+		<and>
+			<not>
+				<available file="${CERT_PASSWORD_FILE}" />
+			</not>
+			<available file="${CERT_PASSWORD_FILE_WIN}" />
+		</and>
+	</condition>
+	<condition property="CERT_PASSWORD_FILE" value="${CERT_PASSWORD_FILE_MAC}" >
+		<and>
+			<not>
+				<available file="${CERT_PASSWORD_FILE}" />
+			</not>
+			<available file="${CERT_PASSWORD_FILE_MAC}" />
+		</and>
+	</condition>
+	<condition property="RELEASE_KEYSTORE_FILE" value="${RELEASE_KEYSTORE_FILE_WIN}" >
+		<and>
+			<not>
+				<available file="${RELEASE_KEYSTORE_FILE}" />
+			</not>
+			<available file="${RELEASE_KEYSTORE_FILE_WIN}" />
+		</and>
+	</condition>
+	<condition property="RELEASE_KEYSTORE_FILE" value="${RELEASE_KEYSTORE_FILE_MAC}" >
+		<and>
+			<not>
+				<available file="${RELEASE_KEYSTORE_FILE}" />
+			</not>
+			<available file="${RELEASE_KEYSTORE_FILE_MAC}" />
+		</and>
+	</condition>
+
     <property file="${basedir}/build.properties" description="Properties for Apache Flex SDK Installer project" />
     <property file="${basedir}/build.number"/>
 	<property file="${CERT_PASSWORD_FILE}"/>
@@ -93,7 +126,7 @@
     <condition property="AIR_HOME" value="${AIR_HOME_LINUX}">
         <os family="unix"/>
     </condition>
-
+	
     <condition property="cert_pwd_not_found" >
 		<not>
        		<available file="${CERT_PASSWORD_FILE}"/>
@@ -566,6 +599,18 @@
 		</exec>
 	</target>
 
+	<target name="sign_dmg" description="sign dmg when on win" >
+		<checksum file="${RELEASE_DIR}/${binary.kit}.dmg" algorithm="md5" forceOverwrite="yes" />
+
+		<exec executable="gpg">
+			<arg value="--armor" />
+			<arg value="--output" />
+			<arg value="${RELEASE_DIR}/${binary.kit}.dmg.asc" />
+			<arg value="--detach-sig" />
+			<arg value="${RELEASE_DIR}/${binary.kit}.dmg" />
+		</exec>
+	</target>
+	
     <target name="debug" >
         <copy file="${SOURCE_DIR}/${APP_NAME}-app.xml" todir="${BUILD_DIR}" />
         <mkdir dir="${BUILD_DIR}/installer" />