Updated Branches: refs/heads/develop 4eb58cfc3 -> e564943a6
Update to release versions of AIR 4.0 and Flash Player 12.0 Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e564943a Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e564943a Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e564943a Branch: refs/heads/develop Commit: e564943a63e21185c41ccbfe2bbf7c478d06e05f Parents: 4eb58cf Author: Justin Mclean <[email protected]> Authored: Sun Jan 19 12:11:41 2014 +1100 Committer: Justin Mclean <[email protected]> Committed: Sun Jan 19 12:11:41 2014 +1100 ---------------------------------------------------------------------- ide/addAIRtoSDK.sh | 7 +------ ide/checkAllPlayerGlobals.sh | 2 +- ide/flashbuilder/makeApacheFlexForIDE.bat | 16 ++++++++-------- ide/flashbuilder/makeApacheFlexForIDE.sh | 12 ++++++------ ide/setFlashPlayerVersion.sh | 6 +++--- jenkins.xml | 2 +- 6 files changed, 20 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e564943a/ide/addAIRtoSDK.sh ---------------------------------------------------------------------- diff --git a/ide/addAIRtoSDK.sh b/ide/addAIRtoSDK.sh index 12d8b8d..ba9d645 100755 --- a/ide/addAIRtoSDK.sh +++ b/ide/addAIRtoSDK.sh @@ -104,11 +104,6 @@ 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" @@ -161,7 +156,7 @@ do echo Updating ${configFile} # 4.0 needs FP 12 and swf version 23 - if [ ${AIR_VERSION} = "3.9" ] + if [ ${AIR_VERSION} = "4.0" ] then updatePlayerVersion 12.0 "${configFile}" updateSWFVersion 23 "${configFile}" http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e564943a/ide/checkAllPlayerGlobals.sh ---------------------------------------------------------------------- diff --git a/ide/checkAllPlayerGlobals.sh b/ide/checkAllPlayerGlobals.sh index f1fcd27..81ea9e4 100755 --- a/ide/checkAllPlayerGlobals.sh +++ b/ide/checkAllPlayerGlobals.sh @@ -120,5 +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 d18244c3c00c61a41f2d4d791d09fedb http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_9.swc -downloadPlayerGlobal 12.0 b48f17cc7e3e5b74c4da2ff2d92289b4 http://labsdownload.adobe.com/pub/labs/flashruntimes/flashplayer/flashplayer12-0_playerglobal.swc +downloadPlayerGlobal 12.0 42cf850e02a69cc1695ff8edcf7bfd0d http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal12_0.swc http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e564943a/ide/flashbuilder/makeApacheFlexForIDE.bat ---------------------------------------------------------------------- diff --git a/ide/flashbuilder/makeApacheFlexForIDE.bat b/ide/flashbuilder/makeApacheFlexForIDE.bat index b1b35e4..7e51799 100755 --- a/ide/flashbuilder/makeApacheFlexForIDE.bat +++ b/ide/flashbuilder/makeApacheFlexForIDE.bat @@ -42,10 +42,10 @@ REM set APACHE_FLEX_BIN_DISTRO_DIR=..\.. REM -REM Adobe AIR SDK Version 3.9 +REM Adobe AIR SDK Version 4.0 REM set ADOBE_AIR_SDK_WIN_FILE=AdobeAIRSDK.zip -set ADOBE_AIR_SDK_WIN_URL=http://airdownload.adobe.com/air/win/download/3.9/%ADOBE_AIR_SDK_WIN_FILE% +set ADOBE_AIR_SDK_WIN_URL=http://airdownload.adobe.com/air/win/download/4.0/%ADOBE_AIR_SDK_WIN_FILE% REM REM Adobe Flash Player Version 11.1 @@ -53,9 +53,9 @@ REM set ADOBE_FB_GLOBALPLAYER_11_1_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc REM -REM Adobe Flash Player Version 11.9 +REM Adobe Flash Player Version 12.0 REM -set ADOBE_FB_GLOBALPLAYER_11_9_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_9.swc +set ADOBE_FB_GLOBALPLAYER_12_0_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal12_0.swc :getDir if not [%1] == [] goto checkJar @@ -122,13 +122,13 @@ cscript //B //nologo winUtil.vbs "%ADOBE_FB_GLOBALPLAYER_11_1_SWC_URL%" "%FB_GLO if %errorlevel% neq 0 goto errorExit REM -REM Download 11.9 playerglobal.swc +REM Download 12.0 playerglobal.swc REM -set FB_GLOBALPLAYER_DIR=%FLEX_HOME%\frameworks\libs\player\11.9 +set FB_GLOBALPLAYER_DIR=%FLEX_HOME%\frameworks\libs\player\12.0 if not exist "%FB_GLOBALPLAYER_DIR%" mkdir "%FB_GLOBALPLAYER_DIR%" -echo Downloading Adobe Flash Player playerglobal.swc from "%ADOBE_FB_GLOBALPLAYER_11_9_SWC_URL%" to "%FB_GLOBALPLAYER_DIR%\playerglobal.swc" -cscript //B //nologo winUtil.vbs "%ADOBE_FB_GLOBALPLAYER_11_9_SWC_URL%" "%FB_GLOBALPLAYER_DIR%\playerglobal.swc" +echo Downloading Adobe Flash Player playerglobal.swc from "%ADOBE_FB_GLOBALPLAYER_12_0_SWC_URL%" to "%FB_GLOBALPLAYER_DIR%\playerglobal.swc" +cscript //B //nologo winUtil.vbs "%ADOBE_FB_GLOBALPLAYER_12_0_SWC_URL%" "%FB_GLOBALPLAYER_DIR%\playerglobal.swc" if %errorlevel% neq 0 goto errorExit REM http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e564943a/ide/flashbuilder/makeApacheFlexForIDE.sh ---------------------------------------------------------------------- diff --git a/ide/flashbuilder/makeApacheFlexForIDE.sh b/ide/flashbuilder/makeApacheFlexForIDE.sh index 22b06fb..31966da 100755 --- a/ide/flashbuilder/makeApacheFlexForIDE.sh +++ b/ide/flashbuilder/makeApacheFlexForIDE.sh @@ -37,12 +37,12 @@ # Apache Flex binary distribution APACHE_FLEX_BIN_DIR="$( cd $( dirname -- "$0" ) > /dev/null ; pwd )"/../.. -# Adobe AIR SDK Version 3.9 -ADOBE_AIR_SDK_MAC_URL=http://airdownload.adobe.com/air/mac/download/3.9/AdobeAIRSDK.tbz2 +# Adobe AIR SDK Version 4.0 +ADOBE_AIR_SDK_MAC_URL=http://airdownload.adobe.com/air/mac/download/4.0/AdobeAIRSDK.tbz2 # Adobe Flash Player Version 11.1 ADOBE_FLASHPLAYER_GLOBALPLAYER_11_1_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc -ADOBE_FLASHPLAYER_GLOBALPLAYER_11_9_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_9.swc +ADOBE_FLASHPLAYER_GLOBALPLAYER_12_0_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/12/playerglobal12_0.swc # Adobe Flex SDK v4.6 ADOBE_FLEX_SDK_URL=http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4.6/flex_sdk_4.6.0.23201B.zip @@ -104,9 +104,9 @@ mkdir -p "$FLEX_HOME/frameworks/libs/player/11.1" curl "$ADOBE_FLASHPLAYER_GLOBALPLAYER_11_1_SWC_URL" --output "$FLEX_HOME/frameworks/libs/player/11.1/playerglobal.swc" # download 11.9 playerglobal.swc -echo "Downloading Adobe Flash Player playerglobal.swc from $ADOBE_FLASHPLAYER_GLOBALPLAYER_11_9_SWC_URL" -mkdir -p "$FLEX_HOME/frameworks/libs/player/11.9" -curl "$ADOBE_FLASHPLAYER_GLOBALPLAYER_11_9_SWC_URL" --output "$FLEX_HOME/frameworks/libs/player/11.9/playerglobal.swc" +echo "Downloading Adobe Flash Player playerglobal.swc from $ADOBE_FLASHPLAYER_GLOBALPLAYER_12_0_SWC_URL" +mkdir -p "$FLEX_HOME/frameworks/libs/player/12.0" +curl "$ADOBE_FLASHPLAYER_GLOBALPLAYER_12_0_SWC_URL" --output "$FLEX_HOME/frameworks/libs/player/12.0/playerglobal.swc" # copy the config files formatted for Flash Builder to frameworks echo "Installing the frameworks config files configured for use with Adobe Flash Builder" http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e564943a/ide/setFlashPlayerVersion.sh ---------------------------------------------------------------------- diff --git a/ide/setFlashPlayerVersion.sh b/ide/setFlashPlayerVersion.sh index 54dfa82..d52a02e 100755 --- a/ide/setFlashPlayerVersion.sh +++ b/ide/setFlashPlayerVersion.sh @@ -88,7 +88,7 @@ determineVersion() FLASH_VERSION="10.2" - if [[ $legacy = "N" ]] + if [[ $legacy = "Y" ]] then FLASH_VERSION="11.1" fi @@ -99,13 +99,13 @@ determineVersion() then FLASH_VERSION="11.1" else - FLASH_VERSION="11.8" + FLASH_VERSION="12.0" fi fi if [ ${latest} = "Y" ] then - FLASH_VERSION="11.8" + FLASH_VERSION="12.0" fi if [ ${useBeta} = "Y" ] http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e564943a/jenkins.xml ---------------------------------------------------------------------- diff --git a/jenkins.xml b/jenkins.xml index 529358b..e25eed8 100644 --- a/jenkins.xml +++ b/jenkins.xml @@ -186,7 +186,7 @@ <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"; + <get src="http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal12_0.swc"; dest="${basedir}/lib/player/${playerglobal.version}/playerglobal.swc" verbose="false"/> </target>
