incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1335899 [1/2] - in /incubator/flex/trunk: ./ frameworks/ frameworks/projects/advancedgrids/ frameworks/projects/airframework/ frameworks/projects/airspark/ frameworks/projects/authoringsupport/ frameworks/projects/automation/ frameworks/pr...
Date Wed, 09 May 2012 02:16:38 GMT
Author: cframpton
Date: Wed May  9 02:16:36 2012
New Revision: 1335899

URL: http://svn.apache.org/viewvc?rev=1335899&view=rev
Log:
Clean up the mess I made yesterday with PLAYERGLOBAL/PLAYERGLOBAL_HOME.  It turns out that playerglobal.swc and airglobal.swc are magic strings in the compiler and swfs don't run if the swcs don't have these names. Since the playerglobal swc must be named playerglobal.swc we're back to PLAYERGLOBAL_HOME which should point to the directory which contains playerglobal.swc.  Also fix build_framework.xml so it work with these changes.

Added:
    incubator/flex/trunk/env-template.properties
      - copied, changed from r1335875, incubator/flex/trunk/env.properties
Removed:
    incubator/flex/trunk/env.properties
Modified:
    incubator/flex/trunk/README
    incubator/flex/trunk/build.xml
    incubator/flex/trunk/frameworks/   (props changed)
    incubator/flex/trunk/frameworks/build_framework.xml
    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/authoringsupport/build.xml
    incubator/flex/trunk/frameworks/projects/automation/build.xml
    incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml
    incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml
    incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml
    incubator/flex/trunk/frameworks/projects/automation_spark/build.xml
    incubator/flex/trunk/frameworks/projects/charts/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/mobiletheme/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/spark/build.xml
    incubator/flex/trunk/frameworks/projects/spark_dmv/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/modules/compiler/src/java/flex2/compiler/common/CompilerConfiguration.java
    incubator/flex/trunk/mustella/build.xml

Modified: incubator/flex/trunk/README
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/README?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/README (original)
+++ incubator/flex/trunk/README Wed May  9 02:16:36 2012
@@ -67,10 +67,6 @@ Install Prerequisites
     used by checkintests and other pieces of the test subsystem to run compiled
     applications.
     
-    Rather than defining environment variables for PLAYERGLOBAL, AIR_HOME and 
-    FLASHPLAYER_DEBUGGER, these properties may be set in env.properties located in the 
-    top-level directory.  If both are set, the environment variables take precedence.
-
     ==================================================================================
     SOFTWARE                                    ENVIRONMENT VARIABLE (absolute paths)
     ==================================================================================
@@ -84,18 +80,20 @@ Install Prerequisites
     or other unix-like shell
     (if Windows)
     
-    Adobe Flash Player                          PLAYERGLOBAL
+    Adobe Flash Player                          PLAYERGLOBAL_HOME
     (rename playerglobal swc to 
-    playerglobal.swc and point to this file)
+    playerglobal.swc and set to absolute  
+    path of directory containing 
+    playerglobal.swc file) 
     
     Adobe AIR Integration Kit                   AIR_HOME 
-    (unzip and point to 'AIR Integration Kit' 
-    directory)
+    (unzip and set to absolute path of 
+    'AIR Integration Kit' directory)
     
     Adobe Flash Player Content Debugger         FLASHPLAYER_DEBUGGER
-    (windows) point to FlashPlayerDebugger.exe
-    (mac) point to Flash Player Debugger in Flash Player Debugger.app/Contents/MacOS
-    (linux) point to flashplayerdebugger
+    (windows) absolute path of FlashPlayerDebugger.exe
+    (mac) absolute path of Flash Player Debugger.app/Contents/MacOS/Flash Player Debugger
+    (linux) absolute path of flashplayerdebugger
     
     ==================================================================================
 

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Wed May  9 02:16:36 2012
@@ -35,7 +35,7 @@
     <property file="${FLEX_HOME}/env.properties"/>
     <property file="${FLEX_HOME}/local.properties"/>
     <property file="${FLEX_HOME}/build.properties"/>
-    
+
     <property name="debug" value="true"/>
     <property name="strict" value="true"/>
     <property name="javac.src" value="1.5"/>
@@ -56,7 +56,7 @@
         Each of the main targets for the modules will call clean themselves before proceeding.
     -->
 
-    <target name="main" depends="pre-build,modules,frameworks,frameworks-rsls,sample-themes,post-build" description="Full build">
+    <target name="main" depends="pre-build,modules,frameworks,sample-themes,post-build" description="Full build">
         <tstamp>
             <format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa" />
         </tstamp>
@@ -74,7 +74,7 @@
         description="Packages the source release kit which is the official Apache release."/>
         
     <target name="binary-release" 
-        depends="main,checkintests,doc,other.locales,binary-distro,doc-packages,additional-packages" 
+        depends="main,frameworks-rsls,checkintests,doc,other.locales,binary-distro,doc-packages,additional-packages" 
         description="Builds and packages the binary kit which is provided as a convenience."/>    
 
     <target name="doc-packages" 
@@ -100,18 +100,33 @@
 
     <target name="pre-build" depends="check-compile-env,create-description,thirdparty-downloads" description="stuff that needs to be done before any builds" />
 
