flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/4] git commit: [flex-utilities] [refs/heads/develop] - upgrade windows build to generate 64-bit captive runtime as well as 32-bit native
Date Wed, 20 Jun 2018 06:27:49 GMT
Repository: flex-utilities
Updated Branches:
  refs/heads/develop 94f0c25ce -> 9bd1ae7ef


upgrade windows build to generate 64-bit captive runtime as well as 32-bit native


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

Branch: refs/heads/develop
Commit: 8c6dbcb2037df508e5177a86fa50158a6ee548ee
Parents: 94f0c25
Author: Alex Harui <aharui@apache.org>
Authored: Tue Jun 19 23:22:51 2018 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Jun 19 23:22:51 2018 -0700

----------------------------------------------------------------------
 flex-installer/build.number |  2 +-
 flex-installer/build.xml    | 63 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 62 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8c6dbcb2/flex-installer/build.number
----------------------------------------------------------------------
diff --git a/flex-installer/build.number b/flex-installer/build.number
index 43fea5d..1a39de9 100644
--- a/flex-installer/build.number
+++ b/flex-installer/build.number
@@ -1,3 +1,3 @@
 #Copyright 2014-2015 The Apache Software Foundation.
 #Thu, 18 Jun 2015 10:15:00 +1000
-build.number=0
+build.number=1

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8c6dbcb2/flex-installer/build.xml
----------------------------------------------------------------------
diff --git a/flex-installer/build.xml b/flex-installer/build.xml
index 4cf987e..367b8ef 100644
--- a/flex-installer/build.xml
+++ b/flex-installer/build.xml
@@ -107,6 +107,10 @@
         <os family="mac"/>
     </condition>
 
+    <condition property="isWindows">
+        <os family="windows"/>
+    </condition>
+
     <condition property="LOCAL_CONFIG_URL" value="file:///${LOCAL_CONFIG_FILE}">
         <os family="windows"/>
     </condition>
@@ -192,7 +196,7 @@
         <os family="unix" />
     </condition>
 
-    <target name="build" depends="init,certificate,compile,packagenative,cleanup"
+    <target name="build" depends="init,certificate,compile,packagenative,packagebundle,cleanup"
         description="Compiles and packages application"/>
 
     <target name="release" depends="clean,build,source-package,rat-report,sign,copy-misc"
@@ -267,11 +271,50 @@
            <arg value="-package"/>
            <arg value="-target"/>
            <arg value="native"/>
-		   <arg value="${RELEASE_DIR}/${binary.kit}.${extension}"/>
+           <arg value="${RELEASE_DIR}/${binary.kit}.${extension}"/>
            <arg value="${BUILD_DIR}/${APP_NAME}.air"/>
        </java>
    </target>
 
+    <target name="packagebundle" if="isWindows"
+       description="Packages a 64-bit Windows version">
+       <property name="BUNDLE_DIR" value="${RELEASE_DIR}/Win64" />
+       <mkdir dir="${BUNDLE_DIR}" />
+       <copy file="${SOURCE_DIR}/${APP_NAME}-app.xml" tofile="${BUILD_DIR}/${APP_NAME}-app.xml"
/>
+       <replace file="${BUILD_DIR}/${APP_NAME}-app.xml" token="&gt;32&lt;" value="&gt;64&lt;"
/>
+       <copy file="${basedir}/binary_license/LICENSE" tofile="${BUILD_DIR}/LICENSE" />
+       <copy file="${basedir}/NOTICE" tofile="${BUILD_DIR}/NOTICE" />
+       <copy todir="${BUILD_DIR}/deps">
+          <fileset dir="${DEPS_DIR}" />
+       </copy>
+       <copy todir="${BUILD_DIR}/assets">
+          <fileset dir="${ASSETS_DIR}" />
+       </copy>
+       <copy file="${SOURCE_DIR}/${APP_CONFIG_XML_NAME}.xml" tofile="${BUILD_DIR}/${APP_CONFIG_XML_NAME}.xml"
/>
+       <java jar="${ADT}" fork="true" dir="${BUILD_DIR}"
+           failonerror="true"
+           maxmemory="512m">
+           <arg value="-package"/>
+           <arg value="-storetype"/>
+           <arg value="${STORETYPE}"/>	
+           <arg value="-keystore"/>
+           <arg value="${KEYSTORE}"/>
+           <arg value="-storepass"/>
+           <arg value="${CERT_PASSWORD}"/>
+           <arg value="-target"/>
+           <arg value="bundle"/>
+           <arg value="${BUNDLE_DIR}"/>   
+           <arg value="${APP_NAME}-app.xml"/>
+           <arg value="${APP_NAME}.swf"/>
+           <arg value="NOTICE"/>
+           <arg value="deps"/>
+           <arg value="LICENSE"/>
+           <arg value="${APP_CONFIG_XML_NAME}.xml"/>
+           <arg value="assets"/>
+       </java>
+       <zip basedir="${BUNDLE_DIR}" destfile="${RELEASE_DIR}/Win64Installer.zip"/>
+   </target>
+
     <target name="check-as3commons.swc">
         <available file="${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc" property="as3commons.swc.present"/>
     </target>
@@ -391,6 +434,8 @@
     <target name="packageair"
         description="Packages the build SWF file from a temp directory to create an AIR file">
     	<echo message="Using cert ${KEYSTORE}" />
+        <echo message="Using pass ${STOREPASS}" />
+        <echo message="Using type ${STORETYPE}" />
         <mkdir dir="${DEPS_DIR}/as3httpclientlib" />
         <get src="https://raw.githubusercontent.com/quetwo/as3httpclient/as3httpclient-work/License.txt"
             dest="${DEPS_DIR}/as3httpclientlib"
@@ -725,4 +770,18 @@
             <arg value="${BUILD_DIR}/${APP_NAME}-app.xml" />
         </exec>
     </target>
+
+    <target name="debug64" >
+        <copy file="${SOURCE_DIR}/${APP_NAME}-app.xml" todir="${BUILD_DIR}" />
+        <replace file="${BUILD_DIR}/${APP_NAME}-app.xml" token="&gt;64&lt;" value="&gt;32&lt;"
/>
+        <mkdir dir="${BUILD_DIR}/installer" />
+        <exec executable="${AIR_HOME}/bin/${adl}" dir="${BUILD_DIR}" failonerror="true">
+            <arg value="-runtime" />
+            <arg value="${AIR_HOME}/runtimes/air/${runtime}" />
+            <arg value="${BUILD_DIR}/${APP_NAME}-app.xml" />
+            <arg value="--" />
+            <arg value="-64-bit=file:///C:/git/apache/flex/flex-utilities/flex-installer/release/Win64Installer.zip"
/>
+        </exec>
+    </target>
+
 </project>


Mime
View raw message