You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2014/09/15 11:21:58 UTC
[2/2] git commit: [flex-sdk] [refs/heads/develop] - Updated with FP 15
Updated with FP 15
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b3aa11c1
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b3aa11c1
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b3aa11c1
Branch: refs/heads/develop
Commit: b3aa11c1b001669a81cd79559432d955f292b4c9
Parents: 2adc95d
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Mon Sep 15 11:21:29 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Mon Sep 15 11:21:29 2014 +0200
----------------------------------------------------------------------
ide/addAIRtoSDK.sh | 21 ++++++++++++++-------
ide/setFlashPlayerVersion.sh | 5 +++--
2 files changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b3aa11c1/ide/addAIRtoSDK.sh
----------------------------------------------------------------------
diff --git a/ide/addAIRtoSDK.sh b/ide/addAIRtoSDK.sh
index c7b9005..97e1810 100755
--- a/ide/addAIRtoSDK.sh
+++ b/ide/addAIRtoSDK.sh
@@ -30,14 +30,14 @@
AIR_VERSION="$1"
OS=`uname`
-if [[ "${AIR_VERSION}" != "14.0"
- && "${AIR_VERSION}" != "13.0" && "${AIR_VERSION}" != "4.0" && "${AIR_VERSION}" != "3.9"
- && "${AIR_VERSION}" != "3.8" && "${AIR_VERSION}" != "3.7" && "${AIR_VERSION}" != "3.6"
- && "${AIR_VERSION}" != "3.5" && "${AIR_VERSION}" != "3.4" && "${AIR_VERSION}" != "3.3"
- && "${AIR_VERSION}" != "3.2" && "${AIR_VERSION}" != "3.1" && "${AIR_VERSION}" != "3.0"
- && "${AIR_VERSION}" != "2.7" && "${AIR_VERSION}" != "2.6" ]]
+if [[ "${AIR_VERSION}" != "15.0"
+ && "${AIR_VERSION}" != "14.0" && "${AIR_VERSION}" != "13.0" && "${AIR_VERSION}" != "4.0"
+ && "${AIR_VERSION}" != "3.9" && "${AIR_VERSION}" != "3.8" && "${AIR_VERSION}" != "3.7"
+ && "${AIR_VERSION}" != "3.6" && "${AIR_VERSION}" != "3.5" && "${AIR_VERSION}" != "3.4"
+ && "${AIR_VERSION}" != "3.3" && "${AIR_VERSION}" != "3.2" && "${AIR_VERSION}" != "3.1"
+ && "${AIR_VERSION}" != "3.0" && "${AIR_VERSION}" != "2.7" && "${AIR_VERSION}" != "2.6" ]]
then
- echo Unknown version ${AIR_VERISON} of AIR. Versions 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 13.0 and 14.0 are supported.
+ echo Unknown version ${AIR_VERISON} of AIR. Versions 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 13.0, 14.0 and 15.0 are supported.
exit 1;
fi
@@ -156,6 +156,13 @@ for configFile in "${configFiles[@]}"
do
echo Updating ${configFile}
+ # 15.0 needs FP 15 and swf version 26
+ if [ ${AIR_VERSION} = "15.0" ]
+ then
+ updatePlayerVersion 15.0 "${configFile}"
+ updateSWFVersion 26 "${configFile}"
+ fi
+
# 14.0 needs FP 14 and swf version 25
if [ ${AIR_VERSION} = "14.0" ]
then
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b3aa11c1/ide/setFlashPlayerVersion.sh
----------------------------------------------------------------------
diff --git a/ide/setFlashPlayerVersion.sh b/ide/setFlashPlayerVersion.sh
index 1995346..b76f2ef 100755
--- a/ide/setFlashPlayerVersion.sh
+++ b/ide/setFlashPlayerVersion.sh
@@ -127,9 +127,10 @@ if [[ "${FLASH_VERSION}" != "10.2" && "${FLASH_VERSION}" != "10.3" && "${FLASH_
&& "${FLASH_VERSION}" != "11.1" && "${FLASH_VERSION}" != "11.2" && "${FLASH_VERSION}" != "11.3"
&& "${FLASH_VERSION}" != "11.4" && "${FLASH_VERSION}" != "11.5" && "${FLASH_VERSION}" != "11.6"
&& "${FLASH_VERSION}" != "11.7" && "${FLASH_VERSION}" != "11.8" && "${FLASH_VERSION}" != "11.9"
- && "${FLASH_VERSION}" != "12.0" && "${FLASH_VERSION}" != "13.0" && "${FLASH_VERSION}" != "14.0" ]]
+ && "${FLASH_VERSION}" != "12.0" && "${FLASH_VERSION}" != "13.0" && "${FLASH_VERSION}" != "14.0"
+ && "${FLASH_VERSION}" != "15.0" ]]
then
- echo Unknown version ${FLASH_VERSION} of Flash Player. Versions 10.2, 10.3, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5, 11.6, 11.7, 11.8, 11.9, 12.0, 13.0 and 14.0 are supported.
+ echo Unknown version ${FLASH_VERSION} of Flash Player. Versions 10.2, 10.3, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5, 11.6, 11.7, 11.8, 11.9, 12.0, 13.0, 14.0 and 15.0 are supported.
exit 1;
fi