-    <target name="check-compile-env" 
-        description="Check for the required environment variables for compilation">
-        <condition property="PLAYERGLOBAL.notset">
-            <equals arg1="${env.PLAYERGLOBAL}" arg2="must_set_environment_variable_PLAYERGLOBAL" casesensitive="true"/>
-        </condition>
-        <fail message="PLAYERGLOBAL environment variable is not set" if="PLAYERGLOBAL.notset"/>
-        <condition property="AIR_HOME.notset">
-            <equals arg1="${env.AIR_HOME}" arg2="must_set_environment_variable_AIR_HOME" casesensitive="true"/>
+    <target name="check-compile-env" depends="check-playerglobal-home,check-air-home"
+        description="Check for the required environment variables for compilation"/>
+
+    <target name="check-playerglobal-home"
+        description="Check PLAYERGLOBAL for both a directory and a swc file">
+
+        <available file="${env.PLAYERGLOBAL_HOME}/playerglobal.swc" type="file" 
+            property="PLAYERGLOBAL_HOME.set"/>
+        
+        <fail message="The environemnt variable PLAYERGLOBAL_HOME must be set to a valid directory that contains playerglobal.swc" 
+            unless="PLAYERGLOBAL_HOME.set"/>
+    </target>
+    
+    <target name="check-air-home"
+        description="Check that AIR_HOME is a directory">
+        
+        <condition property="AIR_HOME.set">
+            <and>
+                <length string="${env.AIR_HOME}" when="greater" length="0" />
+                <available file="${env.AIR_HOME}" type="dir"/>
+            </and>
         </condition>
-        <fail message="AIR_HOME environment variable is not set" if="AIR_HOME.notset"/>
+        
+        <fail message="The environment variable AIR_HOME must be set to the AIR Integration Kit directory" 
+            unless="AIR_HOME.set"/>
     </target>
-
+    
     <!-- ToDo: automate setting the build number for non-dev builds. -->
     <target name="create-description">
         <echo file="${basedir}/flex-sdk-description.xml">&lt;?xml version="1.0"?&gt;
@@ -355,6 +370,7 @@
                 <include name="flex-sdk-description.xml"/>
                 <include name="KEYS"/>
                 <include name="CHANGES"/>
+                <include name="DISCLAIMER"/>
                 <include name="LICENSE"/>
                 <include name="NOTICE"/>
                 <include name="README"/>
@@ -466,7 +482,7 @@
         <!-- delete file from source distro that are not in binary distro -->
 
         <delete dir="${basedir}/temp/">
-            <include name="build.properties"/>
+            <include name="*.properties"/>
             <include name="**/build.xml"/>
             <exclude name="asdoc/build.xml"/>
         </delete>
@@ -493,9 +509,6 @@
             <include name="**/src/**"/>
         </delete>
         
-        <!-- there are no compiler sources in the bin kit -->
-        <!--delete dir="${basedir}/temp/modules"/-->
-        
         <!-- delete any left-over empty directories -->
         <delete includeemptydirs="true">
             <fileset dir="${basedir}/temp/frameworks">
@@ -508,8 +521,6 @@
 
         <!-- these files are in addition to the remaining source files -->
         
-        <!--copy file="${basedir}/flex-sdk-description.xml" todir="${basedir}/temp"/-->
-
         <!-- concat the license file with the binary license file for the 3rd party deps -->
         <concat destfile="${basedir}/temp/LICENSE">
             <filelist dir="${FLEX_HOME}" files="LICENSE,LICENSE.bin"/>
@@ -577,7 +588,6 @@
                 <include name="charts.swc"/>
                 <include name="advancedgrids.swc"/>
                 <include name="spark_dmv.swc"/>
-                <include name="${env.FLASHPLAYER_HOME}/playerglobal.swc"/>
             </fileset>
         </copy>
 
@@ -1038,22 +1048,18 @@
         <javac srcdir="mustella" includes="MustellaResultsParser.java"/>
     </target>
 
-    <target name="check-runtime-env" 
+    <!-- To run the checkintests as well as any mustella tests need AIR for the adl and
+         a flash player content debugger.
+    -->
+    <target name="check-runtime-env" depends="check-air-home"
         description="Check for the required runtime environment variables for the checkintests">
         
-        <!-- for adl -->
-        <condition property="AIR_HOME.notset">
-            <equals arg1="${env.AIR_HOME}" arg2="must_set_environment_variable_AIR_HOME" casesensitive="true"/>
-        </condition>
-        <fail message="AIR_HOME environment variable is not set" if="ANT_HOME.notset"/>
-        <!-- for the flashplayer content debugger -->
-        <condition property="FLASHPLAYER_DEBUGGER.notset">
-            <equals arg1="${env.FLASHPLAYER_DEBUGGER}" arg2="must_set_environment_variable_FLASHPLAYER_DEBUGGER" casesensitive="true"/>
-        </condition>
-        <fail message="FLASHPLAYER_DEBUGGER environment variable is not set" if="FLASHPLAYER_DEBUGGER.notset"/>
+        <available file="${env.FLASHPLAYER_DEBUGGER}" property="FLASHPLAYER_DEBUGGER.set"/>
+        <fail message="FLASHPLAYER_DEBUGGER is ${env.FLASHPLAYER_DEBUGGER} which is not an Adobe Flash Player content debugger" 
+            unless="FLASHPLAYER_DEBUGGER.set"/>
     </target>
     
-    <target name="runtime-setup" depends="check-runtime-env" 
+    <target name="runtime-setup" depends="check-runtime-env" unless="runtime.setup"
         description="Set flash.player and adl properties"> 
         
         <!-- Paths to the debug standalone flashplayer. -->
@@ -1072,9 +1078,11 @@
         <condition property="adl" value="${env.AIR_HOME}/bin/adl">
             <os family="unix"/>
         </condition>
+        
+        <property name="runtime.setup" value="done"/>
     </target>
 
-    <target name="load-task">
+    <target name="load-task" depends="runtime-setup">
         <!-- load the <mxmlc> task; we can't do this at the <project> level -->
         <!-- because targets that run before flexTasks.jar gets built would fail -->
         <taskdef resource="flexTasks.tasks" classpath="${basedir}/lib/flexTasks.jar"/>

