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 2018/06/20 21:28:08 UTC
[1/5] git commit: [flex-utilities] [refs/heads/develop] - update to
use versioned 64-bit package names
Repository: flex-utilities
Updated Branches:
refs/heads/develop 06116f29f -> 27e1a10bf
update to 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/2a3d3ed4
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/2a3d3ed4
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/2a3d3ed4
Branch: refs/heads/develop
Commit: 2a3d3ed4c94fed8618a3ad83548c5e920be4b485
Parents: 06116f2
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 20 14:14:44 2018 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 20 14:14:44 2018 -0700
----------------------------------------------------------------------
.../installer/src/InstallApacheFlex.mxml | 33 +++++++++++++-------
1 file changed, 21 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2a3d3ed4/flex-installer/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/flex-installer/installer/src/InstallApacheFlex.mxml b/flex-installer/installer/src/InstallApacheFlex.mxml
index 2b248dd..74c5206 100644
--- a/flex-installer/installer/src/InstallApacheFlex.mxml
+++ b/flex-installer/installer/src/InstallApacheFlex.mxml
@@ -210,7 +210,8 @@ variables are not required because the locations of these pieces are known.
[Bindable]
private var APACHE_FLEX_BIN_DISTRO_VERSION_DISPLAY:String = "";
- private var APACHE_FLEX_INSTALLER_URL:String;
+ private var APACHE_FLEX_INSTALLER_PATH:String;
+ private var APACHE_FLEX_INSTALLER_FILE:String;
/**
* Adobe AIR SDK
@@ -412,9 +413,13 @@ variables are not required because the locations of these pieces are known.
{
installOverride = s.substring(9);
}
- if (s.indexOf("-64-bit=") == 0)
+ if (s.indexOf("-64-bit-path=") == 0)
{
- APACHE_FLEX_INSTALLER_URL = s.substring(8);
+ APACHE_FLEX_INSTALLER_PATH = s.substring(13);
+ }
+ if (s.indexOf("-64-bit-file=") == 0)
+ {
+ APACHE_FLEX_INSTALLER_FILE = s.substring(13);
}
if (s.indexOf("-steps=") == 0)
{
@@ -1053,9 +1058,13 @@ variables are not required because the locations of these pieces are known.
RIDEAU_FILE = data.fontswf.rideau.@file.toString();
RIDEAU_URL = data.fontswf.rideau.@path.toString();
- var installer:String = data.installer64.toString();
+ var installer:String = data.installer64.(@version == installerVersion).path.toString();;
+ if (installer.length > 0)
+ APACHE_FLEX_INSTALLER_PATH = installer;
+
+ installer = data.installer64.(@version == installerVersion).file.toString();;
if (installer.length > 0)
- APACHE_FLEX_INSTALLER_URL = installer;
+ APACHE_FLEX_INSTALLER_FILE = installer;
return keepGoing;
}
@@ -1178,10 +1187,10 @@ variables are not required because the locations of these pieces are known.
protected function get64BitInstaller(event:Event):void
{
var path64:String;
- if (APACHE_FLEX_INSTALLER_URL.indexOf("://") == -1)
- path64 = useMirrorPath(_mirrorURLUtil.mirrorURL) + APACHE_FLEX_INSTALLER_URL;
+ if (APACHE_FLEX_INSTALLER_PATH.indexOf("://") == -1)
+ path64 = useMirrorPath(_mirrorURLUtil.mirrorURL) + APACHE_FLEX_INSTALLER_PATH + "/" + APACHE_FLEX_INSTALLER_FILE;
else
- path64 = APACHE_FLEX_INSTALLER_URL;
+ path64 = APACHE_FLEX_INSTALLER_PATH + "/" + APACHE_FLEX_INSTALLER_FILE;
copyOrDownload(path64, handle64BitInstaller, null, handle64BitInstallerError);
}
@@ -1189,7 +1198,7 @@ variables are not required because the locations of these pieces are known.
{
try
{
- var app:File = new File(File.applicationStorageDirectory.nativePath + File.separator + "Win64Installer.zip");
+ var app:File = new File(File.applicationStorageDirectory.nativePath + File.separator + APACHE_FLEX_INSTALLER_FILE);
writeFileToDirectory(app, event.target.data);
_flexHomeDir = new File(File.applicationStorageDirectory.nativePath + File.separator + "Win64");
unzip(app, handle64BitUnzipComplete, handle64BitUnzipError);
@@ -1200,13 +1209,13 @@ variables are not required because the locations of these pieces are known.
abortInstallation("handle64BitInstaller " + e.message);
}
- log("downloaded " + APACHE_FLEX_INSTALLER_URL);
+ log("downloaded " + APACHE_FLEX_INSTALLER_PATH + "/" + APACHE_FLEX_INSTALLER_FILE);
}
protected function handle64BitInstallerError(event:Event):void
{
- log("Unable to install " + APACHE_FLEX_INSTALLER_URL);
- abortInstallation("Unable to install" + APACHE_FLEX_INSTALLER_URL);
+ log("Unable to install " + APACHE_FLEX_INSTALLER_PATH + "/" + APACHE_FLEX_INSTALLER_FILE);
+ abortInstallation("Unable to install" + APACHE_FLEX_INSTALLER_PATH + "/" + APACHE_FLEX_INSTALLER_FILE);
}
private function launch64():void
[3/5] git commit: [flex-utilities] [refs/heads/develop] - version
3.3.2
Posted by ah...@apache.org.
version 3.3.2
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/679b4c7b
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/679b4c7b
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/679b4c7b
Branch: refs/heads/develop
Commit: 679b4c7ba8d8ad22c79ea150cdc75986b1d31c1d
Parents: b0290fd
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 20 14:15:49 2018 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 20 14:15:49 2018 -0700
----------------------------------------------------------------------
flex-installer/installer/src/InstallApacheFlex-app.xml | 2 +-
.../installer/src/installer/sdk-installer-config-4.0.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/679b4c7b/flex-installer/installer/src/InstallApacheFlex-app.xml
----------------------------------------------------------------------
diff --git a/flex-installer/installer/src/InstallApacheFlex-app.xml b/flex-installer/installer/src/InstallApacheFlex-app.xml
index f461d74..97f00a2 100644
--- a/flex-installer/installer/src/InstallApacheFlex-app.xml
+++ b/flex-installer/installer/src/InstallApacheFlex-app.xml
@@ -47,7 +47,7 @@
<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
An updated version of application must have a versionNumber value higher than the previous version. Required for namespace >= 2.5 . -->
- <versionNumber>3.3.1</versionNumber>
+ <versionNumber>3.3.2</versionNumber>
<!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
<!-- <versionLabel></versionLabel> -->
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/679b4c7b/flex-installer/installer/src/installer/sdk-installer-config-4.0.xml
----------------------------------------------------------------------
diff --git a/flex-installer/installer/src/installer/sdk-installer-config-4.0.xml b/flex-installer/installer/src/installer/sdk-installer-config-4.0.xml
index 37142e5..4baf844 100644
--- a/flex-installer/installer/src/installer/sdk-installer-config-4.0.xml
+++ b/flex-installer/installer/src/installer/sdk-installer-config-4.0.xml
@@ -28,7 +28,7 @@ limitations under the License.
-->
<config>
<version>
- <latest>3.3.1</latest>
+ <latest>3.3.2</latest>
</version>
<languages>
<locale1 id="de_DE" name="Deutsch" path="http://flex.apache.org/installer/properties/de_DE.properties"/>
[5/5] git commit: [flex-utilities] [refs/heads/develop] - typo
Posted by ah...@apache.org.
typo
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/27e1a10b
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/27e1a10b
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/27e1a10b
Branch: refs/heads/develop
Commit: 27e1a10bf077c7c83aed5e1fcf0813c137bd02dd
Parents: c9c5785
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 20 14:27:58 2018 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 20 14:27:58 2018 -0700
----------------------------------------------------------------------
flex-installer/releasecandidate.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/27e1a10b/flex-installer/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/flex-installer/releasecandidate.xml b/flex-installer/releasecandidate.xml
index 5e29ea9..ae1d2c2 100644
--- a/flex-installer/releasecandidate.xml
+++ b/flex-installer/releasecandidate.xml
@@ -316,7 +316,7 @@
<target name="other-platform-win" if="isWindows" >
<available file="${basedir}/release/apache-flex-sdk-installer-${release.version}-bin.dmg"
type="file" property="other.binary" />
- <fail message="${basedir}/release/apache-flex-sdk-installer-${release.version}-bin.dmg not found. The windows version should be built before running this script"
+ <fail message="${basedir}/release/apache-flex-sdk-installer-${release.version}-bin.dmg not found. The mac version should be built before running this script"
unless="other.binary"/>
<ant antfile="build.xml" target="sign_dmg" />
<mkdir dir="${dist.dev}/flex/installer/${release.version}/rc${rc}/binaries" />
[4/5] git commit: [flex-utilities] [refs/heads/develop] - more
changes for 64-bit
Posted by ah...@apache.org.
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 <ah...@apache.org>
Authored: Wed Jun 20 14:26:49 2018 -0700
Committer: Alex Harui <ah...@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" />
[2/5] git commit: [flex-utilities] [refs/heads/develop] - use
versioned 64-bit package names
Posted by ah...@apache.org.
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 <ah...@apache.org>
Authored: Wed Jun 20 14:15:17 2018 -0700
Committer: Alex Harui <ah...@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>