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 2012/07/23 16:40:13 UTC

svn commit: r1364652 - in /incubator/flex/trunk/frameworks: projects/advancedgrids/ projects/airframework/ projects/airspark/ projects/core/ projects/flash-integration/ projects/framework/ projects/halo/ projects/mobilecomponents/ projects/mx/ projects...

Author: jmclean
Date: Mon Jul 23 14:40:12 2012
New Revision: 1364652

URL: http://svn.apache.org/viewvc?rev=1364652&view=rev
Log:
Removed hard coded Flash Player version

Modified:
    incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml
    incubator/flex/trunk/frameworks/projects/airframework/build.xml
    incubator/flex/trunk/frameworks/projects/airspark/build.xml
    incubator/flex/trunk/frameworks/projects/core/build.xml
    incubator/flex/trunk/frameworks/projects/flash-integration/build.xml
    incubator/flex/trunk/frameworks/projects/framework/build.xml
    incubator/flex/trunk/frameworks/projects/halo/build.xml
    incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml
    incubator/flex/trunk/frameworks/projects/mx/build.xml
    incubator/flex/trunk/frameworks/projects/playerglobal/build.xml
    incubator/flex/trunk/frameworks/projects/rpc/build.xml
    incubator/flex/trunk/frameworks/projects/sparkskins/build.xml
    incubator/flex/trunk/frameworks/projects/textLayout/build.xml
    incubator/flex/trunk/frameworks/projects/wireframe/build.xml
    incubator/flex/trunk/frameworks/themes/AeonGraphical/build.xml

Modified: incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml Mon Jul 23 14:40:12 2012
@@ -37,7 +37,7 @@
 				<compc fork="true"
 					output="${FLEX_HOME}/frameworks/locale/@{locale}/advancedgrids_rb.swc"
 					locale="@{locale}">
-					<target-player>11.1</target-player>
+					<target-player>${playerglobal.version}</target-player>
 					<jvmarg line="${compc.jvm.args}"/>
 					<include-resource-bundles bundle="datamanagement"/>
 					<include-resource-bundles bundle="olap"/>

Modified: incubator/flex/trunk/frameworks/projects/airframework/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/airframework/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airframework/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/airframework/build.xml Mon Jul 23 14:40:12 2012
@@ -40,7 +40,7 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/locale/@{locale}/airframework_rb.swc"
 			   locale="@{locale}">
-			<target-player>11.1</target-player>
+			<target-player>${playerglobal.version}</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<include-resource-bundles bundle="SharedResources"/>
 			<include-resource-bundles bundle="aircontrols"/>
@@ -200,7 +200,7 @@
 			   output="${FLEX_HOME}/frameworks/projects/airframework/assets/ComputerIcon.swf"
 			   >
 			<jvmarg line="${compc.jvm.args}"/>
-			<target-player>11.1</target-player>
+			<target-player>${playerglobal.version}</target-player>
 		</mxmlc>
     </target>
     
@@ -227,7 +227,7 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/libs/air/airframework.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
-		    <target-player>11.1</target-player>
+		    <target-player>${playerglobal.version}</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<namespace uri="library://ns.adobe.com/flex/mx" manifest="${basedir}/manifest.xml"/>
 			<include-namespaces uri="library://ns.adobe.com/flex/mx"/>

Modified: incubator/flex/trunk/frameworks/projects/airspark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/airspark/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airspark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/airspark/build.xml Mon Jul 23 14:40:12 2012
@@ -41,7 +41,7 @@
                 <compc fork="true"
                        output="${FLEX_HOME}/frameworks/locale/@{locale}/airspark_rb.swc"
                        locale="@{locale}">
-                    <target-player>11.1</target-player>
+                    <target-player>${playerglobal.version}</target-player>
                     <jvmarg line="${compc.jvm.args}"/>
                     <include-resource-bundles bundle="core"/>
                     <include-namespaces/>
@@ -195,7 +195,7 @@
         <compc fork="true"
                output="${FLEX_HOME}/frameworks/libs/air/airspark.swc"
                resource-bundle-list="${basedir}/bundles.properties">