Copied: incubator/flex/trunk/env-template.properties (from r1335875, incubator/flex/trunk/env.properties)
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/env-template.properties?p2=incubator/flex/trunk/env-template.properties&p1=incubator/flex/trunk/env.properties&r1=1335875&r2=1335899&rev=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/env.properties (original)
+++ incubator/flex/trunk/env-template.properties Wed May  9 02:16:36 2012
@@ -17,26 +17,33 @@
 ##
 ################################################################################
 
-# You need to either set the environment variables AIR_HOME and PLAYER_HOME or set
-# the properties here.  
-# The environment variables take precedence.
-# Use absolute file paths. 
+# If you chose to use this file rename it to env.properties and uncomment the
+# properties you wish to set.
+i
+# For each of
+#
+#   AIR_HOME
+#   FLASHPLAYER_DEBUGGER
+#   PLAYERGLOBAL_HOME
+#
+# you need to set an environment variable with that name or set the property here.
+# The environment variables take precedence. Use absolute file paths. 
 # See the README file for more information.
 
 #
 # Set this to the directory that contains the unzipped Adobe AIR Integration Kit
 # for the given platform.
 #
-env.AIR_HOME=must_set_environment_variable_AIR_HOME
+#env.AIR_HOME=
 
 #
 # Set this to file that contains the Adobe Flash Player content debugger
 # for your platform.  
 #
-env.FLASHPLAYER_DEBUGGER=must_set_environment_variable_FLASHPLAYER_DEBUGGER
+#env.FLASHPLAYER_DEBUGGER=
 
 #
-# Set this to the file that contains the Adobe Flash Player playerglobal.swc.
+# Set this to the directory that contains the Adobe Flash Player playerglobal.swc.
 #
-env.PLAYERGLOBAL=must_set_environment_variable_PLAYERGLOBAL
+#env.PLAYERGLOBAL_HOME=
 

Propchange: incubator/flex/trunk/frameworks/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May  9 02:16:36 2012
@@ -1 +1,2 @@
 libs
+rsls

Modified: incubator/flex/trunk/frameworks/build_framework.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build_framework.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build_framework.xml (original)
+++ incubator/flex/trunk/frameworks/build_framework.xml Wed May  9 02:16:36 2012
@@ -30,6 +30,10 @@
 
     <property name="FLEX_HOME" value="${basedir}/.."/>
     <property name="build.number" value="0"/>
+
+    <property environment="env"/>    
+    <property name="playerglobal.dir" value="${env.PLAYERGLOBAL_HOME}"/>
+    <property name="airsdk.dir" value="${env.AIR_HOME}"/>
     
     <property name="locale" value="en_US"/>
     <property name="projects.dir" value="${FLEX_HOME}/frameworks/projects"/>
@@ -56,14 +60,43 @@
     <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
 
 	<!-- This does not contain the automation jars but they could be added.  -->
-    <target name="main" depends="clean,thirdparty-downloads,prepare,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,bundles,themes,sparkskins,spark_dmv"/>
+    <target name="main" depends="check-compile-env,clean,thirdparty-downloads,prepare,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,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"/>
     
-    <target name="prepare" description="Copies manifests to project directories so the IDE can find them">
+    <target name="prepare"
+        description="Copies manifests to project directories so the IDE can find them">
+        
         <copy file="${FLEX_HOME}/frameworks/spark-manifest.xml" tofile="${FLEX_HOME}/frameworks/projects/spark/manifest.xml" overwrite="true"/>
     </target>
     
+    <target name="check-compile-env" depends="check-playerglobal-home,check-air-home"
+        description="Check for the required environment variables for compilation"/>
+
+    <target name="check-playerglobal-home"
+        description="Check PLAYERGLOBAL for both a directory and a swc file">
+
+        <available file="${env.PLAYERGLOBAL_HOME}/playerglobal.swc" type="file" 
+            property="PLAYERGLOBAL_HOME.set"/>
+        
+        <fail message="The environemnt variable PLAYERGLOBAL_HOME must be set to a valid directory that contains playerglobal.swc" 
+            unless="PLAYERGLOBAL_HOME.set"/>
+    </target>
+    
+    <target name="check-air-home"
+        description="Check that AIR_HOME is a directory">
+        
+        <condition property="AIR_HOME.set">
+            <and>
+                <length string="${env.AIR_HOME}" when="greater" length="0" />
+                <available file="${env.AIR_HOME}" type="dir"/>
+            </and>
+        </condition>
+        
+        <fail message="The environment variable AIR_HOME must be set to the AIR Integration Kit directory" 
+            unless="AIR_HOME.set"/>
+    </target>
+
     <target name="advancedgrids" description="Builds advancedgrids.swc">
         <compc static-link-runtime-shared-libraries="true" fork="true" locale="" 
             accessible="true" show-deprecation-warnings="false"
@@ -75,8 +108,8 @@
             <source-path path-element="${advancedgrids.dir}/src"/>
             <source-path path-element="${basedir}/projects/mx/src"/>
             <library-path/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
                 <include name="rpc.swc"/>
@@ -95,7 +128,7 @@
             <include-resource-bundles bundle="olap"/>
             <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"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
@@ -110,8 +143,10 @@
             <include-namespaces uri="library://ns.adobe.com/flex/mx"/>
             <source-path path-element="${airframework.dir}/src"/>
             <library-path/>
-            <external-library-path dir="${basedir}/libs">
+            <external-library-path dir="${airsdk.dir}/frameworks/libs">
                 <include name="air/airglobal.swc"/>
+            </external-library-path>
+            <external-library-path dir="${basedir}/libs">
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
                 <include name="textLayout.swc"/>
@@ -168,7 +203,7 @@
             <source-path path-element="${framework.dir}/src"/>
             <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"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
@@ -182,8 +217,10 @@
             <include-namespaces uri="library://ns.adobe.com/flex/spark"/>
             <source-path path-element="${airspark.dir}/src"/>
             <library-path/>
