Repository: flex-sdk Updated Branches: refs/heads/develop ebf1a71c4 -> 0f4d0e726
Updated to support FP/AIR 14 Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/533b7641 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/533b7641 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/533b7641 Branch: refs/heads/develop Commit: 533b76418be5237024915bad9ff0e93b4e4d5223 Parents: ebf1a71 Author: Justin Mclean <jmcl...@apache.org> Authored: Thu Jun 12 13:26:03 2014 +0100 Committer: Justin Mclean <jmcl...@apache.org> Committed: Thu Jun 12 13:26:03 2014 +0100 ---------------------------------------------------------------------- ide/addAIRtoSDK.sh | 12 ++++++++++-- ide/checkAllPlayerGlobals.bat | 3 ++- ide/checkAllPlayerGlobals.sh | 1 + ide/setFlashPlayerVersion.sh | 24 +++++++++++++++++------- 4 files changed, 30 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/533b7641/ide/addAIRtoSDK.sh ---------------------------------------------------------------------- diff --git a/ide/addAIRtoSDK.sh b/ide/addAIRtoSDK.sh index e355fab..c7b9005 100755 --- a/ide/addAIRtoSDK.sh +++ b/ide/addAIRtoSDK.sh @@ -30,13 +30,14 @@ AIR_VERSION="$1" OS=`uname` -if [[ "${AIR_VERSION}" != "13.0" &&"${AIR_VERSION}" != "4.0" && "${AIR_VERSION}" != "3.9" +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" ]] 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 and 13.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 and 14.0 are supported. exit 1; fi @@ -155,6 +156,13 @@ for configFile in "${configFiles[@]}" do echo Updating ${configFile} + # 14.0 needs FP 14 and swf version 25 + if [ ${AIR_VERSION} = "14.0" ] + then + updatePlayerVersion 14.0 "${configFile}" + updateSWFVersion 25 "${configFile}" + fi + # 13.0 needs FP 13 and swf version 24 if [ ${AIR_VERSION} = "13.0" ] then http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/533b7641/ide/checkAllPlayerGlobals.bat ---------------------------------------------------------------------- diff --git a/ide/checkAllPlayerGlobals.bat b/ide/checkAllPlayerGlobals.bat index 89fe787..123e794 100644 --- a/ide/checkAllPlayerGlobals.bat +++ b/ide/checkAllPlayerGlobals.bat @@ -126,7 +126,8 @@ call :downloadPlayerGlobal 11.7 12656571c57b2ad641838e5695a00e27 http://download call :downloadPlayerGlobal 11.8 20ce9ae3b2ddd4a5ff3fe65c0a7f1139 http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_8.swc call :downloadPlayerGlobal 11.9 4cac2727e7b7e741075581f47c35f3af http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_9.swc call :downloadPlayerGlobal 12.0 4db4e934f39f774ba68fcd9a79654971 http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal12_0.swc -call :downloadPlayerGlobal 13.0 7f9bfe038f00e97bc44abf52bb5b1260 http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal13_0.swc +call :downloadPlayerGlobal 13.0 7f9bfe038f00e97bc44abf52bb5b1260 http://download.macromedia.com/get/flashplayer/updaters/13/playerglobal13_0.swc +call :downloadPlayerGlobal 14.0 2465d2fcf0d985ed10231b43f61c3024 http://download.macromedia.com/get/flashplayer/updaters/14/playerglobal14_0.swc http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/533b7641/ide/checkAllPlayerGlobals.sh ---------------------------------------------------------------------- diff --git a/ide/checkAllPlayerGlobals.sh b/ide/checkAllPlayerGlobals.sh index 8a5fc5f..646121b 100755 --- a/ide/checkAllPlayerGlobals.sh +++ b/ide/checkAllPlayerGlobals.sh @@ -122,4 +122,5 @@ downloadPlayerGlobal 11.8 35bc69eec5091f70e221b4e63b66b60f http://download.macro downloadPlayerGlobal 11.9 d18244c3c00c61a41f2d4d791d09fedb http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_9.swc downloadPlayerGlobal 12.0 4db4e934f39f774ba68fcd9a79654971 http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal12_0.swc downloadPlayerGlobal 13.0 7f9bfe038f00e97bc44abf52bb5b1260 http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal13_0.swc +downloadPlayerGlobal 14.0 2465d2fcf0d985ed10231b43f61c3024 http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal14_0.swc http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/533b7641/ide/setFlashPlayerVersion.sh ---------------------------------------------------------------------- diff --git a/ide/setFlashPlayerVersion.sh b/ide/setFlashPlayerVersion.sh index 94e2353..1995346 100755 --- a/ide/setFlashPlayerVersion.sh +++ b/ide/setFlashPlayerVersion.sh @@ -99,18 +99,18 @@ determineVersion() then FLASH_VERSION="11.1" else - FLASH_VERSION="12.0" + FLASH_VERSION="14.0" fi fi if [ ${latest} = "Y" ] then - FLASH_VERSION="12.0" + FLASH_VERSION="14.0" fi if [ ${useBeta} = "Y" ] then - FLASH_VERSION="12.0" + FLASH_VERSION="14.0" fi echo "Setting minimum Flash Player version to ${FLASH_VERSION}" @@ -127,9 +127,9 @@ 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}" != "12.0" && "${FLASH_VERSION}" != "13.0" && "${FLASH_VERSION}" != "14.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 and 13.0 beta 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 and 14.0 are supported. exit 1; fi @@ -149,10 +149,15 @@ if [[ $useMobile = "Y" || $useDesktop = "Y" ]] then echo Installing AIR echo - + + if [[ $FLASH_VERSION = "14.0" ]] + then + ./addAIRtoSDK.sh 14.0 "$IDE_SDK_DIR" + fi + if [[ $FLASH_VERSION = "13.0" ]] then - ./addAIRtoSDK.sh 4.0 "$IDE_SDK_DIR" + ./addAIRtoSDK.sh 13.0 "$IDE_SDK_DIR" fi if [[ $FLASH_VERSION = "12.0" ]] @@ -218,6 +223,11 @@ do updatePlayerVersion "${FLASH_VERSION}" "${configFile}" + if [ ${FLASH_VERSION} = "14.0" ] + then + updateSWFVersion 25 "${configFile}" + fi + if [ ${FLASH_VERSION} = "13.0" ] then updateSWFVersion 24 "${configFile}"
