incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject svn commit: r1293524 - in /incubator/flex/branches/patches: build.properties build_framework.xml flex-config.template.xml
Date Sat, 25 Feb 2012 02:34:30 GMT
Author: jmclean
Date: Sat Feb 25 02:34:29 2012
New Revision: 1293524

URL: http://svn.apache.org/viewvc?rev=1293524&view=rev
Log:
Changes to the build framework script to enable compiling the 4.6 SDK framework to different
locales and different versions of the flash player (10.2,10.3,11.0, 11.1 and 11.2 beta)

Added:
    incubator/flex/branches/patches/build.properties
    incubator/flex/branches/patches/flex-config.template.xml
      - copied, changed from r1293502, incubator/flex/branches/patches/flex-config.xml
Modified:
    incubator/flex/branches/patches/build_framework.xml

Added: incubator/flex/branches/patches/build.properties
URL: http://svn.apache.org/viewvc/incubator/flex/branches/patches/build.properties?rev=1293524&view=auto
==============================================================================
--- incubator/flex/branches/patches/build.properties (added)
+++ incubator/flex/branches/patches/build.properties Sat Feb 25 02:34:29 2012
@@ -0,0 +1,2 @@
+playerglobal.version=11.1
+locale=en_US
\ No newline at end of file

Modified: incubator/flex/branches/patches/build_framework.xml
URL: http://svn.apache.org/viewvc/incubator/flex/branches/patches/build_framework.xml?rev=1293524&r1=1293523&r2=1293524&view=diff
==============================================================================
--- incubator/flex/branches/patches/build_framework.xml (original)
+++ incubator/flex/branches/patches/build_framework.xml Sat Feb 25 02:34:29 2012
@@ -29,7 +29,6 @@
     -->
 
     <property name="FLEX_HOME" value="${basedir}/.."/>
-    <property name="locale" value="en_US"/>
     <property name="projects.dir" value="${FLEX_HOME}/frameworks/projects"/>
     <property name="airframework.dir" value="${projects.dir}/airframework"/>
     <property name="airspark.dir" value="${projects.dir}/airspark"/>
@@ -49,11 +48,13 @@
     <property name="mobiletheme.dir" value="${projects.dir}/mobiletheme"/>
     <property name="wireframe.dir" value="${projects.dir}/wireframe"/>
     <property name="compc.jvm.args" value="-Xmx384m" />
-    <property name="playerglobal.version" value="11.1"/>
+	
+	<!-- Set plyerglobal.version and locale -->
+	<loadproperties srcFile="${FLEX_HOME}/frameworks/build.properties"/>
     
     <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
 
-    <target name="main" depends="clean,thirdparty-downloads,prepare,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,authoringsupport,bundles,themes,sparkskins,spark_dmv"/>
+    <target name="main" depends="clean,thirdparty-downloads,prepare,flexconfig,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,authoringsupport,bundles,themes,sparkskins,spark_dmv"/>
 
     <target name="bundles" depends="framework_rb,mx_rb,spark_rb,airframework_rb,airspark_rb,mobilecomponents_rb,rpc_rb,charts_rb,advancedgrids_rb"/>
     
@@ -64,25 +65,52 @@
     <!--
        This is typically generated by the top-level build.xml.  
        Temporarily do it here while we are just building frameworks.
-
     -->
     
     <property name="release" value="Apache Flex 4.6.0"/>    
     <property name="release.version" value="4.6.0"/>    
-    <property name="build.number" value="0"/>    
+	<property name="build.number" value="0"/>    
 
     <target name="create-description" description="This file is used by FlashBuilder to
identify the SDK">
         <echo file="${FLEX_HOME}/flex-sdk-description.xml">&lt;?xml version="1.0"?&gt;
 &lt;flex-sdk-description&gt;
-&lt;name&gt;${release}&lt;/name&gt;
+&lt;name&gt;${release} FP${playerglobal.version} ${locale}&lt;/name&gt;
 &lt;version&gt;${release.version}&lt;/version&gt;
 &lt;build&gt;${build.number}&lt;/build&gt;
 &lt;/flex-sdk-description&gt;
         </echo>
     </target>