-            <external-library-path dir="${basedir}/libs">
+            <external-library-path dir="${airsdk.dir}/frameworks/libs">
                 <include name="air/airglobal.swc"/>
+            </external-library-path>
+            <external-library-path dir="${basedir}/libs">
                 <include name="air/airframework.swc"/>
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
@@ -202,7 +239,7 @@
             <include-resource-bundles bundle="core"/>
             <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"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
@@ -219,8 +256,8 @@
             <source-path path-element="${charts.dir}/src"/>
             <source-path path-element="${basedir}/projects/mx/src"/>
             <library-path/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="rpc.swc"/>
                 <include name="textLayout.swc"/>
@@ -239,7 +276,7 @@
             <include-resource-bundles bundle="charts"/>
             <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"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
@@ -253,8 +290,8 @@
             <source-path path-element="${framework.dir}/src"/>
             <load-config filename="${framework.dir}/framework-config.xml"/>
             <library-path/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="textLayout.swc"/>
                 <include name="osmf.swc"/>
             </external-library-path>
@@ -278,8 +315,8 @@
             <source-path path-element="${flash-integration.dir}/src"/>
             <load-config filename="${basedir}/projects/framework/framework-config.xml"/>
             <library-path/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="textLayout.swc"/>
                 <include name="framework.swc"/>
             </external-library-path>
@@ -296,8 +333,8 @@
             <namespace uri="http://www.adobe.com/2006/mxml" manifest="${framework.dir}/manifest.xml"/>
             <include-namespaces uri="library://ns.adobe.com/flex/mx"/>
             <source-path path-element="${framework.dir}/src"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="textLayout.swc"/>
                 <include name="osmf.swc"/>
             </external-library-path>
@@ -335,7 +372,7 @@
             <include-resource-bundles bundle="validators"/>
             <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"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
@@ -350,8 +387,10 @@
             <include-namespaces uri="library://ns.adobe.com/flex/spark"/>
             <source-path path-element="${mobilecomponents.dir}/src"/>
             <library-path/>
-            <external-library-path dir="${basedir}/libs">
+            <external-library-path dir="${airsdk.dir}/frameworks/libs">
                 <include name="air/airglobal.swc"/>
+            </external-library-path>
+            <external-library-path dir="${basedir}/libs">
                 <include name="framework.swc"/>
                 <include name="spark.swc"/>
                 <include name="textLayout.swc"/>
@@ -367,7 +406,7 @@
             <include-resource-bundles bundle="core"/>
             <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"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
@@ -383,8 +422,8 @@
             <include-namespaces uri="library://ns.adobe.com/flex/mx"/>
             <source-path path-element="${mx.dir}/src"/>
             <library-path />
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="textLayout.swc"/>
             </external-library-path>
@@ -405,9 +444,8 @@
             <include-resource-bundles bundle="containers"/>
             <source-path path-element="${mx.dir}/bundles/${locale}"/>
             <source-path path-element="${mx.dir}/src"/>
-            <external-library-path dir="${basedir}/libs/player/${playerglobal.version}" includes="playerglobal.swc"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
             </external-library-path>
             <library-path/>
@@ -424,8 +462,8 @@
             <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"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="textLayout.swc"/>
                 <include name="osmf.swc"/>
@@ -449,7 +487,7 @@
             <source-path path-element="${rpc.dir}/bundles/${locale}"/>
             <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"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <library-path/>
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
@@ -463,8 +501,8 @@
             <include-namespaces uri="library://ns.adobe.com/flex/spark"/>
             <source-path path-element="${spark.dir}/src"/>
             <library-path />
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
                 <include name="textLayout.swc"/>
@@ -486,8 +524,8 @@
             <include-namespaces uri="library://ns.adobe.com/flex/spark"/>
             <source-path path-element="${spark_dmv.dir}/src"/>
             <library-path />
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
                 <include name="spark.swc"/>
@@ -513,8 +551,8 @@
             <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}"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>
     
@@ -525,8 +563,8 @@
             resource-bundle-list="${core.dir}/bundles.properties">
              <source-path path-element="${sparkskin.dir}/src"/>
             <library-path/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="spark.swc"/>
                 <include name="textLayout.swc"/>
@@ -545,8 +583,8 @@
             <library-path dir="${authoringsupport.dir}/libs">
                 <include name="FlexContentHolderThumbnail.swc"/>
             </library-path>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
                 <include name="flash-integration.swc"/>
@@ -565,8 +603,8 @@
             resource-bundle-list="${halo.dir}/bundles.properties">            
             <source-path/>
             <library-path/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
                 <include name="textLayout.swc"/>
@@ -582,8 +620,8 @@
             resource-bundle-list="${mobiletheme.dir}/bundles.properties">            
             <source-path path-element="${mobiletheme.dir}/src"/>
             <library-path/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="mobile/mobilecomponents.swc"/>
                 <include name="framework.swc"/>
                 <include name="spark.swc"/>
@@ -602,8 +640,8 @@
             <include-classes>WireframeClasses</include-classes>
             <source-path path-element="${wireframe.dir}/src"/>
             <library-path/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
             <external-library-path dir="${basedir}/libs">
-                <include name="player/${playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="spark.swc"/>
                 <include name="airspark.swc"/>
@@ -622,17 +660,9 @@
     <!-- Download thirdparty code -->
     
     <target name="thirdparty-downloads" 
-        depends="airsdk-download,playerglobal-download, osmf-download, textLayout-download, swfobject-download" 
+        depends="osmf-download, textLayout-download, swfobject-download" 
         description="Copies third-party software into place for build" />
     
