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 2014/12/14 03:54:37 UTC

git commit: [flex-sdk] [refs/heads/release4.14.0] - update to FP 15

Repository: flex-sdk
Updated Branches:
  refs/heads/release4.14.0 62b0e9ed5 -> 666177514


update to FP 15


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/66617751
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/66617751
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/66617751

Branch: refs/heads/release4.14.0
Commit: 666177514d285ff480c58c65cf537e5a515f2bfb
Parents: 62b0e9e
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Dec 14 13:39:54 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sun Dec 14 13:39:54 2014 +1100

----------------------------------------------------------------------
 ide/flashbuilder/makeApacheFlexForIDE.bat | 16 ++++++++--------
 ide/flashbuilder/makeApacheFlexForIDE.sh  | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/66617751/ide/flashbuilder/makeApacheFlexForIDE.bat
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/makeApacheFlexForIDE.bat b/ide/flashbuilder/makeApacheFlexForIDE.bat
index 8b31a34..a00e598 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 13.0
+REM     Adobe AIR SDK Version 15.0
 REM
 set ADOBE_AIR_SDK_WIN_FILE=AdobeAIRSDK.zip
-set ADOBE_AIR_SDK_WIN_URL=http://airdownload.adobe.com/air/win/download/13.0/%ADOBE_AIR_SDK_WIN_FILE%
+set ADOBE_AIR_SDK_WIN_URL=http://airdownload.adobe.com/air/win/download/15.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 13.0
+REM     Adobe Flash Player Version 15.0
 REM
-set ADOBE_FB_GLOBALPLAYER_13_0_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal13_0.swc
+set ADOBE_FB_GLOBALPLAYER_15_0_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal15_0.swc
 
 :getDir
 if not [%1] == [] goto checkJar
@@ -124,13 +124,13 @@ cscript //B //nologo winUtil.vbs "%ADOBE_FB_GLOBALPLAYER_11_1_SWC_URL%" "%FB_GLO
 if %errorlevel% neq 0 goto errorExit
 
 REM
-REM     Download 13.0 playerglobal.swc
+REM     Download 15.0 playerglobal.swc
 REM
-set FB_GLOBALPLAYER_DIR=%FLEX_HOME%\frameworks\libs\player\13.0
+set FB_GLOBALPLAYER_DIR=%FLEX_HOME%\frameworks\libs\player\15.0
 if not exist "%FB_GLOBALPLAYER_DIR%" mkdir "%FB_GLOBALPLAYER_DIR%"
 
-echo Downloading Adobe Flash Player playerglobal.swc from "%ADOBE_FB_GLOBALPLAYER_13_0_SWC_URL%" to "%FB_GLOBALPLAYER_DIR%\playerglobal.swc"
-cscript //B //nologo winUtil.vbs "%ADOBE_FB_GLOBALPLAYER_13_0_SWC_URL%" "%FB_GLOBALPLAYER_DIR%\playerglobal.swc"
+echo Downloading Adobe Flash Player playerglobal.swc from "%ADOBE_FB_GLOBALPLAYER_15_0_SWC_URL%" to "%FB_GLOBALPLAYER_DIR%\playerglobal.swc"
+cscript //B //nologo winUtil.vbs "%ADOBE_FB_GLOBALPLAYER_15_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/66617751/ide/flashbuilder/makeApacheFlexForIDE.sh
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/makeApacheFlexForIDE.sh b/ide/flashbuilder/makeApacheFlexForIDE.sh
index fc34d52..a0b3af3 100755
--- a/ide/flashbuilder/makeApacheFlexForIDE.sh
+++ b/ide/flashbuilder/makeApacheFlexForIDE.sh
@@ -38,12 +38,12 @@
 # Apache Flex binary distribution
 APACHE_FLEX_BIN_DIR="$( cd $( dirname -- "$0" ) > /dev/null ; pwd )"/../..
 
-# Adobe AIR SDK Version 14.0
-ADOBE_AIR_SDK_MAC_URL=http://airdownload.adobe.com/air/mac/download/14.0/AdobeAIRSDK.tbz2
+# Adobe AIR SDK Version 15.0
+ADOBE_AIR_SDK_MAC_URL=http://airdownload.adobe.com/air/mac/download/15.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_14_0_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/14/playerglobal14_0.swc
+ADOBE_FLASHPLAYER_GLOBALPLAYER_15_0_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/15/playerglobal15_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,10 +104,10 @@ echo "Downloading Adobe Flash Player playerglobal.swc from $ADOBE_FLASHPLAYER_GL
 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 14 playerglobal.swc
-echo "Downloading Adobe Flash Player playerglobal.swc from $ADOBE_FLASHPLAYER_GLOBALPLAYER_14_0_SWC_URL"
-mkdir -p "$FLEX_HOME/frameworks/libs/player/14.0"
-curl "$ADOBE_FLASHPLAYER_GLOBALPLAYER_14_0_SWC_URL" --output "$FLEX_HOME/frameworks/libs/player/14.0/playerglobal.swc"
+# download 15 playerglobal.swc
+echo "Downloading Adobe Flash Player playerglobal.swc from $ADOBE_FLASHPLAYER_GLOBALPLAYER_15_0_SWC_URL"
+mkdir -p "$FLEX_HOME/frameworks/libs/player/15.0"
+curl "$ADOBE_FLASHPLAYER_GLOBALPLAYER_15_0_SWC_URL" --output "$FLEX_HOME/frameworks/libs/player/15.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"