Updated Branches: refs/heads/develop 04cb86c6f -> ce735d9d7
Add support for FP 12 and AIR 4 beta. Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e4b25078 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e4b25078 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e4b25078 Branch: refs/heads/develop Commit: e4b250789bf6eb6ae0d4c8b8a726d7f490bb479a Parents: 9f3a801 Author: Justin Mclean <[email protected]> Authored: Mon Nov 18 08:39:21 2013 +1100 Committer: Justin Mclean <[email protected]> Committed: Mon Nov 18 08:39:21 2013 +1100 ---------------------------------------------------------------------- frameworks/build.xml | 3 +++ ide/addAIRtoSDK.sh | 25 +++++++++++++++++++------ ide/checkAllPlayerGlobals.sh | 1 + ide/setFlashPlayerVersion.sh | 20 +++++++++++++++++--- jenkins.xml | 12 +++++++++++- 5 files changed, 51 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e4b25078/frameworks/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/build.xml b/frameworks/build.xml index ce42555..27e126e 100644 --- a/frameworks/build.xml +++ b/frameworks/build.xml @@ -181,6 +181,9 @@ <condition property="playerglobal.swfversion" value="22"> <equals arg1="${playerglobal.version}" arg2="11.9" /> </condition> + <condition property="playerglobal.swfversion" value="23"> + <equals arg1="${playerglobal.version}" arg2="12.0" /> + </condition> </target> <!-- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e4b25078/ide/addAIRtoSDK.sh ---------------------------------------------------------------------- diff --git a/ide/addAIRtoSDK.sh b/ide/addAIRtoSDK.sh index b5174ac..12d8b8d 100755 --- a/ide/addAIRtoSDK.sh +++ b/ide/addAIRtoSDK.sh @@ -30,12 +30,13 @@ AIR_VERSION="$1" OS=`uname` -if [[ "${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}" != "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 and 3.8 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 and 4.0 are supported. exit 1; fi @@ -103,6 +104,11 @@ downloadAIR() airDownload="http://airdownload.adobe.com/air/lin/download/${version}/AdobeAIRSDK.tbz2"; fi + if [[ "${AIR_VERSION}" == "4.0" ]] + then + airDownload="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air4-0_sdk_sa_mac.tbz2"; + fi + echo Downloading AIR ${version} curl ${airDownload} > "${airTempDir}/air.tbz2" @@ -153,7 +159,14 @@ updatePlayerDescription "${AIR_VERSION}" "${IDE_SDK_DIR}/flex-sdk-description.xm for configFile in "${configFiles[@]}" do echo Updating ${configFile} - + + # 4.0 needs FP 12 and swf version 23 + if [ ${AIR_VERSION} = "3.9" ] + then + updatePlayerVersion 12.0 "${configFile}" + updateSWFVersion 23 "${configFile}" + fi + # 3.8 needs FP 11.9 and swf version 22 if [ ${AIR_VERSION} = "3.9" ] then http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e4b25078/ide/checkAllPlayerGlobals.sh ---------------------------------------------------------------------- diff --git a/ide/checkAllPlayerGlobals.sh b/ide/checkAllPlayerGlobals.sh index 4dd8ab5..79a4ab1 100755 --- a/ide/checkAllPlayerGlobals.sh +++ b/ide/checkAllPlayerGlobals.sh @@ -120,4 +120,5 @@ downloadPlayerGlobal 11.6 1b841a0a26ada3e5da26eb70c32ab263 http://download.macro downloadPlayerGlobal 11.7 12656571c57b2ad641838e5695a00e27 http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_7.swc downloadPlayerGlobal 11.8 35bc69eec5091f70e221b4e63b66b60f http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_8.swc downloadPlayerGlobal 11.9 4cac2727e7b7e741075581f47c35f3af http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_9.swc +downloadPlayerGlobal 12.0 c59addb2d7a682dc1190a5ac8d232860 http://labsdownload.adobe.com/pub/labs/flashruntimes/flashplayer/flashplayer12-0_playerglobal.swc http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e4b25078/ide/setFlashPlayerVersion.sh ---------------------------------------------------------------------- diff --git a/ide/setFlashPlayerVersion.sh b/ide/setFlashPlayerVersion.sh index 3f18c4c..54dfa82 100755 --- a/ide/setFlashPlayerVersion.sh +++ b/ide/setFlashPlayerVersion.sh @@ -110,7 +110,7 @@ determineVersion() if [ ${useBeta} = "Y" ] then - FLASH_VERSION="11.9" + FLASH_VERSION="12.0" fi echo "Setting minimum Flash Player version to ${FLASH_VERSION}" @@ -123,9 +123,13 @@ then determineVersion fi -if [[ "${FLASH_VERSION}" != "10.2" && "${FLASH_VERSION}" != "10.3" && "${FLASH_VERSION}" != "11.0" && "${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" ]] +if [[ "${FLASH_VERSION}" != "10.2" && "${FLASH_VERSION}" != "10.3" && "${FLASH_VERSION}" != "11.0" + && "${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" ]] 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 and 11.9 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 and 12.0 are supported. exit 1; fi @@ -145,6 +149,11 @@ if [[ $useMobile = "Y" || $useDesktop = "Y" ]] then echo Installing AIR echo + + if [[ $FLASH_VERSION = "12.0" ]] + then + ./addAIRtoSDK.sh 4.0 "$IDE_SDK_DIR" + fi if [[ $FLASH_VERSION = "11.9" ]] then @@ -204,6 +213,11 @@ do updatePlayerVersion "${FLASH_VERSION}" "${configFile}" + if [ ${FLASH_VERSION} = "12.0" ] + then + updateSWFVersion 23 "${configFile}" + fi + if [ ${FLASH_VERSION} = "11.9" ] then updateSWFVersion 22 "${configFile}" http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e4b25078/jenkins.xml ---------------------------------------------------------------------- diff --git a/jenkins.xml b/jenkins.xml index a0ec5b1..529358b 100644 --- a/jenkins.xml +++ b/jenkins.xml @@ -55,7 +55,7 @@ <!-- playerglobal.swc --> <!-- Because this requires a network connection it copies playerglobal.swc only if it doesn't already exist. --> - <target name="playerglobal-download" depends="playerglobal-check,playerglobal-settarget,playerglobal10.2-download,playerglobal10.3-download,playerglobal11.0-download,playerglobal11.1-download,playerglobal11.2-download,playerglobal11.3-download,playerglobal11.4-download,playerglobal11.5-download,playerglobal11.6-download,playerglobal11.7-download,playerglobal11.8-download,playerglobal11.9-download" description="Copies playerglobal.swc from the Adobe website"> + <target name="playerglobal-download" depends="playerglobal-check,playerglobal-settarget,playerglobal10.2-download,playerglobal10.3-download,playerglobal11.0-download,playerglobal11.1-download,playerglobal11.2-download,playerglobal11.3-download,playerglobal11.4-download,playerglobal11.5-download,playerglobal11.6-download,playerglobal11.7-download,playerglobal11.8-download,playerglobal11.9-download,playerglobal12.0-download" description="Copies playerglobal.swc from the Adobe website"> </target> <target name="playerglobal-settarget" unless="playerglobal.swc.present"> @@ -95,6 +95,9 @@ <condition property="target11.9"> <equals arg1="${playerglobal.version}" arg2="11.9" /> </condition> + <condition property="target12.0"> + <equals arg1="${playerglobal.version}" arg2="12.0" /> + </condition> </target> <target name="playerglobal10.2-download" if="target10.2"> @@ -180,6 +183,13 @@ dest="${basedir}/lib/player/${playerglobal.version}/playerglobal.swc" verbose="false"/> </target> + + <target name="playerglobal12.0-download" if="target12.0"> + <mkdir dir="${basedir}/lib/player/${playerglobal.version}"/> + <get src="http://labsdownload.adobe.com/pub/labs/flashruntimes/flashplayer/flashplayer12-0_playerglobal.swc"; + dest="${basedir}/lib/player/${playerglobal.version}/playerglobal.swc" + verbose="false"/> + </target> <target name="clean" description="Cleans third party downloaded files."> <delete dir="${FLEX_HOME}/temp" />