-    <target name="airsdk-check" description="Checks if the Air SDK has been downloaded.">
-        <available file="${basedir}/libs/air/airglobal.swc" property="airsdk.present"/>
-    </target>
-
-    <target name="playerglobal-check" description="Checks if the Adobe Air SDK has been downloaded.">
-        <available file="${basedir}/libs/player/${playerglobal.version}/playerglobal.swc" property="playerglobal.swc.present"/>
-    </target>
-    
     <target name="osmf-check" description="Checks if the Open Source Media Framework has been downloaded.">
         <available file="${basedir}/libs/osmf.swc" property="osmf.swc.present"/>
     </target>
@@ -645,31 +675,6 @@
         <available file="${basedir}/../templates/swfobject/swfobject.js" property="swfobject.js.present"/>
     </target>
     
-    <!-- Adobe AIR SDK  -->
-    <!-- Because this requires a network connection it is copied only if it doesn't already exist. -->
-    <!-- Regardless of platform use the win kit to get airglobal.swc. -->
-    
-    <target name="airsdk-download" depends="airsdk-check" unless="airsdk.present" description="Copies Adobe AIR SDK for the Mac from the Adobe website">
-        <echo message="Be patient.  This takes a few minutes..." />
-        <mkdir dir="${FLEX_HOME}/in/air/win"/>
-        <get src="http://airdownload.adobe.com/air/win/download/3.1/AdobeAIRSDK.zip" 
-            dest="${FLEX_HOME}/in/air/win/AIR Integration Kit.zip" 
-            verbose="false"/>
-        <unzip dest="${FLEX_HOME}/in/downloads/AIR Integration Kit" src="${FLEX_HOME}/in/air/win/AIR Integration Kit.zip" />
-        <copy file="${FLEX_HOME}/in/downloads/AIR Integration Kit/frameworks/libs/air/airglobal.swc" 
-            toDir="${basedir}/libs/air"/>
-        <delete dir="${FLEX_HOME}/in/downloads/AIR Integration Kit" failonerror="false"/>
-    </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" 
-            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. -->
     <!-- The swc at the top-level has lots of trace statements in it.  Use the one in the source zip. -->
@@ -720,8 +725,6 @@
     <target name="clean" depends="bundles-clean" description="Cleans all SWCs.">
         <delete failonerror="false">
             <fileset dir="${basedir}/libs">
-                <include name="air/airframework.swc"/>
-                <include name="air/airspark.swc"/>
                 <include name="mobile/mobilecomponents.swc"/>
                 <include name="spark_dmv.swc"/>
                 <include name="charts.swc"/>
@@ -766,7 +769,7 @@
         <delete failonerror="false" verbose="true">
             <fileset dir="${basedir}/libs" includes="osmf.swc,textLayout.swc"/>
             <fileset dir="${basedir}/libs/air"/>
-            <fileset dir="${basedir}/libs/player/${playerglobal.version}" includes="playerglobal.swc"/>
+            <fileset dir="${basedir}/libs/**/playerglobal.swc"/>
         </delete>
         <delete dir="${FLEX_HOME}/in/air" excludes="*.xml"/>
         <delete dir="${FLEX_HOME}/in/downloads"/>

Modified: incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml Wed May  9 02:16:36 2012
@@ -31,7 +31,6 @@
 		<attribute name="locale"/>
 			<sequential>
 				<echo message="Compiling frameworks/locale/@{locale}/advancedgrids_rb.swc"/>
-				<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 				<!-- Load the <compc> task. We can't do this at the <project> level -->
 				<!-- because targets that run before flexTasks.jar gets built would fail. -->
 				<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -48,7 +47,7 @@
 					<source-path path-element="${FLEX_HOME}/frameworks/projects/advancedgrids/src"/>
 					<include-libraries/>
 					<library-path/>
-					<external-library-path dir="${env.PLAYERGLOBAL}">
+					<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
 						<include name="playerglobal.swc"/>
 					</external-library-path>
 					<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -179,7 +178,6 @@
 	<target name="compile" description="Compiles advancedgrids.swc">
 		
 		<echo message="Compiling frameworks/libs/advancedgrids.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -205,7 +203,7 @@
 			<include-namespaces>library://ns.adobe.com/flex/mx</include-namespaces>
 			<source-path path-element="${basedir}/src"/>
 			<library-path />
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/airframework/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/airframework/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airframework/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/airframework/build.xml Wed May  9 02:16:36 2012
@@ -26,14 +26,13 @@
     <property environment="env"/>
     <property file="${FLEX_HOME}/env.properties"/>
     <property file="${FLEX_HOME}/build.properties"/>
-
+    
 	<property name="locale" value="en_US"/>
   	
 	<macrodef name="bundle">
 		<attribute name="locale"/>
 		<sequential>
 		<echo message="Compiling frameworks/locale/@{locale}/airframework_rb.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -60,7 +59,7 @@
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/mx/bundles/@{locale}"/>
 			<include-libraries/>
 			<library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/airspark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/airspark/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airspark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/airspark/build.xml Wed May  9 02:16:36 2012
@@ -26,14 +26,13 @@
     <property environment="env"/>
     <property file="${FLEX_HOME}/env.properties"/>
     <property file="${FLEX_HOME}/build.properties"/>
-    
+
     <property name="locale" value="en_US"/>
 
         <macrodef name="bundle">
             <attribute name="locale"/>
             <sequential>
                 <echo message="Compiling frameworks/locale/@{locale}/airspark_rb.swc"/>
-                <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
                 <!-- Load the <compc> task. We can't do this at the <project> level -->
                 <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -50,7 +49,7 @@
                     <source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/> 
                     <include-libraries/>
                     <library-path/>
-                    <external-library-path dir="${env.PLAYERGLOBAL}">
+                    <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                         <include name="playerglobal.swc"/>
                     </external-library-path>
                     <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml Wed May  9 02:16:36 2012