+			
+	<target name="flexconfig" depends="playerglobal-setswfversion" description="Copy the
flex config template to flex-config.xml and inject version numbers">
+		<copy file="${basedir}/flex-config.template.xml" tofile="${basedir}/flex-config.xml"
overwrite="true">
+			<filterset>
+				<filter token="playerversion" value="${playerglobal.version}"/>
+				<filter token="swfversion" value="${playerglobal.swfversion}"/>
+				<filter token="locale" value="${locale}"/>
+			</filterset>
+		</copy>
+	</target>
+		
+	<target name="playerglobal-setswfversion" description="Set the swfversion to insert into
the flex config file">
+		<condition property="playerglobal.swfversion" value="11">
+			<equals arg1="${playerglobal.version}" arg2="10.2" />
+		</condition>
+		<condition property="playerglobal.swfversion" value="12">
+			<equals arg1="${playerglobal.version}" arg2="10.3" />
+		</condition>
+		<condition property="playerglobal.swfversion" value="13">
+			<equals arg1="${playerglobal.version}" arg2="11.0" />
+		</condition>
+		<condition property="playerglobal.swfversion" value="14">
+			<equals arg1="${playerglobal.version}" arg2="11.1" />
+		</condition>
+		<condition property="playerglobal.swfversion" value="15">
+			<equals arg1="${playerglobal.version}" arg2="11.2" />
+		</condition>
+	</target>	
 
     <target name="advancedgrids" description="Builds advancedgrids.swc">
-        <compc static-link-runtime-shared-libraries="true" fork="true" locale="" 
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale=""
             accessible="true" show-deprecation-warnings="false"
             include-classes="AdvancedDataGridClasses"
             output="${basedir}/libs/advancedgrids.swc" 
@@ -91,7 +119,7 @@
             <include-namespaces uri="http://www.adobe.com/2006/mxml"/>
             <source-path path-element="${advancedgrids.dir}/src"/>
             <source-path path-element="${basedir}/projects/mx/src"/>
-            <library-path/>
+        	<library-path/>
             <external-library-path dir="${basedir}/libs">
                 <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
@@ -113,7 +141,7 @@
             <source-path path-element="${advancedgrids.dir}/bundles/${locale}"/>
             <source-path path-element="${framework.dir}/src"/>
             <external-library-path dir="${basedir}/libs/player/${playerglobal.version}"
includes="playerglobal.swc"/>
-            <library-path/>
+        	<library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>   
@@ -126,7 +154,7 @@
             <namespace uri="library://ns.adobe.com/flex/mx" manifest="${airframework.dir}/manifest.xml"/>
             <include-namespaces uri="library://ns.adobe.com/flex/mx"/>
             <source-path path-element="${airframework.dir}/src"/>
-            <library-path/>
+        	<library-path/>
             <external-library-path dir="${basedir}/libs">
                 <include name="air/airglobal.swc"/>
                 <include name="framework.swc"/>
@@ -186,7 +214,7 @@
             <source-path path-element="${framework.dir}/bundles/${locale}"/>
             <source-path path-element="${basedir}/projects/mx/bundles/${locale}"/>
             <external-library-path dir="${basedir}/libs/player/${playerglobal.version}"
includes="playerglobal.swc"/>
-            <library-path/>
+        	<library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>
@@ -220,7 +248,7 @@
             <source-path path-element="${framework.dir}/bundles/${locale}"/>
             <source-path path-element="${framework.dir}/src"/>
             <external-library-path dir="${basedir}/libs/player/${playerglobal.version}"
includes="playerglobal.swc"/>
-            <library-path/>
+        	<library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>
@@ -257,7 +285,7 @@
             <source-path path-element="${charts.dir}/bundles/${locale}"/>
             <source-path path-element="${framework.dir}/src"/>
             <external-library-path dir="${basedir}/libs/player/${playerglobal.version}"