-            <target-player>11.1</target-player>
+            <target-player>${playerglobal.version}</target-player>
             <jvmarg line="${compc.jvm.args}"/>
             <namespace uri="library://ns.adobe.com/flex/spark" manifest="${basedir}/manifest.xml"/>
             <include-namespaces uri="library://ns.adobe.com/flex/spark"/>

Modified: incubator/flex/trunk/frameworks/projects/core/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/core/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/core/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/core/build.xml Mon Jul 23 14:40:12 2012
@@ -64,7 +64,7 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/libs/core.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
-            <target-player>11.1</target-player>
+            <target-player>${playerglobal.version}</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<include-classes>CoreClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>

Modified: incubator/flex/trunk/frameworks/projects/flash-integration/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/flash-integration/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/flash-integration/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/flash-integration/build.xml Mon Jul 23 14:40:12 2012
@@ -41,7 +41,7 @@
 				<compc fork="true"
 					output="${FLEX_HOME}/frameworks/locale/@{locale}/flash-integration_rb.swc"
 					locale="@{locale}">
-					<target-player>11.1</target-player>
+					<target-player>${playerglobal.version}</target-player>
 					<jvmarg line="${compc.jvm.args}"/>
 					<include-resource-bundles bundle="empty"/>
 					<include-namespaces/>

Modified: incubator/flex/trunk/frameworks/projects/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/framework/build.xml Mon Jul 23 14:40:12 2012
@@ -41,7 +41,7 @@
 				   output="${FLEX_HOME}/frameworks/locale/@{locale}/framework_rb.swc"
 				   locale="@{locale}">
 				<jvmarg line="${compc.jvm.args}"/>
-				<target-player>11.1</target-player>
+				<target-player>${playerglobal.version}</target-player>
 				<include-resource-bundles bundle="SharedResources"/>
 				<include-resource-bundles bundle="collections"/>
 				<include-resource-bundles bundle="controls"/>
@@ -238,7 +238,7 @@
 			   output="${FLEX_HOME}/frameworks/projects/framework/assets/Assets.swf"
 			   >
 			<jvmarg line="${compc.jvm.args}"/>
-			<target-player>11.1</target-player>
+			<target-player>${playerglobal.version}</target-player>
 			<library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="${playerglobal.version}/playerglobal.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/halo/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/halo/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/halo/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/halo/build.xml Mon Jul 23 14:40:12 2012
@@ -58,7 +58,7 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/themes/Halo/halo.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
-            <target-player>11.1</target-player>
+            <target-player>${playerglobal.version}</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">

Modified: incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml Mon Jul 23 14:40:12 2012
@@ -186,7 +186,7 @@
         <compc fork="true" include-classes="MobileComponentsClasses spark.transitions.FlipViewTransitionMode spark.transitions.ZoomViewTransitionMode"
                output="${FLEX_HOME}/frameworks/libs/mobile/mobilecomponents.swc"
                resource-bundle-list="${basedir}/bundles.properties">
-            <target-player>11.1</target-player>
+            <target-player>${playerglobal.version}</target-player>
             <jvmarg line="${compc.jvm.args}"/>
             <namespace uri="library://ns.adobe.com/flex/spark" manifest="${basedir}/manifest.xml"/>
             <include-namespaces uri="library://ns.adobe.com/flex/spark"/>

Modified: incubator/flex/trunk/frameworks/projects/mx/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mx/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mx/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mx/build.xml Mon Jul 23 14:40:12 2012
@@ -41,7 +41,7 @@
 				   output="${FLEX_HOME}/frameworks/locale/@{locale}/mx_rb.swc"
 				   locale="@{locale}">
 				<jvmarg line="${compc.jvm.args}"/>
-				<target-player>11.1</target-player>
+				<target-player>${playerglobal.version}</target-player>
 				<include-resource-bundles bundle="containers"/>
 				<include-namespaces/>
 				<include-classes/>
@@ -188,7 +188,7 @@
 			   output="${FLEX_HOME}/frameworks/libs/mx/mx.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
 			<jvmarg line="${compc.jvm.args}"/>
-			<target-player>11.1</target-player>
+			<target-player>${playerglobal.version}</target-player>
 			<namespace uri="library://ns.adobe.com/flex/mx" manifest="${basedir}/manifest.xml"/>
 			<namespace uri="http://www.adobe.com/2006/mxml" manifest="${basedir}/manifest.xml"/>
 			<include-namespaces uri="library://ns.adobe.com/flex/mx"/>

