You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/05/27 03:30:56 UTC
[1/4] git commit: [flex-utilities] [refs/heads/develop] - fix linux
AIR SDK file path
Updated Branches:
refs/heads/develop 77cead7cc -> f0fac4fe6
fix linux AIR SDK file path
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/a05d4018
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/a05d4018
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/a05d4018
Branch: refs/heads/develop
Commit: a05d40185eb5d47056b1f61b6df44933e2252665
Parents: 77cead7
Author: Justin Mclean <jm...@apache.org>
Authored: Mon May 27 09:41:03 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon May 27 09:41:03 2013 +1000
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a05d4018/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 10046fc..6a54d9f 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -455,13 +455,13 @@ variables are not required because the locations of these pieces are known.
}
ADOBE_AIR_SDK_MAC_URL += ADOBE_AIR_SDK_MAC_FILE;
- ADOBE_AIR_SDK_LINUX_FILE = files.(@name == 'AdobeAIRSDKMac' + AIR_VERSION).@file.toString();
- ADOBE_AIR_SDK_LINUX_URL = files.(@name == 'AdobeAIRSDKMac' + AIR_VERSION).@path.toString();
+ ADOBE_AIR_SDK_LINUX_FILE = files.(@name == 'AdobeAIRSDKLin' + AIR_VERSION).@file.toString();
+ ADOBE_AIR_SDK_LINUX_URL = files.(@name == 'AdobeAIRSDKLin' + AIR_VERSION).@path.toString();
if (_os == LINUX_OS && (!ADOBE_AIR_SDK_LINUX_FILE || !ADOBE_AIR_SDK_LINUX_URL)) {
log(_viewResourceConstants.ERROR_INVALID_AIR_SDK_URL_LINUX);
keepGoing = false;
}
- ADOBE_AIR_SDK_MAC_URL += ADOBE_AIR_SDK_MAC_FILE;
+ ADOBE_AIR_SDK_LINUX_URL += ADOBE_AIR_SDK_LINUX_FILE;
ADOBE_FB_GLOBALPLAYER_SWC_FILE = files.(@name == 'FlashPlayer' + FLASH_PLAYER_VERSION).@file.toString();
ADOBE_FB_GLOBALPLAYER_SWC_URL = files.(@name == 'FlashPlayer' + FLASH_PLAYER_VERSION).@path.toString();
@@ -613,7 +613,7 @@ variables are not required because the locations of these pieces are known.
setXMLVariables(); // as AIR and Flash version may of changed
log("AIR version " + AIR_VERSION);
- log("Flash Plyer version " + FLASH_PLAYER_VERSION);
+ log("Flash Player version " + FLASH_PLAYER_VERSION);
currentState = "directoryState";
}
[4/4] git commit: [flex-utilities] [refs/heads/develop] - Added
missing title for selected AIR and Flash Player version.
Posted by jm...@apache.org.
Added missing title for selected AIR and Flash Player version.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/f0fac4fe
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/f0fac4fe
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/f0fac4fe
Branch: refs/heads/develop
Commit: f0fac4fe64fe4bc2567d562bf977f744aa877e65
Parents: c9e4220
Author: Justin Mclean <jm...@apache.org>
Authored: Mon May 27 11:21:16 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon May 27 11:21:16 2013 +1000
----------------------------------------------------------------------
.../flex/packageflexsdk/resource/RuntimeLocale.as | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f0fac4fe/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
----------------------------------------------------------------------
diff --git a/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as b/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
index 41039fd..9c99d60 100644
--- a/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
+++ b/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
@@ -346,10 +346,11 @@ public class RuntimeLocale
content["INFO_INSTALLING_CONFIG_FILES"]="Installing frameworks configuration files configured for use with an IDE";
content["INFO_INSTALLING_PLAYERGLOBAL_SWC"]="Installing Adobe Flash Player playerglobal.swc from: ";
content["INFO_INVOKED_GUI_MODE"]="invoked in GUI mode";
+ content["INFO_SELECT_AIR_FLASH_PLAYER"] = "Select AIR and Flash Player versions."
content["INFO_SELECT_DIRECTORY"]="Select a directory";
content["INFO_UNZIPPING"]="Unzipping: ";
content["SELECT_PATH_PROMPT"]="Enter Flex SDK path or browse to select a path";
- content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"]="Create Directories";
content["STEP_DOWNLOAD_AIR_RUNTIME_KIT"]="Download Adobe AIR Runtime Kit";
content["STEP_DOWNLOAD_FLASHPLAYER_SWC"]="Download Flash Player swc";
[2/4] git commit: [flex-utilities] [refs/heads/develop] - added add
flash and AIr step resource - needs to be translated.
Posted by jm...@apache.org.
added add flash and AIr step resource - needs to be translated.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/31ea3c7a
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/31ea3c7a
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/31ea3c7a
Branch: refs/heads/develop
Commit: 31ea3c7ae9876d1c2d9989d9b30f3babed564150
Parents: a05d401
Author: Justin Mclean <jm...@apache.org>
Authored: Mon May 27 11:08:10 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon May 27 11:08:10 2013 +1000
----------------------------------------------------------------------
.../flex/packageflexsdk/resource/RuntimeLocale.as | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/31ea3c7a/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
----------------------------------------------------------------------
diff --git a/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as b/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
index bc2d8b8..41039fd 100644
--- a/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
+++ b/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
@@ -166,6 +166,7 @@ public class RuntimeLocale
content["INFO_SELECT_DIRECTORY_INSTALL"] = "Επιλέξτε τον κατάλογο εγκατάστασης";
content["INFO_UNZIPPING"] = "Αποσυμπίεση: ";
content["SELECT_PATH_PROMPT"] = "Πληκτρολογήστε η επιλέξτε μια έγκυρη διαδρομή για το Flex SDK";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"] = "Δημιουργία Καταλόγων";
content["STEP_DOWNLOAD_AIR_RUNTIME_KIT"] = "Λήψη Adobe AIR Runtime Kit";
content["STEP_DOWNLOAD_FLASHPLAYER_SWC"] = "Λήψη Flash Player swc";
@@ -287,6 +288,8 @@ public class RuntimeLocale
content["INFO_SELECT_DIRECTORY"]="Select a directory";
content["INFO_UNZIPPING"]="Unzipping: ";
content["SELECT_PATH_PROMPT"]="Enter Flex SDK path or browse to select a path";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"]="Create Directories";
content["STEP_DOWNLOAD_AIR_RUNTIME_KIT"]="Download Adobe AIR Runtime Kit";
content["STEP_DOWNLOAD_FLASHPLAYER_SWC"]="Download Flash Player swc";
@@ -346,6 +349,7 @@ public class RuntimeLocale
content["INFO_SELECT_DIRECTORY"]="Select a directory";
content["INFO_UNZIPPING"]="Unzipping: ";
content["SELECT_PATH_PROMPT"]="Enter Flex SDK path or browse to select a path";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"]="Create Directories";
content["STEP_DOWNLOAD_AIR_RUNTIME_KIT"]="Download Adobe AIR Runtime Kit";
content["STEP_DOWNLOAD_FLASHPLAYER_SWC"]="Download Flash Player swc";
@@ -445,6 +449,7 @@ public class RuntimeLocale
content["INSTALL_AGREE_ALL"] = "I agree to all options and licenses, Install";
content["INSTALL_DISAGREE"] = "I Disagree, Don't Install";
content["SELECT_PATH_PROMPT"]="Where do you want to install the Apache Flex SDK?";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"]="Create Directories";
content["STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK"]="Apache Flex SDK (Required)";
content["STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK"]="Adobe AIR SDK (Required)";
@@ -569,6 +574,7 @@ public class RuntimeLocale
content["INSTALL_AGREE_ALL"] = "Acepto todas las opciones y licencias, Instalar";
content["INSTALL_DISAGREE"] = "No estoy de acuerdo, Cancelar";
content["SELECT_PATH_PROMPT"]="¿Dónde quieres instalar el SDK de Apache Flex?";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"]="Crear directorios";
content["STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK"]="Apache Flex SDK (Necesario)";
content["STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK"]="Adobe AIR SDK (Necesario)";
@@ -684,6 +690,7 @@ public class RuntimeLocale
content["INSTALL_AGREE_ALL"] = "Ik ga akkoord met alle opties en licenties, installeer";
content["INSTALL_DISAGREE"] = "Ik ga niet akkoord, installeer niet";
content["SELECT_PATH_PROMPT"]="Geef Flex SDK pad in of blader naar het pad";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"]="Mappen aanmaken";
content["STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK"]="Apache Flex SDK (Verplicht)";
content["STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK"]="Adobe AIR SDK (Verplicht)";
@@ -802,6 +809,7 @@ public class RuntimeLocale
content["INSTALL_AGREE"] = "Eu concordo, instalar";
content["INSTALL_DISAGREE"] = "Não concordo, não instale";
content["SELECT_PATH_PROMPT"]="Aonde você deseja instalar o Apache Flex SDK?";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"]="Criar diretórios";
content["STEP_DOWNLOAD_AIR_RUNTIME_KIT"]="Download Adobe AIR Runtime Kit";
content["STEP_DOWNLOAD_FLASHPLAYER_SWC"]="Download Flash Player swc";
@@ -908,6 +916,7 @@ public class RuntimeLocale
content["INSTALL_DISAGREE"] = "Je suis en désaccord, Ne pas installer";
content["SELECT_PATH_PROMPT"]="Où voulez-vous installer le SDK Flex Apache?";
content["STEP_CREATE_DIRECTORIES"]="Créer les répertoires";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
content["STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK"]="Apache Flex SDK (Requis)";
content["STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK"]="Adobe AIR SDK (Requis)";
content["STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC"]="Adobe Flash Player playerglobal.swc (Requis)";
@@ -1033,6 +1042,7 @@ public class RuntimeLocale
content["INSTALL_DISAGREE"] = "Ich Stimme nicht zu, nicht installieren";
content["SELECT_PATH_PROMPT"]="In welches Verzeichnis soll das Apache Flex SDK installiert werden?";
content["STEP_CREATE_DIRECTORIES"]="Erstelle Verzeichnisse";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
content["STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK"]="Apache Flex SDK (Benötigt)";
content["STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK"]="Adobe AIR SDK (Benötigt)";
content["STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC"]="Adobe Flash Player playerglobal.swc (Benötigt)";
[3/4] git commit: [flex-utilities] [refs/heads/develop] - Only show
AIR and Flash Player versions that are supported for Linux
Posted by jm...@apache.org.
Only show AIR and Flash Player versions that are supported for Linux
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/c9e4220e
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/c9e4220e
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/c9e4220e
Branch: refs/heads/develop
Commit: c9e4220e443975e130cf36f80c3a9a96978c166b
Parents: 31ea3c7
Author: Justin Mclean <jm...@apache.org>
Authored: Mon May 27 11:09:10 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon May 27 11:09:10 2013 +1000
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c9e4220e/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 6a54d9f..3bd9abd 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -423,20 +423,24 @@ variables are not required because the locations of these pieces are known.
var airVersions:Array = files.(@name == 'Versions').@airVersions.toString().split(",");
for each (var airVersion:String in airVersions) {
- AIR_VERSIONS.addItem({label:"AIR " + airVersion, version:airVersion});
+ if (_os != LINUX_OS || Number(airVersion) <= 2.6) {
+ AIR_VERSIONS.addItem({label:"AIR " + airVersion, version:airVersion});
+ }
}
if (this.airVersion.selectedIndex == -1) {
- this.airVersion.selectedIndex = 1;
+ this.airVersion.selectedIndex = 0;
}
var flashPlayerVersions:Array = files.(@name == 'Versions').@flashPlayerVersions.toString().split(",");
for each (var flashPlayerVersion:String in flashPlayerVersions) {
- FLASH_PLAYER_VERSIONS.addItem({label:"Flash Player " + flashPlayerVersion, version:flashPlayerVersion});
+ if (_os != LINUX_OS || Number(flashPlayerVersion) <= 11.2) {
+ FLASH_PLAYER_VERSIONS.addItem({label:"Flash Player " + flashPlayerVersion, version:flashPlayerVersion});
+ }
}
if (this.flashPlayerVersion.selectedIndex == -1) {
- this.flashPlayerVersion.selectedIndex = 1;
+ this.flashPlayerVersion.selectedIndex = 0;
}
ADOBE_AIR_SDK_WIN_FILE = files.(@name == 'AdobeAIRSDKWin' + AIR_VERSION).@file.toString();
@@ -528,9 +532,8 @@ variables are not required because the locations of these pieces are known.
if (_mirrorURLUtil.errorOccurred) {
abortInstallation();
} else {
- if (APACHE_FLEX_BIN_DISTRO_PATH.substr(0, Constants.URL_PREFIX.length) != Constants.URL_PREFIX && APACHE_FLEX_BIN_DISTRO_PATH.substr(0,
- Constants.FILE_PREFIX.length)
- != Constants.FILE_PREFIX) {
+ if (APACHE_FLEX_BIN_DISTRO_PATH.substr(0, Constants.URL_PREFIX.length) != Constants.URL_PREFIX
+ && APACHE_FLEX_BIN_DISTRO_PATH.substr(0, Constants.FILE_PREFIX.length) != Constants.FILE_PREFIX) {
APACHE_FLEX_BIN_DISTRO_URL = useMirrorPath(_mirrorURLUtil.mirrorURL) + APACHE_FLEX_BIN_DISTRO_PATH + APACHE_FLEX_BIN_DISTRO_FILE;
} else {
APACHE_FLEX_BIN_DISTRO_URL = APACHE_FLEX_BIN_DISTRO_PATH + APACHE_FLEX_BIN_DISTRO_FILE;