includes="playerglobal.swc"/>
-            <library-path/>
+        	<library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>
@@ -294,7 +322,7 @@
             <include-namespaces uri="http://www.adobe.com/someNonSensicalURI"/>
             <source-path path-element="${flash-integration.dir}/src"/>
             <load-config filename="${basedir}/projects/framework/framework-config.xml"/>
-            <library-path/>
+        	<library-path/>
             <external-library-path dir="${basedir}/libs">
                 <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="textLayout.swc"/>
@@ -320,7 +348,7 @@
             </external-library-path>
             <load-config filename="${basedir}/flex-config.xml"/>
             <load-config filename="${framework.dir}/framework-config.xml"/>
-            <library-path/>
+        	<library-path/>
             <include-file name="defaults.css" path="${framework.dir}/defaults.css"/>
             <include-file name="defaults-3.0.0.css" path="${framework.dir}/defaults-3.0.0.css"/>
             <include-file name="Assets.swf" path="${framework.dir}/assets/Assets.swf"/>
@@ -353,7 +381,7 @@
             <source-path path-element="${framework.dir}/bundles/${locale}"/>
             <source-path path-element="${framework.dir}/src"/>
             <external-library-path dir="${basedir}/libs/player/${playerglobal.version}"
includes="playerglobal.swc"/>
-            <library-path/>
+        	<library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>   
@@ -366,7 +394,7 @@
             <namespace uri="library://ns.adobe.com/flex/spark" manifest="${mobilecomponents.dir}/manifest.xml"/>
             <include-namespaces uri="library://ns.adobe.com/flex/spark"/>
             <source-path path-element="${mobilecomponents.dir}/src"/>
-            <library-path/>
+        	<library-path/>
             <external-library-path dir="${basedir}/libs">
                 <include name="air/airglobal.swc"/>
                 <include name="framework.swc"/>
@@ -385,7 +413,7 @@
             <source-path path-element="${framework.dir}/bundles/${locale}"/>
             <source-path path-element="${framework.dir}/src"/>
             <external-library-path dir="${basedir}/libs/player/${playerglobal.version}"
includes="playerglobal.swc"/>
-            <library-path/>
+        	<library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>
@@ -399,7 +427,7 @@
             <namespace uri="http://www.adobe.com/2006/mxml" manifest="${mx.dir}/manifest.xml"/>
             <include-namespaces uri="library://ns.adobe.com/flex/mx"/>
             <source-path path-element="${mx.dir}/src"/>
-            <library-path />
+        	<library-path />
             <external-library-path dir="${basedir}/libs">
                 <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
@@ -427,7 +455,7 @@
                 <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
             </external-library-path>
-            <library-path/>
+        	<library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>   
@@ -437,7 +465,7 @@
         <compc static-link-runtime-shared-libraries="true" fork="true" locale="" accessible="true"
             include-classes="RPCClasses" output="${basedir}/libs/rpc.swc"
             resource-bundle-list="${rpc.dir}/bundles.properties">
-           <namespace uri="library://ns.adobe.com/flex/mx" manifest="${rpc.dir}/manifest.xml"/>
+ 			<namespace uri="library://ns.adobe.com/flex/mx" manifest="${rpc.dir}/manifest.xml"/>
             <include-file name="version.properties" path="${basedir}/version.properties"/>
             <include-namespaces uri="library://ns.adobe.com/flex/mx"/>
             <source-path path-element="${rpc.dir}/src"/>
@@ -467,7 +495,7 @@
             <source-path path-element="${framework.dir}/bundles/${locale}"/>
             <source-path path-element="${framework.dir}/src"/>
             <external-library-path dir="${basedir}/libs/player/${playerglobal.version}"
includes="playerglobal.swc"/>
-            <library-path/>
+        	<library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>
@@ -479,7 +507,7 @@
             <namespace uri="library://ns.adobe.com/flex/spark" manifest="${spark.dir}/manifest.xml"/>
             <include-namespaces uri="library://ns.adobe.com/flex/spark"/>
             <source-path path-element="${spark.dir}/src"/>