@@ -40,7 +40,6 @@
 
 	<target name="compile" description="Compiles authoringsupport.swc">
 		<echo message="Compiling frameworks/libs/authoringsupport.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -65,7 +64,7 @@
             <library-path dir="${basedir}/libs/">
 				<include name="FlexContentHolderThumbnail.swc"/>
 			</library-path>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -101,7 +100,7 @@
 		<asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" fork="true">
 		    <compiler.source-path path-element="${basedir}/src"/>
 		    <doc-classes class="AuthoringSupportClasses"/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
 		    <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/automation/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation/build.xml Wed May  9 02:16:36 2012
@@ -31,7 +31,6 @@
 		<attribute name="locale"/>
 		<sequential>
 			<echo message="Compiling frameworks/locale/@{locale}/automation_rb.swc"/>
-			<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 			<!-- Load the <compc> task. We can't do this at the <project> level -->
 			<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -48,7 +47,7 @@
 				<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/>
 				<include-libraries/>
 				<library-path/>
-                <external-library-path dir="${env.PLAYERGLOBAL}">
+                <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                     <include name="playerglobal.swc"/>
                 </external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -147,7 +146,6 @@
 	
 	<target name="compile" description="Compiles automation.swc">
 		<echo message="Compiling frameworks/libs/automation/automation.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -174,7 +172,7 @@
 			<include-classes>AutomationClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml Wed May  9 02:16:36 2012
@@ -32,7 +32,6 @@
 		<attribute name="locale"/>
 		<sequential>
 			<echo message="Compiling frameworks/locale/@{locale}/automation_airspark_rb.swc"/>
-			<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 			<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
 			<compc fork="true"
@@ -46,7 +45,7 @@
 				<source-path path-element="${basedir}/bundles/@{locale}"/>
 				<include-libraries/>
 				<library-path/>
-                <external-library-path dir="${env.PLAYERGLOBAL}">
+                <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                     <include name="playerglobal.swc"/>
                 </external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml Wed May  9 02:16:36 2012
@@ -33,7 +33,6 @@
 		
 	<target name="compile" description="Compiles automation_dmv.swc">
 		<echo message="Compiling frameworks/libs/automation/automation_dmv.swc"/>
-	    <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -60,7 +59,7 @@
 			<source-path path-element="${basedir}/src"/>
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/automation/src"/>
 			<library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml Wed May  9 02:16:36 2012
@@ -49,7 +49,6 @@
 
 	<target name="compile" description="Compiles automation_flashflexkit.swc">
 		<echo message="Compiling frameworks/libs/automation/automation_flashflexkit.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -74,7 +73,7 @@
 			<target-player>11.1</target-player>
 			<include-classes>AutomationFlashFlexKitClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/automation_spark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_spark/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_spark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_spark/build.xml Wed May  9 02:16:36 2012
@@ -33,7 +33,6 @@
 	
 	<target name="compile" description="Compiles automation_spark.swc">
 		<echo message="Compiling frameworks/libs/automation/automation_spark.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -60,7 +59,7 @@
 			<include-classes>AutomationSparkClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/charts/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/charts/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/charts/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/charts/build.xml Wed May  9 02:16:36 2012
@@ -31,7 +31,6 @@
         <attribute name="locale"/>
             <sequential>
                 <echo message="Compiling frameworks/locale/@{locale}/charts_rb.swc"/>
-                <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
                 <!-- Load the <compc> task. We can't do this at the <project> level -->
                 <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -52,7 +51,7 @@
                     <source-path path-element="${FLEX_HOME}/frameworks/projects/charts/src"/>
                     <include-libraries/>
                     <library-path/>
-                    <external-library-path dir="${env.PLAYERGLOBAL}">
+                    <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                         <include name="playerglobal.swc"/>
                     </external-library-path>
                     <external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -183,7 +182,6 @@
     <target name="compile" description="Compiles charts.swc">
         
         <echo message="Compiling frameworks/libs/charts.swc"/>
-        <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
         <!-- Load the <compc> task. We can't do this at the <project> level -->
         <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -209,7 +207,7 @@
             <include-namespaces>library://ns.adobe.com/flex/mx</include-namespaces>
             <source-path path-element="${basedir}/src"/>
             <library-path />
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/core/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/core/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/core/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/core/build.xml Wed May  9 02:16:36 2012
@@ -41,7 +41,6 @@
 
 	<target name="compile" description="Compiles core.swc">
 		<echo message="Compiling frameworks/libs/core.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -72,7 +71,7 @@
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/src"/>
             <load-config filename="${FLEX_HOME}/frameworks/projects/framework/framework-config.xml"/>
 			<library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">

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=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/flash-integration/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/flash-integration/build.xml Wed May  9 02:16:36 2012
@@ -33,7 +33,6 @@
 		<attribute name="locale"/>
 			<sequential>
 				<copy file="${basedir}/bundles/en_US/empty.properties" tofile="${basedir}/bundles/@{locale}/empty.properties"/>
-				<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 				<echo message="Compiling frameworks/locale/@{locale}/flash-integration_rb.swc"/>
 				<!-- Load the <compc> task. We can't do this at the <project> level -->
@@ -51,7 +50,7 @@
 					<source-path path-element="${FLEX_HOME}/frameworks/projects/flash-integration/src"/>
 					<include-libraries/>
 					<library-path/>