Modified: incubator/flex/trunk/frameworks/projects/playerglobal/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/playerglobal/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/playerglobal/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/playerglobal/build.xml Mon Jul 23 14:40:12 2012
@@ -36,7 +36,7 @@
 				<compc fork="true" output="${FLEX_HOME}/frameworks/locale/@{locale}/playerglobal_rb.swc"
 					locale="@{locale}">
 					<jvmarg line="${compc.jvm.args}"/>
-					<target-player>11.1</target-player>
+					<target-player>${playerglobal.version}</target-player>
 					<include-resource-bundles bundle="empty"/>
 					<include-namespaces/>
 					<include-classes>Empty</include-classes>
@@ -107,7 +107,7 @@
         <compc fork="true" output="${FLEX_HOME}/frameworks/locale/${locale}/playerglobal_rb.swc"
             locale="${locale}">
             <jvmarg line="${compc.jvm.args}"/>
-            <target-player>11.1</target-player>
+            <target-player>${playerglobal.version}</target-player>
             <include-resource-bundles bundle="empty"/>
             <include-namespaces/>
             <include-classes>Empty</include-classes>

Modified: incubator/flex/trunk/frameworks/projects/rpc/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/rpc/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/rpc/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/rpc/build.xml Mon Jul 23 14:40:12 2012
@@ -39,7 +39,7 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/locale/@{locale}/rpc_rb.swc"
 			   locale="@{locale}">
-            <target-player>11.1</target-player>
+            <target-player>${playerglobal.version}</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<include-resource-bundles bundle="collections"/>
 			<include-resource-bundles bundle="core"/>
@@ -195,7 +195,7 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/libs/rpc.swc"
                resource-bundle-list="${basedir}/bundles.properties">
-            <target-player>11.1</target-player>
+            <target-player>${playerglobal.version}</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<namespace uri="library://ns.adobe.com/flex/mx" manifest="${basedir}/manifest.xml"/>
 			<include-file name="version.properties" path="${FLEX_HOME}/frameworks/version.properties"/>

Modified: incubator/flex/trunk/frameworks/projects/sparkskins/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/sparkskins/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/sparkskins/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/sparkskins/build.xml Mon Jul 23 14:40:12 2012
@@ -61,7 +61,7 @@
 		<compc fork="true" 
 			   output="${FLEX_HOME}/frameworks/libs/sparkskins.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
-            <target-player>11.1</target-player>
+            <target-player>${playerglobal.version}</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<include-classes>SparkSkinsClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>

Modified: incubator/flex/trunk/frameworks/projects/textLayout/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/textLayout/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/textLayout/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/textLayout/build.xml Mon Jul 23 14:40:12 2012
@@ -48,7 +48,7 @@
 				   output="${FLEX_HOME}/frameworks/locale/@{locale}/textLayout_rb.swc"
 				   locale="@{locale}">
 				<jvmarg line="${compc.jvm.args}"/>
-				<target-player>11.1</target-player>
+				<target-player>${playerglobal.version}</target-player>
 				<include-resource-bundles bundle="textLayout"/>
 				<include-namespaces/>
 				<include-classes/>

Modified: incubator/flex/trunk/frameworks/projects/wireframe/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/wireframe/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/wireframe/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/wireframe/build.xml Mon Jul 23 14:40:12 2012
@@ -61,7 +61,7 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/themes/Wireframe/wireframe.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
-            <target-player>11.1</target-player>
+            <target-player>${playerglobal.version}</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<include-classes>WireframeClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>

Modified: incubator/flex/trunk/frameworks/themes/AeonGraphical/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/themes/AeonGraphical/build.xml?rev=1364652&r1=1364651&r2=1364652&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/themes/AeonGraphical/build.xml (original)
+++ incubator/flex/trunk/frameworks/themes/AeonGraphical/build.xml Mon Jul 23 14:40:12 2012
@@ -38,8 +38,6 @@
 
     <property name="debug" value="true"/>
     <property name="strict" value="true"/>
-    <property name="javac.src" value="1.5"/>
-    <property name="target.player" value="11.1"/>
     
     <target name="main" description="Full build">
         <!-- load the <mxmlc> task; we can't do this at the <project> level -->