-            <library-path />
+        	<library-path />
             <external-library-path dir="${basedir}/libs">
                 <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
@@ -502,7 +530,7 @@
             <namespace uri="library://ns.adobe.com/flex/spark" manifest="${spark_dmv.dir}/manifest_spark_dmv.xml"/>
             <include-namespaces uri="library://ns.adobe.com/flex/spark"/>
             <source-path path-element="${spark_dmv.dir}/src"/>
-            <library-path />
+        	<library-path />
             <external-library-path dir="${basedir}/libs">
                 <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
@@ -529,9 +557,9 @@
             <source-path path-element="${spark.dir}/src"/>
             <source-path path-element="${framework.dir}/src"/>
             <include-libraries/>
-            <library-path/>
-           <external-library-path dir="${basedir}/libs/player/${playerglobal.version}"
includes="playerglobal.swc"/>
-               <jvmarg line="${compc.jvm.args}"/>
+        	<library-path/>
+			<external-library-path dir="${basedir}/libs/player/${playerglobal.version}" includes="playerglobal.swc"/>
+			<jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>
     
@@ -540,8 +568,8 @@
             include-classes="SparkSkinsClasses"
             output="${basedir}/libs/sparkskins.swc"
             resource-bundle-list="${core.dir}/bundles.properties">
-             <source-path path-element="${sparkskin.dir}/src"/>
-            <library-path/>
+            <source-path path-element="${sparkskin.dir}/src"/>
+        	<library-path/>
             <external-library-path dir="${basedir}/libs">
                 <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
@@ -560,7 +588,7 @@
             resource-bundle-list="${authoringsupport.dir}/bundles.properties">
             <source-path path-element="${authoringsupport.dir}/src"/>
             <library-path dir="${authoringsupport.dir}/libs">
-                <include name="FlexContentHolderThumbnail.swc"/>
+ 			<include name="FlexContentHolderThumbnail.swc"/>
             </library-path>
             <external-library-path dir="${basedir}/libs">
                 <include name="player/${playerglobal.version}/playerglobal.swc"/>
@@ -581,7 +609,7 @@
             output="${basedir}/themes/Halo/halo.swc" locale="" accessible="true"
             resource-bundle-list="${halo.dir}/bundles.properties">            
             <source-path/>
-            <library-path/>
+        	<library-path/>
             <external-library-path dir="${basedir}/libs">
                 <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
@@ -597,8 +625,8 @@
         <compc static-link-runtime-shared-libraries="true"  fork="true" include-classes="MobileThemeClasses"

             output="${basedir}/themes/Mobile/mobile.swc" locale="" accessible="true"
             resource-bundle-list="${mobiletheme.dir}/bundles.properties">            
-            <source-path path-element="${mobiletheme.dir}/src"/>
-            <library-path/>
+            <source-path path-element="${mobiletheme.dir}/src"/>         
+        	<library-path/>
             <external-library-path dir="${basedir}/libs">
                 <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="mobile/mobilecomponents.swc"/>
@@ -618,7 +646,7 @@
             resource-bundle-list="${wireframe.dir}/bundles.properties">
             <include-classes>WireframeClasses</include-classes>
             <source-path path-element="${wireframe.dir}/src"/>
-            <library-path/>
+        	<library-path/>
             <external-library-path dir="${basedir}/libs">
                 <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
@@ -675,13 +703,59 @@
     </target>
         
     <!-- playerglobal.swc -->
-    <!-- Because this requires a network connection it copies playglobal.swc only if it
doesn't already exist. -->
-    <target name="playerglobal-download" depends="playerglobal-check" unless="playerglobal.swc.present"
description="Copies playerglobal.swc from the Adobe website">
-        <mkdir dir="${basedir}/libs/player/${playerglobal.version}"/>
-        <get src="http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/playerglobal11_0.swc"

