flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject git commit: [flex-sdk] [refs/heads/develop] - 4.9 AIR support/11.9 Flash Player support
Date Thu, 05 Sep 2013 02:11:52 GMT
Updated Branches:
  refs/heads/develop 1bef09730 -> 9a554d765


4.9 AIR support/11.9 Flash Player support


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

Branch: refs/heads/develop
Commit: 9a554d7659061b380e61b19d5eb6ea2c3b950b80
Parents: 1bef097
Author: Justin Mclean <jmclean@apache.org>
Authored: Thu Sep 5 12:09:42 2013 +1000
Committer: Justin Mclean <jmclean@apache.org>
Committed: Thu Sep 5 12:09:42 2013 +1000

----------------------------------------------------------------------
 frameworks/build.xml         |  3 +++
 ide/addAIRtoSDK.sh           | 15 +++++++++++++--
 ide/checkAllPlayerGlobals.sh |  1 +
 ide/setFlashPlayerVersion.sh | 23 +++++++++++++++++++++--
 jenkins.xml                  | 10 ++++++++++
 5 files changed, 48 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9a554d76/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 1f5f64a..fc3f96b 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -178,6 +178,9 @@
 		<condition property="playerglobal.swfversion" value="21">
 			<equals arg1="${playerglobal.version}" arg2="11.8" />
 		</condition>
+		<condition property="playerglobal.swfversion" value="22">
+			<equals arg1="${playerglobal.version}" arg2="11.9" />
+		</condition>
 	</target>	
 
     <!--

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9a554d76/ide/addAIRtoSDK.sh
----------------------------------------------------------------------
diff --git a/ide/addAIRtoSDK.sh b/ide/addAIRtoSDK.sh
index 050009f..67b9f77 100755
--- a/ide/addAIRtoSDK.sh
+++ b/ide/addAIRtoSDK.sh
@@ -30,7 +30,7 @@
 AIR_VERSION="$1"
 OS=`uname`
 
-if [[ "${AIR_VERSION}" != "3.8" && "${AIR_VERSION}" != "3.7" && "${AIR_VERSION}"
!= "3.6"
+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" ]]
@@ -103,6 +103,11 @@ downloadAIR()
         airDownload="http://airdownload.adobe.com/air/lin/download/${version}/AdobeAIRSDK.tbz2"
     fi
     
+    if [[ "${AIR_VERSION}" == "3.9" ]]
+    then
+        airDownload="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air3-9_sdk_sa_mac.tbz2"
+    fi
+    
 	echo Downloading AIR ${version}
 	curl ${airDownload} > "${airTempDir}/air.tbz2"
 	
@@ -154,7 +159,13 @@ for configFile in "${configFiles[@]}"
 do
 	echo Updating ${configFile}
 	
-	
+	# 3.8 needs FP 11.9 and swf version 22
+	if [ ${AIR_VERSION} = "3.9" ]
+	then
+		updatePlayerVersion 11.9 "${configFile}"
+		updateSWFVersion 22 "${configFile}"
+	fi	
+		
 	# 3.8 needs FP 11.8 and swf version 21
 	if [ ${AIR_VERSION} = "3.8" ]
 	then

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9a554d76/ide/checkAllPlayerGlobals.sh
----------------------------------------------------------------------
diff --git a/ide/checkAllPlayerGlobals.sh b/ide/checkAllPlayerGlobals.sh
index ff6ce72..031b455 100755
--- a/ide/checkAllPlayerGlobals.sh
+++ b/ide/checkAllPlayerGlobals.sh
@@ -119,4 +119,5 @@ downloadPlayerGlobal 11.5 00384b24157442c59ca5d625ecfd11a2 http://download.macro
 downloadPlayerGlobal 11.6 1b841a0a26ada3e5da26eb70c32ab263 http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_6.swc
 downloadPlayerGlobal 11.7 12656571c57b2ad641838e5695a00e27 http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_7.swc
 downloadPlayerGlobal 11.8 20ce9ae3b2ddd4a5ff3fe65c0a7f1139 http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_8.swc
+downloadPlayerGlobal 11.9 f183ff4f1daf7547f84abcb358b3d01c http://labsdownload.adobe.com/pub/labs/flashruntimes/flashplayer/flashplayer11-9_playerglobal.swc
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9a554d76/ide/setFlashPlayerVersion.sh
----------------------------------------------------------------------
diff --git a/ide/setFlashPlayerVersion.sh b/ide/setFlashPlayerVersion.sh
index b785be0..3f18c4c 100755
--- a/ide/setFlashPlayerVersion.sh
+++ b/ide/setFlashPlayerVersion.sh
@@ -69,6 +69,10 @@ determineVersion()
 	    legacy="N"
 	fi
 	
+	echo "Do you want to use the very latest Adobe Labs beta version?"
+    askYesNo
+    useBeta=$yesNo
+    echo
     echo "Do you want to create browser based applications?"
     askYesNo
     useBrowser=$yesNo
@@ -104,6 +108,11 @@ determineVersion()
     	FLASH_VERSION="11.8"
     fi
     
+    if [ ${useBeta} = "Y" ]
+    then
+    	FLASH_VERSION="11.9"
+    fi
+    
     echo "Setting minimum Flash Player version to ${FLASH_VERSION}"
     echo
     echo
@@ -114,9 +123,9 @@ 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" ]]
+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"
]]
 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 and 11.8 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 and 11.9 are supported.
 	exit 1;
 fi
 
@@ -137,6 +146,11 @@ then
 	echo Installing AIR
 	echo
 
+    if [[ $FLASH_VERSION = "11.9" ]]
+    then
+        ./addAIRtoSDK.sh 3.9 "$IDE_SDK_DIR"
+    fi
+    
     if [[ $FLASH_VERSION = "11.8" ]]
     then
         ./addAIRtoSDK.sh 3.8 "$IDE_SDK_DIR"
@@ -189,6 +203,11 @@ do
 	echo Updating ${configFile}
 	
 	updatePlayerVersion "${FLASH_VERSION}" "${configFile}"
+	
+	if [ ${FLASH_VERSION} = "11.9" ]
+	then
+		updateSWFVersion 22 "${configFile}"
+	fi
 
 	if [ ${FLASH_VERSION} = "11.8" ]
 	then

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9a554d76/jenkins.xml
----------------------------------------------------------------------
diff --git a/jenkins.xml b/jenkins.xml
index 4a2ceba..05bb6db 100644
--- a/jenkins.xml
+++ b/jenkins.xml
@@ -92,6 +92,9 @@
 		<condition property="target11.8">
 			<equals arg1="${playerglobal.version}" arg2="11.8" />
 		</condition>
+		<condition property="target11.9">
+			<equals arg1="${playerglobal.version}" arg2="11.9" />
+		</condition>
 	 </target>
 
     <target name="playerglobal10.2-download" if="target10.2">
@@ -170,6 +173,13 @@
             dest="${basedir}/lib/player/${playerglobal.version}/playerglobal.swc" 
             verbose="false"/>
     </target>
+	
+    <target name="playerglobal11.9-download" if="target11.9">
+    	<mkdir dir="${basedir}/lib/player/${playerglobal.version}"/>
+        <get src="http://labsdownload.adobe.com/pub/labs/flashruntimes/flashplayer/flashplayer11-9_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" />


Mime
View raw message