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 <[email protected]> Authored: Wed Jun 20 14:14:44 2018 -0700 Committer: Alex Harui <[email protected]> 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 = [email protected](); RIDEAU_URL = [email protected](); - 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