+    <!-- Because this requires a network connection it copies playglobal.swc only if it
doesn't already exist. -->	
+	<target name="playerglobal-download" depends="playerglobal-check,playerglobal-settarget,playerglobal.failure,playerglobal10.3-download,playerglobal11.0-download,playerglobal11.1-download"
description="Copies playerglobal.swc from the Adobe website">
+    </target>
+	
+	<target name="playerglobal-settarget" unless="playerglobal.swc.present">
+		<condition property="target10.2">
+			<equals arg1="${playerglobal.version}" arg2="10.2" />
+		</condition>
+		<condition property="target10.3">
+			<equals arg1="${playerglobal.version}" arg2="10.3" />
+		</condition>
+		<condition property="target11.0">
+			<equals arg1="${playerglobal.version}" arg2="11.0" />
+		</condition>
+		<condition property="target11.1">
+			<equals arg1="${playerglobal.version}" arg2="11.1" />
+		</condition>
+		<condition property="target11.2">
+			<equals arg1="${playerglobal.version}" arg2="11.2" />
+		</condition>
+	 </target>
+	
+	<target name="playerglobal.failure" if="target10.2">
+		<fail message="There's no public download link for the Flash Player 10.2 playerglobal.swc.
You will need to find your own copy." />
+	</target>
+		
+    <target name="playerglobal10.3-download" if="target10.3">
+    	<mkdir dir="${basedir}/libs/player/${playerglobal.version}"/>
+        <get src="http://fpdownload.macromedia.com/pub/flashplayer/updaters/10/playerglobal10_3.swc"

             dest="${basedir}/libs/player/${playerglobal.version}/playerglobal.swc" 
             verbose="false"/>
     </target>
+	
+    <target name="playerglobal11.0-download" if="target11.0">
+    	<mkdir dir="${basedir}/libs/player/${playerglobal.version}"/>
+        <get src="http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/playerglobal11_0.swc"

+            dest="${basedir}/libs/player/${playerglobal.version}/playerglobal.swc" 
+            verbose="false"/>
+    </target> 
+	
+    <target name="playerglobal11.1-download" if="target11.1">
+    	<mkdir dir="${basedir}/libs/player/${playerglobal.version}"/>
+        <get src="http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/playerglobal11_0.swc"

+            dest="${basedir}/libs/player/${playerglobal.version}/playerglobal.swc" 
+            verbose="false"/>
+    </target> 
+
+    <target name="playerglobal11.2-download" if="target11.2">
+    	<mkdir dir="${basedir}/libs/player/${playerglobal.version}"/>
+        <get src="http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11-2/flashplayer11-2_p5_playerglobal_013112.swc"

+            dest="${basedir}/libs/player/${playerglobal.version}/playerglobal.swc" 
+            verbose="false"/>
+    </target> 
 
     <!-- osmf.swc (Version 1.0) -->
     <!-- Because this requires a network connection it downloads OSMF only if it doesn't
already exist. -->

Copied: incubator/flex/branches/patches/flex-config.template.xml (from r1293502, incubator/flex/branches/patches/flex-config.xml)
URL: http://svn.apache.org/viewvc/incubator/flex/branches/patches/flex-config.template.xml?p2=incubator/flex/branches/patches/flex-config.template.xml&p1=incubator/flex/branches/patches/flex-config.xml&r1=1293502&r2=1293524&rev=1293524&view=diff
==============================================================================
--- incubator/flex/branches/patches/flex-config.xml (original)
+++ incubator/flex/branches/patches/flex-config.template.xml Sat Feb 25 02:34:29 2012
@@ -19,10 +19,10 @@
 
 <flex-config>
     <!-- Specifies the minimum player version that will run the compiled SWF. -->
-   <target-player>11.1</target-player>
+   <target-player>@playerversion@</target-player>
 
     <!-- Specifies the version of the compiled SWF -->
-    <swf-version>14</swf-version>
+    <swf-version>@swfversion@</swf-version>
 
    <compiler>
 



Mime
View raw message