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/13 05:15:55 UTC

git commit: [flex-sdk] [refs/heads/release4.14.0] - added support for AIR/FP 15.0 and 16.0 and update defaults

Repository: flex-sdk
Updated Branches:
  refs/heads/release4.14.0 cf61b4747 -> d9a0cb183


added support for AIR/FP 15.0 and 16.0 and update defaults


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

Branch: refs/heads/release4.14.0
Commit: d9a0cb18308b8dd3dd91fde76bd9d10a336fae79
Parents: cf61b47
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Dec 13 15:15:45 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Dec 13 15:15:45 2014 +1100

----------------------------------------------------------------------
 ide/setFlashPlayerVersion.sh | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d9a0cb18/ide/setFlashPlayerVersion.sh
----------------------------------------------------------------------
diff --git a/ide/setFlashPlayerVersion.sh b/ide/setFlashPlayerVersion.sh
index b76f2ef..8bcf77e 100755
--- a/ide/setFlashPlayerVersion.sh
+++ b/ide/setFlashPlayerVersion.sh
@@ -99,18 +99,18 @@ determineVersion()
         then 
             FLASH_VERSION="11.1"
         else
-            FLASH_VERSION="14.0"
+            FLASH_VERSION="15.0"
         fi
     fi
     
     if [ ${latest} = "Y" ]
     then
-    	FLASH_VERSION="14.0"
+    	FLASH_VERSION="15.0"
     fi
     
     if [ ${useBeta} = "Y" ]
     then
-    	FLASH_VERSION="14.0"
+    	FLASH_VERSION="16.0"
     fi
     
     echo "Setting minimum Flash Player version to ${FLASH_VERSION}"
@@ -128,9 +128,9 @@ if [[ "${FLASH_VERSION}" != "10.2" && "${FLASH_VERSION}" != "10.3"  && "${FLASH_
   && "${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}" != "15.0" ]]
+  && "${FLASH_VERSION}" != "15.0" && "${FLASH_VERSION}" != "16.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, 14.0 and 15.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, 15.0 and 16.0 are supported.
 	exit 1;
 fi
 
@@ -150,6 +150,16 @@ if [[ $useMobile = "Y" || $useDesktop = "Y" ]]
 then
 	echo Installing AIR
 	echo
+	
+	if [[ $FLASH_VERSION = "16.0" ]]
+    then
+        ./addAIRtoSDK.sh 16.0 "$IDE_SDK_DIR"
+    fi
+    
+	if [[ $FLASH_VERSION = "15.0" ]]
+    then
+        ./addAIRtoSDK.sh 15.0 "$IDE_SDK_DIR"
+    fi
 
 	if [[ $FLASH_VERSION = "14.0" ]]
     then
@@ -224,6 +234,16 @@ do
 	
 	updatePlayerVersion "${FLASH_VERSION}" "${configFile}"
 
+	if [ ${FLASH_VERSION} = "16.0" ]
+	then
+		updateSWFVersion 27 "${configFile}"
+	fi
+	
+	if [ ${FLASH_VERSION} = "15.0" ]
+	then
+		updateSWFVersion 26 "${configFile}"
+	fi
+	
 	if [ ${FLASH_VERSION} = "14.0" ]
 	then
 		updateSWFVersion 25 "${configFile}"