flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [2/5] git commit: [flex-utilities] [refs/heads/develop] - use versioned 64-bit package names
Date Wed, 20 Jun 2018 21:28:09 GMT
use versioned 64-bit package names


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

Branch: refs/heads/develop
Commit: b0290fd18a12a9c0a035aa1da6a1f273050c9428
Parents: 2a3d3ed
Author: Alex Harui <aharui@apache.org>
Authored: Wed Jun 20 14:15:17 2018 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Wed Jun 20 14:15:17 2018 -0700

----------------------------------------------------------------------
 flex-installer/build.xml            | 6 ++++--
 flex-installer/releasecandidate.xml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b0290fd1/flex-installer/build.xml
----------------------------------------------------------------------
diff --git a/flex-installer/build.xml b/flex-installer/build.xml
index 367b8ef..74c516f 100644
--- a/flex-installer/build.xml
+++ b/flex-installer/build.xml
@@ -64,6 +64,7 @@
 
     <property name="installer.version" value="${release.version}.${build.number}"/>
     <property name="kit.prefix" value="apache-flex-sdk-installer-${installer.version}"/>
+    <property name="kit.prefix64" value="apache-flex-sdk-installer-${installer.version}-64bit"/>
     <property name="source.kit" value="${kit.prefix}-src"/>
     <property name="binary.kit" value="${kit.prefix}-bin"/>
     <property name="LOCAL_CONFIG_FILE" value="${basedir}/src/installer/sdk-installer-config-4.0.xml"
/>
@@ -312,7 +313,7 @@
            <arg value="${APP_CONFIG_XML_NAME}.xml"/>
            <arg value="assets"/>
        </java>
-       <zip basedir="${BUNDLE_DIR}" destfile="${RELEASE_DIR}/Win64Installer.zip"/>
+       <zip basedir="${BUNDLE_DIR}" destfile="${RELEASE_DIR}/${kit.prefix64}-bin.zip"/>
    </target>
 
     <target name="check-as3commons.swc">
@@ -780,7 +781,8 @@
             <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"
/>
+            <arg value="-64-bit-path=file:///C:/git/apache/flex/flex-utilities/flex-installer/release"
/>
+            <arg value="-64-bit-file=${kit.prefix64}-bin.zip" />
         </exec>
     </target>
 

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b0290fd1/flex-installer/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/flex-installer/releasecandidate.xml b/flex-installer/releasecandidate.xml
index 3ab8415..5bd0e0b 100644
--- a/flex-installer/releasecandidate.xml
+++ b/flex-installer/releasecandidate.xml
@@ -323,6 +323,7 @@
 		<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}-64bit-bin*" />
 			</fileset>
 		</copy>
 	</target>


Mime
View raw message