-                    <external-library-path dir="${env.PLAYERGLOBAL}">
+                    <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                         <include name="playerglobal.swc"/>
                     </external-library-path>
 					<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -119,7 +118,6 @@
 
 	<target name="compile" description="Compiles flash-integration.swc">
 		<echo message="Compiling frameworks/projects/flash-integration/libs/flash-integration.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -146,7 +144,7 @@
 			<source-path path-element="${basedir}/src"/>
             <load-config filename="${FLEX_HOME}/frameworks/projects/framework/framework-config.xml"/>
 			<library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -193,7 +191,7 @@
 				it just needs to be linked through a manifest file -->
 			<namespace uri="http://www.adobe.com/someNonSensicalURI" manifest="${basedir}/manifest.xml"/>
 			<doc-namespaces uri="http://www.adobe.com/someNonSensicalURI"/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
 		    <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/framework/build.xml Wed May  9 02:16:36 2012
@@ -33,7 +33,6 @@
 		<attribute name="locale"/>
 			<sequential>
 				<echo message="Compiling frameworks/locale/@{locale}/framework_rb.swc"/>
-				<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 			<!-- Load the <compc> task. We can't do this at the <project> level -->
 			<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -62,7 +61,7 @@
 				<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/src"/>
 				<include-libraries/>
 				<library-path/>
-				<external-library-path dir="${env.PLAYERGLOBAL}">
+				<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
 					<include name="playerglobal.swc"/>
 				</external-library-path>
 			</compc>
@@ -177,7 +176,6 @@
 	
 	<target name="compile" description="Compiles framework.swc">
 		<echo message="Compiling frameworks/libs/framework.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
 		<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -208,7 +206,7 @@
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
                 <include name="textLayout.swc"/>
 			</external-library-path>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
 			</external-library-path>
             <load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>

Modified: incubator/flex/trunk/frameworks/projects/halo/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/halo/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/halo/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/halo/build.xml Wed May  9 02:16:36 2012
@@ -41,7 +41,6 @@
 
 	<target name="compile" description="Compiles halo.swc">
 		<echo message="Compiling frameworks/themes/Halo/halo.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -62,7 +61,7 @@
             <target-player>11.1</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml Wed May  9 02:16:36 2012
@@ -33,7 +33,6 @@
             <attribute name="locale"/>
             <sequential>
                 <echo message="Compiling frameworks/locale/@{locale}/mobilecomponents_rb.swc"/>
-                <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
                 <!-- Load the <compc> task. We can't do this at the <project> level -->
                 <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -50,7 +49,7 @@
                     <source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/> 
                     <include-libraries/>
                     <library-path/>
-                    <external-library-path dir="${env.PLAYERGLOBAL}">
+                    <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                         <include name="playerglobal.swc"/>
                     </external-library-path>
                     <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml Wed May  9 02:16:36 2012
@@ -41,7 +41,6 @@
 
 	<target name="compile" description="Compiles mobile.swc">
 		<echo message="Compiling frameworks/themes/Mobile/mobile.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -67,7 +66,7 @@
 			<include-classes>MobileThemeClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -106,7 +105,7 @@
 		<asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" fork="true">
 			<compiler.source-path path-element="${basedir}/src"/>
 			<doc-classes class="MobileThemeClasses"/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/mx/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mx/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mx/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mx/build.xml Wed May  9 02:16:36 2012
@@ -33,7 +33,6 @@
 		<attribute name="locale"/>
 			<sequential>
 				<echo message="Compiling frameworks/locale/@{locale}/mx_rb.swc"/>
-				<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 			<!-- Load the <compc> task. We can't do this at the <project> level -->
 			<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -50,7 +49,7 @@
 				<source-path path-element="${FLEX_HOME}/frameworks/projects/mx/src"/>
 				<include-libraries/>
 				<library-path/>
-				<external-library-path dir="${env.PLAYERGLOBAL}">
+				<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
 					<include name="playerglobal.swc"/>
 				</external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -168,7 +167,6 @@
 	
 	<target name="compile" description="Compiles mx.swc">
 		<echo message="Compiling frameworks/libs/mx/mx.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -197,7 +195,7 @@
 			<include-classes>MxClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
-			<external-library-path dir="${env.PLAYERGLOBAL}">
+			<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/playerglobal/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/playerglobal/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/playerglobal/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/playerglobal/build.xml Wed May  9 02:16:36 2012
@@ -31,7 +31,6 @@
 		<attribute name="locale"/>
 			<sequential>
 				<echo message="Compiling frameworks/locale/@{locale}/playerglobal_rb.swc"/>
-				<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 				<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
 				<compc fork="true" output="${FLEX_HOME}/frameworks/locale/@{locale}/playerglobal_rb.swc"
@@ -45,7 +44,7 @@
 					<source-path path-element="${basedir}/src"/>
 					<include-libraries/>
 					<library-path/>
-                    <external-library-path dir="${env.PLAYERGLOBAL}">
+                    <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                         <include name="playerglobal.swc"/>
                     </external-library-path>
 					<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -103,7 +102,6 @@
     <!-- The targets below set the 'locale' parameter and call it with <antcall>. -->
     <target name="bundle">
         <echo message="Compiling frameworks/locale/${locale}/playerglobal_rb.swc"/>
-        <echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
         <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
         <compc fork="true" output="${FLEX_HOME}/frameworks/locale/${locale}/playerglobal_rb.swc"
@@ -117,7 +115,7 @@
             <source-path path-element="${basedir}/src"/>
             <include-libraries/>
             <library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/rpc/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/rpc/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/rpc/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/rpc/build.xml Wed May  9 02:16:36 2012
@@ -32,7 +32,6 @@
 		<attribute name="locale"/>
 		<sequential>
 		<echo message="Compiling frameworks/locale/@{locale}/rpc_rb.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -55,7 +54,7 @@
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/>
 			<include-libraries/>
 			<library-path/>
-			<external-library-path dir="${env.PLAYERGLOBAL}">
+			<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -175,7 +174,6 @@
 	<target name="compile" description="Compiles rpc.swc">
 		<echo file="${FLEX_HOME}/frameworks/version.properties" append="false">build=${build.number}</echo>
 		<echo message="Compiling frameworks/libs/rpc.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -205,7 +203,7 @@
 			<include-classes>RPCClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
-			<external-library-path dir="${env.PLAYERGLOBAL}">
+			<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/spark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/spark/build.xml Wed May  9 02:16:36 2012
@@ -22,7 +22,7 @@
 <project name="spark" default="main" basedir=".">
 	<property name="FLEX_HOME" location="${basedir}/../../.."/>
 
-        <property environment="env"/>
+    <property environment="env"/>
     <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
 
@@ -32,7 +32,6 @@
 		<attribute name="locale"/>
 		<sequential>
 			<echo message="Compiling frameworks/locale/@{locale}/spark_rb.swc"/>
-			<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 			<!-- Load the <compc> task. We can't do this at the <project> level -->
 			<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -58,7 +57,7 @@
 				<source-path path-element="${FLEX_HOME}/frameworks/projects/spark/src"/>
 				<include-libraries/>
 				<library-path/>
-                <external-library-path dir="${env.PLAYERGLOBAL}">
+                <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                     <include name="playerglobal.swc"/>
                 </external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -188,7 +187,6 @@
 	<target name="compile" depends="prepare" description="Compiles spark.swc">
 		<echo file="${FLEX_HOME}/frameworks/version.properties" append="false">build=${build.number}</echo>
 		<echo message="Compiling frameworks/libs/spark.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -214,7 +212,7 @@
 			<include-classes>SparkClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path />
-			<external-library-path dir="${env.PLAYERGLOBAL}">
+			<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml Wed May  9 02:16:36 2012
@@ -43,7 +43,6 @@
 	<target name="compile" description="Compiles spark_dmv.swc">
 		<echo file="${FLEX_HOME}/frameworks/version.properties" append="false">build=${build.number}</echo>
 		<echo message="Compiling frameworks/libs/spark_dmv.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -69,7 +68,7 @@
 			<include-classes>SparkDmvClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path />
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/sparkskins/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/sparkskins/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/sparkskins/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/sparkskins/build.xml Wed May  9 02:16:36 2012
@@ -41,7 +41,6 @@
 
 	<target name="compile" description="Compiles sparkskins.swc">
 		<echo message="Compiling frameworks/libs/sparkskins.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -67,7 +66,7 @@
 			<include-classes>SparkSkinsClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -101,7 +100,7 @@
 		<asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" >
 		    <compiler.source-path path-element="${basedir}/src"/>
 		    <doc-classes class="SparkSkinsClasses"/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
 		    <external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/textLayout/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/textLayout/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/textLayout/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/textLayout/build.xml Wed May  9 02:16:36 2012
@@ -40,7 +40,6 @@
 		<attribute name="locale"/>
 		<sequential>
 			<echo message="Compiling frameworks/locale/@{locale}/textLayout_rb.swc"/>
-			<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 			<!-- Load the <compc> task. We can't do this at the <project> level -->
 			<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -56,7 +55,7 @@
 				<source-path path-element="${basedir}/bundles/@{locale}"/>
 				<include-libraries/>
 				<library-path/>
-				<external-library-path dir="${env.PLAYERGLOBAL}">
+				<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
 					<include name="playerglobal.swc"/>
 				</external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/frameworks/projects/wireframe/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/wireframe/build.xml?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/wireframe/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/wireframe/build.xml Wed May  9 02:16:36 2012
@@ -41,7 +41,6 @@
 
 	<target name="compile" description="Compiles wireframe.swc">
 		<echo message="Compiling frameworks/themes/Wireframe/wireframe.swc"/>
-		<echo message="Using ${env.PLAYERGLOBAL}/playerglobal.swc" level="info"/>
 
 		<!-- Load the <compc> task. We can't do this at the <project> level -->
 		<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -67,7 +66,7 @@
 			<include-classes>WireframeClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
 			</external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
@@ -107,7 +106,7 @@
 		<asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" fork="true">
 			<compiler.source-path path-element="${basedir}/src"/>
 			<doc-classes class="WireframeClasses"/>
-            <external-library-path dir="${env.PLAYERGLOBAL}">
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
                 <include name="playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">

Modified: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/common/CompilerConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/common/CompilerConfiguration.java?rev=1335899&r1=1335898&r2=1335899&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/common/CompilerConfiguration.java (original)
+++ incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/common/CompilerConfiguration.java Wed May  9 02:16:36 2012
@@ -64,7 +64,7 @@ public class CompilerConfiguration imple
 	public static final String LOCALE_TOKEN = "{locale}";
     public static final String TARGET_PLAYER_MAJOR_VERSION_TOKEN = "{targetPlayerMajorVersion}";
     public static final String TARGET_PLAYER_MINOR_VERSION_TOKEN = "{targetPlayerMinorVersion}";
-    public static final String PLAYERGLOBAL_TOKEN = "{playerglobalHome}";
+    public static final String PLAYERGLOBAL_HOME_TOKEN = "{playerglobalHome}";
     public static final String AIR_HOME_TOKEN = "{airHome}";
     
     // this is passed as the list of soft prerequisites for options like
@@ -176,14 +176,14 @@ public class CompilerConfiguration imple
     {
         final String[] processed = new String[pathlist.length];
         
-        String playerglobalHome = System.getenv("PLAYERGLOBAL");
+        String playerglobalHome = System.getenv("PLAYERGLOBAL_HOME");
         if (playerglobalHome == null)
             playerglobalHome = "";
 
         for (int i = 0; i < pathlist.length; i++)
         {
             processed[i] = StringUtils.substitute(pathlist[i], 
-            	PLAYERGLOBAL_TOKEN, playerglobalHome);
+            	PLAYERGLOBAL_HOME_TOKEN, playerglobalHome);
         }
 
         return processed;



Mime
View raw message