incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1333581 [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 Thu, 03 May 2012 18:42:36 GMT
Author: cframpton
Date: Thu May  3 18:42:34 2012
New Revision: 1333581

URL: http://svn.apache.org/viewvc?rev=1333581&view=rev
Log:
Changes for the release candidate.  In particular FP and AIR are no longer downloaded as part of the build process.  Environment variables are used to locate them.  See the README.

Added:
    incubator/flex/trunk/env.properties   (with props)
Modified:
    incubator/flex/trunk/README
    incubator/flex/trunk/build.properties
    incubator/flex/trunk/build.xml
    incubator/flex/trunk/frameworks/build.xml
    incubator/flex/trunk/frameworks/flex-config.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_air/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=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/README (original)
+++ incubator/flex/trunk/README Thu May  3 18:42:34 2012
@@ -40,23 +40,54 @@ Building Apache Flex
     Apache Flex is a large project and depends on several external libraries which
     are downloaded as part of the build process.
     
-    Before building Flex you must install:
+Building Apache Flex 4.8.0
+==========================
+
+    Apache Flex is a large project. It requires some build tools which must be installed
+    prior to building Flex and it depends on some external libraries which
+    are downloaded as part of the build process.
     
-        Java SDK 1.5.0_13 or greater
-        Ant 1.7.0 or greater
-        on Windows you need to run from a shell like Cygwin or git bash
-        
-    The following environment variables must be set:
+    Apache Flex 4.8.0 is a parity release from Apache of Adobe Flex 4.6.
     
-        JAVA_HOME
-        ANT_HOME
+Install Prerequisites
+---------------------
 
-    The PATH must include
+    Before building Flex you must install the following software and set the
+    corresponding environment variables.  Alternatively, PLAYERGLOBAL_HOME, AIR_HOME
+    and FLASHPLAYER_DEBUGGER may be set in env.properties.
+
+    ==================================================================================
+    Software                                Environment Variable
+    
+    Java SDK 1.5 (0_13 or greater)          JAVA_HOME
+    or Java SDK 1.6
+    
+    Ant 1.7.0 or greater                    ANT_HOME
     
-        bin directory of Flex SDK
-        bin directory of Ant
-        bin directory of Java
+    Cygwin, git bash 
+    or other unix-like shell
+    (if Windows)
     
+    Adobe Flash Player                     PLAYERGLOBAL_HOME
+    playerglobal.swc
+    
+    Adobe AIR Integration Kit               AIR_HOME 
+    
+    Adobe Flash Player Content Debugger     FLASHPLAYER_DEBUGGER
+    
+    ==================================================================================
+
+    Adobe Flex 4.6 was certified with AIR 3.1 and Flash Player 11.1.
+         
+    The Adobe AIR integration kit for Windows can be downloaded from:
+        http://airdownload.adobe.com/air/win/download/3.1/AdobeAIRSDK.zip
+        
+    The Adobe AIR integration kit for Mac can be downloaded from:
+        http://airdownload.adobe.com/air/mac/download/3.1/AdobeAIRSDK.tbz2
+        
+    The Adobe Flash Player playerglobal.swc for 11.1 can be downloaded from:
+        http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/frameworks/libs/player/11.1/playerglobal.swc
+                    
     For testing, the Flash Player's mm.cfg file must have the following entries
     
         ErrorReportingEnable=1
@@ -64,7 +95,10 @@ Building Apache Flex
     
     and a FlashPlayerTrust file must allow local SWFs to access local files.
 
-    With you have all the prerequisites in place, use
+Building the Source
+-------------------
+
+    When you have all the prerequisites in place and the environment variables set, use
 
         cd <flex.dir>
         ant main        (or just ant since the default target is main)

Modified: incubator/flex/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.properties?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/build.properties (original)
+++ incubator/flex/trunk/build.properties Thu May  3 18:42:34 2012
@@ -21,10 +21,7 @@
 release = Apache Flex 4.8.0
 release.version = 4.8.0
 
-# determines frameworks/libs/player/${global.playerglobal.version}/playerglobal.swc
-# some file define a local.playerglobal.version string to override this value,
-# since properties are immutable
-global.playerglobal.version = 11.1
+playerglobal.version = 11.1
 
 qa.dir = ${basedir}/../qa
 asc = ${basedir}/bin/asc

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Thu May  3 18:42:34 2012
@@ -21,7 +21,7 @@
 <project name="sdk" default="main" basedir=".">
 
     <property name="FLEX_HOME" location="${basedir}"/>
-
+    
     <!-- Required for OSX 10.6 / Snow Leopard Performance -->
     <condition property="local.d32" value="-d32" >
         <and>
@@ -31,9 +31,11 @@
         </and>
     </condition>
 
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
     <property file="${FLEX_HOME}/local.properties"/>
     <property file="${FLEX_HOME}/build.properties"/>
-    <property environment="env"/>
+    
     <property name="debug" value="true"/>
     <property name="strict" value="true"/>
     <property name="javac.src" value="1.5"/>
@@ -49,44 +51,6 @@
     <property name="no.doc" value="set"/>
     <property name="no.air.integration" value="set"/>
     
-    <!-- Paths to the debug standalone flashplayer. -->
-    <condition property="flash.player" value="${FLEX_HOME}/in/player/${target.player}/win/FlashPlayerDebugger.exe">
-        <os family="windows"/>
-    </condition>
-    <condition property="flash.player" value="${FLEX_HOME}/in/player/${target.player}/mac/Flash Player Debugger.app/Contents/MacOS/Flash Player Debugger">
-        <os family="mac"/>
-    </condition>
-    <condition property="flash.player" value="${FLEX_HOME}/in/player/${target.player}/lnx/flashplayerdebugger">
-        <os family="unix"/>
-    </condition>
-
-    <!-- Property for the platform.  -->
-    <condition property="isMac" value="true">
-        <os family="mac"/>
-    </condition>
-    <condition property="isWindows">
-        <os family="windows" />
-    </condition>    
-    <condition property="isLnx">
-        <and>
-          <os family="unix"/>    
-          <not>
-            <os family="mac"/>    
-          </not>
-        </and>
-    </condition>
-
-    <!-- Paths to the adl. -->
-    <condition property="adl" value="${basedir}/bin/adl.exe">
-        <os family="windows"/>
-    </condition>
-    <condition property="adl" value="${basedir}/bin/adl">
-        <os family="mac"/>
-    </condition>
-    <condition property="adl" value="${basedir}/bin/adl">
-        <os family="unix"/>
-    </condition>
-
     <!--
         Notes: If you're running the main target, then there is no need to call clean first.
         Each of the main targets for the modules will call clean themselves before proceeding.
@@ -102,7 +66,7 @@
     <target name="dev" depends="modules-dev" description="Runs src.depend build for development"/>
 
     <target name="release" 
-        depends="source-release,binary-release"
+        depends="check-compile-env,check-runtime-env,source-release,binary-release"
         description="Creates source and binary kits for Apache Flex."/>
         
     <target name="source-release" 
@@ -129,12 +93,24 @@
        To clean these you must call thirdparty-clean or super-clean to clean everything.  
        clean does not remove these since they don't change often and the downloads take time.
     -->
-    <target name="thirdparty-downloads" depends="flashplayer-download" description="Downloads all the required thirdparty code.">
+    <target name="thirdparty-downloads" description="Downloads all the required thirdparty code.">
         <ant dir="${basedir}/modules" target="thirdparty-downloads"/>
         <ant dir="${basedir}/frameworks" target="thirdparty-downloads"/>
     </target>
 
-    <target name="pre-build" depends="create-description,thirdparty-downloads" description="stuff that needs to be done before any builds" />
+    <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_HOME.notset">
+            <equals arg1="${env.PLAYERGLOBAL_HOME}" arg2="must_set_environment_variable_PLAYERGLOBAL_HOME" casesensitive="true"/>
+        </condition>
+        <fail message="PLAYERGLOBAL_HOME environment variable is not set" if="PLAYERGLOBAL_HOME.notset"/>
+        <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="AIR_HOME.notset"/>
+    </target>
 
     <!-- ToDo: automate setting the build number for non-dev builds. -->
     <target name="create-description">
@@ -154,14 +130,12 @@
     <target name="super-clean" depends="thirdparty-clean,clean" description="Cleans everything including thirdparty downloads."/>
 
     <target name="thirdparty-clean" description="Removes all thirdparty downloads.">
-        <delete file="${flash.player}" failonerror="false"/>
         <ant dir="${basedir}/modules" target="thirdparty-clean"/>
         <ant dir="${basedir}/frameworks" target="thirdparty-clean"/>
     </target>
 
     <target name="clean" depends="modules-clean,frameworks-clean,package-clean,checkintests-clean" description="Full clean excluding thirdparty downloads">
         <delete file="${basedir}/flex-sdk-description.xml" failonerror="false"/>
-        <!--delete file="${flash.player}" failonerror="false"/-->
         <delete dir="${basedir}/lib/win" failonerror="false" includeEmptyDirs="true"/>
         <delete dir="${basedir}/out" failonerror="false" includeEmptyDirs="true"/>
         <delete dir="${basedir}/tempDoc" failonerror="false" includeEmptyDirs="true"/>
@@ -286,38 +260,6 @@
 
     <target name="post-build" depends="" description="Handle post-build activities" />
 
-    <target name="flashplayer-check">
-        <available file="${flash.player}" property="flash.player.present"/>
-    </target>
-    
-    <target name="flashplayer-download" depends="flashplayer-mac-download,flashplayer-win-download,flashplayer-lnx-download" />
-
-    <!-- Mac: Debug Projector FlashPlayer 11.1 -->
-    <target name="flashplayer-mac-download" if="isMac" depends="flashplayer-check" unless="flash.player.present" description="Downloads Mac debug standalone player from the Adobe website">
-        <mkdir dir="${basedir}/in/player/${target.player}/mac"/>
-        <get src="http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa_debug.app.zip" 
-            dest="${basedir}/in/player/${target.player}/mac/flashplayer_11_sa_debug.app.zip" 
-            verbose="false"/>
-        <unzip dest="${basedir}/in/player/${target.player}/mac" src="${basedir}/in/player/${target.player}/mac/flashplayer_11_sa_debug.app.zip" />
-        <chmod file="${basedir}/in/player/${target.player}/mac/Flash Player Debugger.app/Contents/MacOS/Flash Player Debugger" perm="777" />
-    </target>
-
-    <!-- Win: Debug Projector FlashPlayer 11.1 -->
-    <target name="flashplayer-win-download" if="isWindows" depends="flashplayer-check" unless="flash.player.present" description="Downloads Win debug standalone player from the Adobe website">
-        <mkdir dir="${basedir}/in/player/${target.player}/win"/>
-        <get src="http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa_debug_32bit.exe" 
-            dest="${basedir}/in/player/${target.player}/win/FlashPlayerDebugger.exe" 
-            verbose="false"/>
-    </target>
-
-    <!-- Linux: Debug Projector FlashPlayer 11.1 -->
-    <target name="flashplayer-lnx-download" if="isLnx" depends="flashplayer-check" unless="flash.player.present" description="Downloads Win debug standalone player from the Adobe website">
-        <mkdir dir="${basedir}/in/player/${target.player}/lnx"/>
-        <get src="http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa_debug.i386.tar.gz" 
-            dest="${basedir}/in/player/${target.player}/lnx/flashplayerdebugger.tar.gz" 
-            verbose="false"/>
-    </target>
-
     <!--
         Build the ASDoc html pages.
     -->
@@ -351,7 +293,8 @@
         
         <copy todir="${basedir}/temp" includeEmptyDirs="false">
             <fileset dir="${basedir}">
-                <include name="build.*"/>
+                <include name="build.xml"/>
+                <include name="*.properties"/>
                 <include name="flex-sdk-description.xml"/>
                 <include name="KEYS"/>
                 <include name="CHANGES"/>
@@ -359,12 +302,16 @@
                 <include name="NOTICE"/>
                 <include name="README"/>
                 <include name="RELEASE_NOTES"/>
-                <include name="setup.sh"/>
-                <include name="bin/*.bat"/>
-                <include name="bin/*.sh"/>
-                <exclude name="bin/adl*"/>
-                <exclude name="bin/adt*"/>
-                <include name="asdocs/**"/>
+            </fileset>
+        </copy>  
+
+        <!-- bin -->
+        <copy todir="${basedir}/temp/bin" includeEmptyDirs="false">
+            <fileset dir="${basedir}/bin">
+                <include name="*.bat"/>
+                <include name="*.sh"/>
+                <exclude name="adl*"/>
+                <exclude name="adt*"/>
             </fileset>
         </copy>  
 
@@ -573,8 +520,7 @@
                 <include name="charts.swc"/>
                 <include name="advancedgrids.swc"/>
                 <include name="spark_dmv.swc"/>
-                <include name="player/${target.player}/playerglobal.swc"/>
-				<include name="player/11.1/playerglobal.swc"/>
+                <include name="${env.FLASHPLAYER_HOME}/playerglobal.swc"/>
             </fileset>
         </copy>
         
@@ -1021,7 +967,7 @@
     <target name="basictests-mustella" depends="mustella-setup,basictests"/>
     <target name="airmobile-basictests-mustella" depends="mustella-setup,airmobile-basictests"/>
 
-    <target name="mustella-setup" description="compile mustella java file">
+    <target name="mustella-setup" depends="runtime-setup" description="compile mustella java file">
         <!-- delete and rebuild mustella.swc -->
         <ant dir="${basedir}/mustella" target="cleanmustellaswc"/>
         <ant dir="${basedir}/mustella" target="makemustellaswc"/>
@@ -1030,6 +976,47 @@
         <javac srcdir="mustella" includes="MustellaResultsParser.java"/>
     </target>
 
+    <target name="check-runtime-env" 
+        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"/>
+    </target>
+    
+    <target name="runtime-setup" depends="check-runtime-env" 
+        description="Set flash.player and adl properties"> 
+        
+        <!-- Paths to the debug standalone flashplayer. -->
+        <condition property="flash.player" value="${env.FLASHPLAYER_DEBUGGER}/FlashPlayerDebugger.exe">
+            <os family="windows"/>
+        </condition>
+        <condition property="flash.player" value="${env.FLASHPLAYER_DEBUGGER}/Flash Player Debugger.app/Contents/MacOS/Flash Player Debugger">
+            <os family="mac"/>
+        </condition>
+        <condition property="flash.player" value="${env.FLASHPLAYER_DEBUGGER}/flashplayerdebugger">
+            <os family="unix"/>
+        </condition>
+    
+        <!-- Paths to the adl. -->
+        <condition property="adl" value="${env.AIR_HOME}/bin/adl.exe">
+            <os family="windows"/>
+        </condition>
+        <condition property="adl" value="${env.AIR_HOME}/bin/adl">
+            <os family="mac"/>
+        </condition>
+        <condition property="adl" value="${env.AIR_HOME}/bin/adl">
+            <os family="unix"/>
+        </condition>
+    </target>
+
     <target name="load-task">
         <!-- load the <mxmlc> task; we can't do this at the <project> level -->
         <!-- because targets that run before flexTasks.jar gets built would fail -->

Added: incubator/flex/trunk/env.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/env.properties?rev=1333581&view=auto
==============================================================================
--- incubator/flex/trunk/env.properties (added)
+++ incubator/flex/trunk/env.properties Thu May  3 18:42:34 2012
@@ -0,0 +1,40 @@
+################################################################################
+##
+##  Licensed to the Apache Software Foundation (ASF) under one or more
+##  contributor license agreements.  See the NOTICE file distributed with
+##  this work for additional information regarding copyright ownership.
+##  The ASF licenses this file to You under the Apache License, Version 2.0
+##  (the "License"); you may not use this file except in compliance with
+##  the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##
+################################################################################
+
+# You need to either set the environment variables AIR_HOME and PLAYER_HOME or set
+# the properties here.  The environment variables take precedence. 
+# 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
+
+#
+# Set this to the directory that contains the Adobe Flash Player content debugger
+# for your platform.  
+#
+env.FLASHPLAYER_DEBUGGER=must_set_environment_variable_FLASHPLAYER_DEBUGGER
+
+#
+# Set this to the directory that contains the Adobe Flash Player playerglobal.swc.
+#
+env.PLAYERGLOBAL_HOME=must_set_environment_variable_PLAYERGLOBAL_HOME
+

Propchange: incubator/flex/trunk/env.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/env.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/flex/trunk/frameworks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build.xml (original)
+++ incubator/flex/trunk/frameworks/build.xml Thu May  3 18:42:34 2012
@@ -26,15 +26,14 @@
 <project name="frameworks" default="main" basedir=".">
 
     <property name="FLEX_HOME" location=".."/>
-    <property name="playerglobal.version" value="11.1"/>
-
+    
     <!-- Required for OSX 10.6 / Snow Leopard Performance -->
     <condition property="local.d32" value="-d32" >
-            <and>
+        <and>
             <equals arg1="${sun.arch.data.model}" arg2="64"/>
             <equals arg1="${os.arch}" arg2="x86_64"/>
             <os family="mac"/>
-            </and>
+        </and>
     </condition>
     
     <!-- Property for the platform.  -->
@@ -45,10 +44,17 @@
         <os family="windows" />
     </condition>    
 
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
     <property file="${FLEX_HOME}/build.properties"/>
         
-    <target name="main" depends="clean,thirdparty-downloads,airsdk-prepare,javascript,compile" description="Clean build of all SWCs"/>
+    <target name="main" depends="check-compile-env,clean,thirdparty-downloads,javascript,compile" 
+        description="Clean build of all SWCs"/>
 
+    <target name="check-compile-env" description="Check for the required environment variables">
+        <ant antfile="${FLEX_HOME}/build.xml" target="check-compile-env" dir="${FLEX_HOME}"/>
+    </target>
+    
     <!-- Note:
        Removed osmf from build.  For now, just use the downloaded swc.
        We can move the osmf source from osmf-download to projects/osmf and add back the
@@ -186,7 +192,7 @@
     <target name="thirdparty-clean" depends="swfobject-clean" description="Cleans thirdparty downloaded files.">
         <delete failonerror="false" verbose="true">
             <fileset dir="${basedir}/libs" includes="osmf.swc,textLayout.swc"/>
-            <fileset dir="${basedir}/libs/player/${playerglobal.version}" includes="playerglobal.swc"/>
+            <fileset dir="${basedir}/libs/player" includes="**/playerglobal.swc"/>
         </delete>
         <delete dir="${FLEX_HOME}/in/air/**"/>
         <delete includeEmptyDirs="true" failonerror="false">
@@ -297,7 +303,7 @@ tar -xjf "AIR Integration Kit.tbz2" 
        clean does not remove these since they don't change often and the downloads take time.
     -->
     <target name="thirdparty-downloads" 
-        depends="airsdk-download,playerglobal-download,osmf-download,swfobject-download,textLayout-download" 
+        depends="osmf-download,swfobject-download,textLayout-download" 
         description="Copies third-party software into place for build">
         <echo message="Use the thirdparty-clean target to remove these."/> 
     </target>
@@ -307,10 +313,6 @@ tar -xjf "AIR Integration Kit.tbz2" 
         <available file="${FLEX_HOME}/in/air/win/AIR Integration Kit.zip" property="airsdk.win.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>
@@ -345,15 +347,6 @@ tar -xjf "AIR Integration Kit.tbz2" 
             verbose="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://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/frameworks/libs/player/11.1/playerglobal.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. -->

Modified: incubator/flex/trunk/frameworks/flex-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/flex-config.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/flex-config.xml (original)
+++ incubator/flex/trunk/frameworks/flex-config.xml Thu May  3 18:42:34 2012
@@ -58,7 +58,7 @@
       <!-- List of SWC files or directories to compile against but to omit from -->
       <!-- linking.                                                             -->
       <external-library-path>
-          <path-element>libs/player/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
+          <path-element>{playerglobalHome}/playerglobal.swc</path-element>
       </external-library-path>
 
       <!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -78,8 +78,7 @@
          <path-element>libs</path-element>
          <path-element>libs/mx</path-element>
          <path-element>locale/{locale}</path-element>
-         <!-- The following entry is because LCDS copies playerfds.swc in the player folder -->
-         <path-element>libs/player</path-element>
+         <path-element>{playerglobalHome}</path-element>
       </library-path>
 
       <namespaces>

Modified: incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml Thu May  3 18:42:34 2012
@@ -20,24 +20,24 @@
 <project name="advancedgrids" default="main" basedir=".">
 
     <property name="FLEX_HOME" location="${basedir}/../../.."/>
-	<property file="${FLEX_HOME}/build.properties"/>
+    
+    <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}/advancedgrids_rb.swc"/>
+				<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
 				<compc fork="true"
 					output="${FLEX_HOME}/frameworks/locale/@{locale}/advancedgrids_rb.swc"
 					locale="@{locale}">
-					<!--
-						NOTE: we are continuing to build against player 9 so that airframework.swc
-							  can externally link against framework.swc, since air is player 9.
-							  If you change this, update ${local.playerglobal.version} above.
-					-->
 					<target-player>11.1</target-player>
 					<jvmarg line="${compc.jvm.args}"/>
 					<include-resource-bundles bundle="datamanagement"/>
@@ -48,8 +48,10 @@
 					<source-path path-element="${FLEX_HOME}/frameworks/projects/advancedgrids/src"/>
 					<include-libraries/>
 					<library-path/>
+					<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+						<include name="playerglobal.swc"/>
+					</external-library-path>
 					<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-						<include name="player/${global.playerglobal.version}/playerglobal.swc"/>
 						<include name="framework.swc"/>
 					</external-library-path>
 				</compc>
@@ -177,6 +179,8 @@
 	<target name="compile" description="Compiles advancedgrids.swc">
 		
 		<echo message="Compiling frameworks/libs/advancedgrids.swc"/>
+		<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -201,8 +205,10 @@
 			<include-namespaces>library://ns.adobe.com/flex/mx</include-namespaces>
 			<source-path path-element="${basedir}/src"/>
 			<library-path />
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${global.playerglobal.version}/playerglobal.swc"/>
 				<include name="framework.swc"/>
 				<include name="mx/mx.swc"/>
 				<include name="rpc.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/airframework/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/airframework/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airframework/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/airframework/build.xml Thu May  3 18:42:34 2012
@@ -21,24 +21,26 @@
 
 <project name="airframework" default="main" basedir=".">
 
-	<property name="FLEX_HOME" location="${basedir}/../../.."/>
-
+	<property name="FLEX_HOME" location="${basedir}/../../.."/>  
+	  
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
     <property file="${FLEX_HOME}/build.properties"/>
+
 	<property name="locale" value="en_US"/>
-    <!-- If you change this, update <target-player/> in the <compc/> tasks. -->
-    <property name="local.playerglobal.version" value="11.1"/>
   	
 	<macrodef name="bundle">
 		<attribute name="locale"/>
-			<sequential>
-				<echo message="Compiling frameworks/locale/@{locale}/airframework_rb.swc"/>
+		<sequential>
+		<echo message="Compiling frameworks/locale/@{locale}/airframework_rb.swc"/>
+		<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/locale/@{locale}/airframework_rb.swc"
 			   locale="@{locale}">
-            <!-- If you change this, update ${local.playerglobal.version} above. -->
 			<target-player>11.1</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<include-resource-bundles bundle="SharedResources"/>
@@ -58,8 +60,10 @@
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/mx/bundles/@{locale}"/>
 			<include-libraries/>
 			<library-path/>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
 			</external-library-path>
 		</compc>
@@ -181,6 +185,8 @@
 	
 	<target name="compile" description="Compiles airframework.swc">
 		<echo message="Compiling frameworks/libs/air/airframework.swc"/>
+		<echo message="Using ${env.AIR_HOME}/frameworks/libs/air/airglobal.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"/>
@@ -200,7 +206,6 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/libs/air/airframework.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
-            <!-- If you change this, update ${local.playerglobal.version} above. -->
 		    <target-player>11.1</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<namespace uri="library://ns.adobe.com/flex/mx" manifest="${basedir}/manifest.xml"/>
@@ -208,8 +213,10 @@
 			<include-classes>AIRFrameworkClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
+            <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
+                <include name="airglobal.swc"/>
+            </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-				<include name="air/airglobal.swc"/>
 				<include name="framework.swc"/>
 				<include name="mx/mx.swc"/>
                 <include name="textLayout.swc"/>
@@ -271,9 +278,9 @@
 		<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="AIRFrameworkClasses"/>
-		    <external-library-path dir="${FLEX_HOME}/frameworks/libs/air">
-		    	<include name="airglobal.swc" />
-		    </external-library-path>
+            <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
+                <include name="airglobal.swc"/>
+            </external-library-path>
 		    <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 		    	<include name="framework.swc" />
 		    	<include name="mx/mx.swc" />

Modified: incubator/flex/trunk/frameworks/projects/airspark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/airspark/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airspark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/airspark/build.xml Thu May  3 18:42:34 2012
@@ -22,15 +22,19 @@
 <project name="airspark" default="main" basedir=".">
 
     <property name="FLEX_HOME" location="${basedir}/../../.."/>
+
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
     <property file="${FLEX_HOME}/build.properties"/>
+    
     <property name="locale" value="en_US"/>
-    <!-- If you change this, update <target-player/> in the <compc/> tasks. -->
-    <property name="local.playerglobal.version" value="11.1"/>
 
         <macrodef name="bundle">
             <attribute name="locale"/>
             <sequential>
                 <echo message="Compiling frameworks/locale/@{locale}/airspark_rb.swc"/>
+                <echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -38,7 +42,6 @@
                 <compc fork="true"
                        output="${FLEX_HOME}/frameworks/locale/@{locale}/airspark_rb.swc"
                        locale="@{locale}">
-                    <!-- If you change this, update ${local.playerglobal.version} above. -->
                     <target-player>11.1</target-player>
                     <jvmarg line="${compc.jvm.args}"/>
                     <include-resource-bundles bundle="core"/>
@@ -47,8 +50,10 @@
                     <source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/> 
                     <include-libraries/>
                     <library-path/>
+                    <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                        <include name="playerglobal.swc"/>
+                    </external-library-path>
                     <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                        <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
                         <include name="framework.swc"/> 
                     </external-library-path>
                 </compc>
@@ -170,6 +175,7 @@
 
     <target name="compile" description="Compiles airspark.swc">
         <echo message="Compiling frameworks/libs/air/airspark.swc"/>
+		<echo message="Using ${env.AIR_HOME}/frameworks/libs/air/airglobal.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. -->
@@ -190,7 +196,6 @@
         <compc fork="true"
                output="${FLEX_HOME}/frameworks/libs/air/airspark.swc"
                resource-bundle-list="${basedir}/bundles.properties">
-            <!-- If you change this, update ${local.playerglobal.version} above. -->
             <target-player>11.1</target-player>
             <jvmarg line="${compc.jvm.args}"/>
             <namespace uri="library://ns.adobe.com/flex/spark" manifest="${basedir}/manifest.xml"/>
@@ -198,13 +203,15 @@
             <include-classes>AIRSparkClasses</include-classes>
             <source-path path-element="${basedir}/src"/>
             <library-path/>
+            <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
+                <include name="airglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="air/airglobal.swc"/>
                 <include name="air/airframework.swc"/>
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
                 <include name="spark.swc"/>
-                      <include name="textLayout.swc"/>
+                <include name="textLayout.swc"/>
             </external-library-path>
             <include-file name="defaults.css" path="${basedir}/defaults.css"/>
             <locale/>
@@ -234,8 +241,10 @@
         <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="AIRSparkClasses"/>
+            <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
+                <include name="airglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs/air">
-                <include name="airglobal.swc" />
                 <include name="airframework.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=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml Thu May  3 18:42:34 2012
@@ -22,6 +22,8 @@
 <project name="authoringsupport" default="main" basedir=".">
 	<property name="FLEX_HOME" location="${basedir}/../../.."/>
 
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
 
 	<target name="main" depends="clean,compile" description="Clean build of authoringsupport.swc"/>
@@ -38,6 +40,8 @@
 
 	<target name="compile" description="Compiles authoringsupport.swc">
 		<echo message="Compiling frameworks/libs/authoringsupport.swc"/>
+		<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -61,8 +65,10 @@
             <library-path dir="${basedir}/libs/">
 				<include name="FlexContentHolderThumbnail.swc"/>
 			</library-path>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${global.playerglobal.version}/playerglobal.swc"/>
 				<include name="framework.swc"/>
 				<include name="mx/mx.swc"/>
                 <include name="flash-integration.swc"/>
@@ -95,9 +101,9 @@
 		<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="${FLEX_HOME}/frameworks/libs/player/${global.playerglobal.version}">
-		    	<include name="playerglobal.swc" />
-		    </external-library-path>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
 		    <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 		    	<include name="framework.swc" />
 		    	<include name="mx/mx.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/automation/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation/build.xml Thu May  3 18:42:34 2012
@@ -20,14 +20,19 @@
 <project name="automation" default="main" basedir=".">
 
     <property name="FLEX_HOME" location="${basedir}/../../.."/>
+
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
-	<property name="local.playerglobal.version" value="11.1"/>
+
 	<property name="locale" value="en_US"/>
 	
 	<macrodef name="bundle">
 		<attribute name="locale"/>
 		<sequential>
 			<echo message="Compiling frameworks/locale/@{locale}/automation_rb.swc"/>
+			<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -43,8 +48,10 @@
 				<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/>
 				<include-libraries/>
 				<library-path/>
+                <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                    <include name="playerglobal.swc"/>
+                </external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-					<include name="player/${local.playerglobal.version}/playerglobal.swc"/>
 					<include name="framework.swc"/>
 					<include name="mx/mx.swc"/>
 				</external-library-path>
@@ -140,6 +147,8 @@
 	
 	<target name="compile" description="Compiles automation.swc">
 		<echo message="Compiling frameworks/libs/automation/automation.swc"/>
+		<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -165,8 +174,10 @@
 			<include-classes>AutomationClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
 				<include name="framework.swc"/>
 				<include name="mx/mx.swc"/>
 				<include name="automation_agent.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/automation_air/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/automation_air/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_air/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_air/build.xml Thu May  3 18:42:34 2012
@@ -20,14 +20,20 @@
 
 <project name="automation_air" default="main" basedir=".">
 
-     <property name="FLEX_HOME" location="${basedir}/../../.."/>
+    <property name="FLEX_HOME" location="${basedir}/../../.."/>
+
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
+
 	<property name="locale" value="en_US"/>
 
 	<target name="main" depends="clean,compile" description="Clean build of automation_air.swc"/>
 		
 	<target name="compile" description="Compiles automation_air.swc">
 		<echo message="Compiling frameworks/libs/automation/automation_air.swc"/>
+		<echo message="Using ${env.AIR_HOME}/frameworks/libs/air/airglobal.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"/>
@@ -54,11 +60,13 @@
 			<source-path path-element="${basedir}/src"/>
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/automation/src"/>
 			<library-path/>
+            <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
+                <include name="airglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
-		    <include name="textLayout.swc"/>
-				<include name="air/airglobal.swc"/>
+		        <include name="textLayout.swc"/>
 				<include name="air/airframework.swc"/>
 				<include name="automation/automation.swc"/>
 				<include name="automation_agent.swc"/>

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=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml Thu May  3 18:42:34 2012
@@ -20,14 +20,20 @@
 
 <project name="automation_airspark" default="main" basedir=".">
 
-     <property name="FLEX_HOME" location="${basedir}/../../.."/>
+    <property name="FLEX_HOME" location="${basedir}/../../.."/>
+
+    <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}/automation_airspark_rb.swc"/>
+			<echo message="Using ${env.PLAYERGLOBAL_HOME}/playerglobal.swc" level="info"/>
+
 			<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
 			<compc fork="true"
 				   output="${FLEX_HOME}/frameworks/locale/@{locale}/automation_airspark_rb.swc"
@@ -40,8 +46,10 @@
 				<source-path path-element="${basedir}/bundles/@{locale}"/>
 				<include-libraries/>
 				<library-path/>
+                <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                    <include name="playerglobal.swc"/>
+                </external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-					<include name="player/${local.playerglobal.version}/playerglobal.swc"/>
 					<include name="framework.swc"/>
    					<include name="mx/mx.swc"/>
 				</external-library-path>
@@ -96,6 +104,8 @@
 		
 	<target name="compile" description="Compiles automation_airspark.swc">
 		<echo message="Compiling frameworks/libs/automation/automation_airspark.swc"/>
+		<echo message="Using ${env.AIR_HOME}/frameworks/libs/air/airglobal.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"/>
@@ -121,12 +131,14 @@
 			<include-classes>AutomationAirSparkClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
+			<external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
+                <include name="airglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
                 <include name="framework.swc"/>
-		    <include name="mx/mx.swc"/>
+		        <include name="mx/mx.swc"/>
 				<include name="spark.swc"/>
                 <include name="textLayout.swc"/>
-				<include name="air/airglobal.swc"/>
 				<include name="air/airframework.swc"/>
 				<include name="air/airspark.swc"/>
 				<include name="automation/automation.swc"/>
@@ -166,12 +178,14 @@
 		    <namespace uri="http://www.adobe.com/2006/mxml" manifest="${basedir}/manifest_automation_airspark.xml"/>
 		    <jvmarg line="${asdoc.jvm.args}"/>
 			<library-path/>
+            <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
+                <include name="airglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
                 <include name="framework.swc"/>
 				<include name="mx/mx.swc"/>
 				<include name="spark.swc"/>
                 <include name="textLayout.swc"/>
-				<include name="air/airglobal.swc"/>
 				<include name="air/airframework.swc"/>
 				<include name="air/airspark.swc"/>
 				<include name="automation/automation.swc"/>

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=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml Thu May  3 18:42:34 2012
@@ -20,8 +20,11 @@
 <project name="automation_charts" default="main" basedir=".">
 
 	<property name="FLEX_HOME" location="${basedir}/../../.."/>
+
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
-	<property name="local.playerglobal.version" value="11.1"/>
+
 	<property name="locale" value="en_US"/>
 				
 	<target name="main" depends="clean,compile" description="Clean build of automation_dmv.swc and en_US">
@@ -30,6 +33,8 @@
 		
 	<target name="compile" description="Compiles automation_dmv.swc">
 		<echo message="Compiling frameworks/libs/automation/automation_dmv.swc"/>
+	    <echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -55,8 +60,10 @@
 			<source-path path-element="${basedir}/src"/>
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/automation/src"/>
 			<library-path/>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
 				<include name="framework.swc"/>
 				<include name="mx/mx.swc"/>
 				<include name="textLayout.swc"/>

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=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml Thu May  3 18:42:34 2012
@@ -19,9 +19,12 @@
 -->
 <project name="automation_flashflexkit" default="main" basedir=".">
 
-	 <property name="FLEX_HOME" location="${basedir}/../../.."/>
+	<property name="FLEX_HOME" location="${basedir}/../../.."/>
+
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
-	<property name="local.playerglobal.version" value="11.1"/>
+
 	<property name="locale" value="en_US"/>
 	
 	<target name="main" depends="clean,compile" description="Clean build of automation_flashflexkit.swc and en_US">
@@ -46,6 +49,8 @@
 
 	<target name="compile" description="Compiles automation_flashflexkit.swc">
 		<echo message="Compiling frameworks/libs/automation/automation_flashflexkit.swc"/>
+		<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -69,8 +74,10 @@
 			<target-player>11.1</target-player>
 			<include-classes>AutomationFlashFlexKitClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
 				<include name="framework.swc"/>
 				<include name="mx/mx.swc"/>
 				<include name="rpc.swc"/>

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=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_spark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_spark/build.xml Thu May  3 18:42:34 2012
@@ -20,8 +20,11 @@
 <project name="automation_spark" default="main" basedir=".">
 
 	<property name="FLEX_HOME" location="${basedir}/../../.."/>
+
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
-	<property name="local.playerglobal.version" value="11.1"/>
+
 	<property name="locale" value="en_US"/>
 	
 	<target name="main" depends="clean,compile" description="Clean build of automation_spark.swc and en_US">
@@ -30,6 +33,8 @@
 	
 	<target name="compile" description="Compiles automation_spark.swc">
 		<echo message="Compiling frameworks/libs/automation/automation_spark.swc"/>
+		<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -55,6 +60,9 @@
 			<include-classes>AutomationSparkClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
                 <include name="framework.swc"/>
 				<include name="mx/mx.swc"/>
@@ -66,7 +74,6 @@
 				<include name="automation_agent.swc"/>
 				<include name="qtp.swc"/>
 				<include name="qtp_air.swc"/>
-				<include name="player/${local.playerglobal.version}/playerglobal.swc"/>
 			</external-library-path>
 			<locale/>
 			<accessible>true</accessible>

Modified: incubator/flex/trunk/frameworks/projects/charts/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/charts/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/charts/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/charts/build.xml Thu May  3 18:42:34 2012
@@ -20,13 +20,19 @@
 <project name="charts" default="main" basedir=".">
 
     <property name="FLEX_HOME" location="${basedir}/../../.."/>
-    <property file="${FLEX_HOME}/build.properties"/>
+
+    <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}/charts_rb.swc"/>
+                <echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -36,7 +42,6 @@
                     <!--
                         NOTE: we are continuing to build against player 9 so that airframework.swc
                               can externally link against framework.swc, since air is player 9.
-                              If you change this, update ${local.playerglobal.version} above.
                     -->
                     <target-player>10.1</target-player>
                     <jvmarg line="${compc.jvm.args}"/>
@@ -47,8 +52,10 @@
                     <source-path path-element="${FLEX_HOME}/frameworks/projects/charts/src"/>
                     <include-libraries/>
                     <library-path/>
+                    <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                        <include name="playerglobal.swc"/>
+                    </external-library-path>
                     <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                        <include name="player/${global.playerglobal.version}/playerglobal.swc"/>
                         <include name="framework.swc"/>
                     </external-library-path>
                 </compc>
@@ -176,6 +183,8 @@
     <target name="compile" description="Compiles charts.swc">
         
         <echo message="Compiling frameworks/libs/charts.swc"/>
+        <echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -200,8 +209,10 @@
             <include-namespaces>library://ns.adobe.com/flex/mx</include-namespaces>
             <source-path path-element="${basedir}/src"/>
             <library-path />
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${global.playerglobal.version}/playerglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="rpc.swc"/>
                 <include name="textLayout.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/core/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/core/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/core/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/core/build.xml Thu May  3 18:42:34 2012
@@ -23,11 +23,10 @@
 
 	<property name="FLEX_HOME" location="${basedir}/../../.."/>
 
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
 
-    <!-- If you change this, update <target-player/> in the <compc/> tasks. -->
-    <property name="local.playerglobal.version" value="11.1"/>
-
 	<target name="main" depends="clean,compile" description="Clean build of core.swc"/>
 
 	<target name="clean">
@@ -42,6 +41,8 @@
 
 	<target name="compile" description="Compiles core.swc">
 		<echo message="Compiling frameworks/libs/core.swc"/>
+		<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -64,7 +65,6 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/libs/core.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
-            <!-- If you change this, update ${local.playerglobal.version} above. -->
             <target-player>11.1</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<include-classes>CoreClasses</include-classes>
@@ -72,8 +72,10 @@
 			<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_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
                 <include name="textLayout.swc"/>
 			</external-library-path>
 			<locale/>

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=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/flash-integration/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/flash-integration/build.xml Thu May  3 18:42:34 2012
@@ -23,14 +23,18 @@
 
 	<property name="FLEX_HOME" location="${basedir}/../../.."/>
 
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
+
     <property name="locale" value="en_US"/>
-	<property name="local.playerglobal.version" value="11.1"/>
 	
 	<macrodef name="bundle">
 		<attribute name="locale"/>
 			<sequential>
 				<copy file="${basedir}/bundles/en_US/empty.properties" tofile="${basedir}/bundles/@{locale}/empty.properties"/>
+				<echo message="Using ${env.PLAYERGLOBAL_HOME}/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 -->
 				<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -38,11 +42,6 @@
 				<compc fork="true"
 					output="${FLEX_HOME}/frameworks/locale/@{locale}/flash-integration_rb.swc"
 					locale="@{locale}">
-					<!--
-						NOTE: we are continuing to build against player 9 so that airframework.swc
-							  can externally link against framework.swc, since air is player 9.
-							  If you change this, update ${local.playerglobal.version} above.
-					-->
 					<target-player>11.1</target-player>
 					<jvmarg line="${compc.jvm.args}"/>
 					<include-resource-bundles bundle="empty"/>
@@ -52,8 +51,10 @@
 					<source-path path-element="${FLEX_HOME}/frameworks/projects/flash-integration/src"/>
 					<include-libraries/>
 					<library-path/>
+                    <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                        <include name="playerglobal.swc"/>
+                    </external-library-path>
 					<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-						<include name="player/${local.playerglobal.version}/playerglobal.swc"/>
 						<include name="framework.swc"/>
 					</external-library-path>
 				</compc>
@@ -118,6 +119,8 @@
 
 	<target name="compile" description="Compiles flash-integration.swc">
 		<echo message="Compiling frameworks/projects/flash-integration/libs/flash-integration.swc"/>
+		<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -143,8 +146,10 @@
 			<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_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${global.playerglobal.version}/playerglobal.swc"/>
 				<include name="textLayout.swc"/>
 				<include name="framework.swc"/>
 			</external-library-path>
@@ -188,9 +193,9 @@
 				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="${FLEX_HOME}/frameworks/libs/player/${local.playerglobal.version}">
-		    	<include name="playerglobal.swc" />
-		    </external-library-path>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
 		    <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 		    	<include name="framework.swc" />
 				<include name="mx/mx.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/framework/build.xml Thu May  3 18:42:34 2012
@@ -22,19 +22,19 @@
 <project name="framework" default="main" basedir=".">
 
 	<property name="FLEX_HOME" location="${basedir}/../../.."/>
+
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
+
 	<property name="locale" value="en_US"/>
-    <!--
-    NOTE: We are continuing to build against player 9 so that airframework.swc
-          can externally link against framework.swc, since air is player 9.
-          If you change this, update <target-player/> in the <compc/> tasks.
-    -->
-    <property name="local.playerglobal.version" value="11.1"/>
   	
 	<macrodef name="bundle">
 		<attribute name="locale"/>
 			<sequential>
 				<echo message="Compiling frameworks/locale/@{locale}/framework_rb.swc"/>
+				<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -62,8 +62,8 @@
 				<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/src"/>
 				<include-libraries/>
 				<library-path/>
-				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-					<include name="player/${local.playerglobal.version}/playerglobal.swc"/>
+				<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+					<include name="playerglobal.swc"/>
 				</external-library-path>
 			</compc>
 		</sequential>
@@ -177,6 +177,7 @@
 	
 	<target name="compile" description="Compiles framework.swc">
 		<echo message="Compiling frameworks/libs/framework.swc"/>
+		<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -205,10 +206,12 @@
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
                 <include name="textLayout.swc"/>
 			</external-library-path>
-                        <load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+			</external-library-path>
+            <load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
 			<load-config filename="framework-config.xml"/>
 			<include-file name="defaults.css" path="${basedir}/defaults.css"/>
 			<include-file name="defaults-3.0.0.css" path="${basedir}/defaults-3.0.0.css"/>

Modified: incubator/flex/trunk/frameworks/projects/halo/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/halo/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/halo/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/halo/build.xml Thu May  3 18:42:34 2012
@@ -23,11 +23,10 @@
 
 	<property name="FLEX_HOME" location="${basedir}/../../.."/>
 
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
 
-    <!-- If you change this, update <target-player/> in the <compc/> tasks. -->
-    <property name="local.playerglobal.version" value="11.1"/>
-
 	<target name="main" depends="clean,compile" description="Clean build of halo.swc"/>
 
 	<target name="clean">
@@ -42,6 +41,8 @@
 
 	<target name="compile" description="Compiles halo.swc">
 		<echo message="Compiling frameworks/themes/Halo/halo.swc"/>
+		<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -58,12 +59,13 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/themes/Halo/halo.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
-            <!-- If you change this, update ${local.playerglobal.version} above. -->
             <target-player>11.1</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<library-path/>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
 				<include name="framework.swc"/>
 				<include name="mx/mx.swc"/>
 	                  <include name="textLayout.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml Thu May  3 18:42:34 2012
@@ -22,15 +22,19 @@
 <project name="mobilecomponents" default="main" basedir=".">
 
     <property name="FLEX_HOME" location="${basedir}/../../.."/>
-    <property file="${FLEX_HOME}/build.properties"/>
+
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
+	<property file="${FLEX_HOME}/build.properties"/>
+    
     <property name="locale" value="en_US"/>
-    <!-- If you change this, update <target-player/> in the <compc/> tasks. -->
-    <property name="local.playerglobal.version" value="11.1"/>
 
         <macrodef name="bundle">
             <attribute name="locale"/>
             <sequential>
                 <echo message="Compiling frameworks/locale/@{locale}/mobilecomponents_rb.swc"/>
+                <echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -38,7 +42,6 @@
                 <compc fork="true"
                        output="${FLEX_HOME}/frameworks/locale/@{locale}/mobilecomponents_rb.swc"
                        locale="@{locale}">
-                    <!-- If you change this, update ${local.playerglobal.version} above. -->
                     <target-player>10</target-player>
                     <jvmarg line="${compc.jvm.args}"/>
                     <include-resource-bundles bundle="core"/>
@@ -47,8 +50,10 @@
                     <source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/> 
                     <include-libraries/>
                     <library-path/>
+                    <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                        <include name="playerglobal.swc"/>
+                    </external-library-path>
                     <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                        <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
                         <include name="framework.swc"/>
                     </external-library-path>
                 </compc>
@@ -161,6 +166,7 @@
 
     <target name="compile" description="Compiles mobilecomponents.swc">
         <echo message="Compiling frameworks/libs/mobile/mobilecomponents.swc"/>
+		<echo message="Using ${env.AIR_HOME}/frameworks/libs/air/airglobal.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. -->
@@ -181,7 +187,6 @@
         <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">
-            <!-- If you change this, update ${local.playerglobal.version} above. -->
             <target-player>11.1</target-player>
             <jvmarg line="${compc.jvm.args}"/>
             <namespace uri="library://ns.adobe.com/flex/spark" manifest="${basedir}/manifest.xml"/>
@@ -189,11 +194,13 @@
             <source-path path-element="${basedir}/src"/>
             <library-path/>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="air/airglobal.swc"/>
                 <include name="framework.swc"/>
                 <include name="spark.swc"/>
                 <include name="textLayout.swc"/>
             </external-library-path>
+            <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
+                <include name="airglobal.swc"/>
+            </external-library-path>
             <locale/>
                 <keep-as3-metadata name="SkinPart"/>
                 <accessible>true</accessible>
@@ -221,8 +228,10 @@
         <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="MobileComponentsClasses"/>
+            <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air">
+                <include name="airglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs/air">
-                <include name="airglobal.swc" />
                 <include name="airframework.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=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml Thu May  3 18:42:34 2012
@@ -23,11 +23,10 @@
 
 	<property name="FLEX_HOME" location="${basedir}/../../.."/>
 
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
 
-    <!-- If you change this, update <target-player/> in the <compc/> tasks. -->
-    <property name="local.playerglobal.version" value="11.1"/>
-
 	<target name="main" depends="clean,compile" description="Clean build of mobile.swc"/>
 
 	<target name="clean">
@@ -42,6 +41,8 @@
 
 	<target name="compile" description="Compiles mobile.swc">
 		<echo message="Compiling frameworks/themes/Mobile/mobile.swc"/>
+		<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -61,14 +62,15 @@
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/themes/Mobile/mobile.swc"
 			   resource-bundle-list="${basedir}/bundles.properties">
-            <!-- If you change this, update ${local.playerglobal.version} above. -->
             <target-player>10</target-player>
 			<jvmarg line="${compc.jvm.args}"/>
 			<include-classes>MobileThemeClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
 				<include name="framework.swc"/>
 				<include name="spark.swc"/>
                 <include name="textLayout.swc"/>
@@ -104,9 +106,9 @@
 		<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="${FLEX_HOME}/frameworks/libs/player/${local.playerglobal.version}">
-				<include name="playerglobal.swc" />
-			</external-library-path>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.swc" />
 				<include name="spark.swc" />

Modified: incubator/flex/trunk/frameworks/projects/mx/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mx/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mx/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mx/build.xml Thu May  3 18:42:34 2012
@@ -22,15 +22,19 @@
 <project name="mx" default="main" basedir=".">
 
 	<property name="FLEX_HOME" location="${basedir}/../../.."/>
+
+    <property environment="env"/>
+    <property file="${FLEX_HOME}/env.properties"/>
 	<property file="${FLEX_HOME}/build.properties"/>
+
 	<property name="locale" value="en_US"/>
 
-      <property name="local.playerglobal.version" value="11.1"/>
-  	
 	<macrodef name="bundle">
 		<attribute name="locale"/>
 			<sequential>
 				<echo message="Compiling frameworks/locale/@{locale}/mx_rb.swc"/>
+				<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -46,9 +50,11 @@
 				<source-path path-element="${FLEX_HOME}/frameworks/projects/mx/src"/>
 				<include-libraries/>
 				<library-path/>
+				<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+					<include name="playerglobal.swc"/>
+				</external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-					<include name="player/${local.playerglobal.version}/playerglobal.swc"/>
-	                        <include name="framework.swc"/>
+	                <include name="framework.swc"/>
 				</external-library-path>
 			</compc>
 		</sequential>
@@ -162,6 +168,8 @@
 	
 	<target name="compile" description="Compiles mx.swc">
 		<echo message="Compiling frameworks/libs/mx/mx.swc"/>
+		<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"/>
@@ -189,10 +197,12 @@
 			<include-classes>MxClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
-                  <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                      <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
-                      <include name="textLayout.swc"/>
-                      <include name="framework.swc"/>
+			<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
+            <external-library-path dir="${FLEX_HOME}/frameworks/libs">
+                  <include name="textLayout.swc"/>
+                  <include name="framework.swc"/>
 			</external-library-path>
 			<include-file name="defaults.css" path="${basedir}/defaults.css"/>
 			<include-file name="defaults-3.0.0.css" path="${basedir}/defaults-3.0.0.css"/>

Modified: incubator/flex/trunk/frameworks/projects/playerglobal/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/playerglobal/build.xml?rev=1333581&r1=1333580&r2=1333581&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/playerglobal/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/playerglobal/build.xml Thu May  3 18:42:34 2012
@@ -20,14 +20,19 @@
 <project name="playerglobal" default="main" basedir=".">
 
     <property name="FLEX_HOME" location="${basedir}/../../.."/>
-    <property file="${FLEX_HOME}/build.properties"/>
-    <property name="local.playerglobal.version" value="11.1"/>
+
+    <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}/playerglobal_rb.swc"/>
+				<echo message="Using ${env.PLAYERGLOBAL_HOME}/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"
 					locale="@{locale}">
@@ -40,8 +45,10 @@
 					<source-path path-element="${basedir}/src"/>
 					<include-libraries/>
 					<library-path/>
+                    <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                        <include name="playerglobal.swc"/>
+                    </external-library-path>
 					<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-						<include name="player/${local.playerglobal.version}/playerglobal.swc"/>
 						<include name="framework.swc"/>
 					</external-library-path>
 				</compc>
@@ -96,6 +103,8 @@
     <!-- 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_HOME}/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"
             locale="${locale}">
@@ -108,8 +117,10 @@
             <source-path path-element="${basedir}/src"/>
             <include-libraries/>
             <library-path/>
+            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="playerglobal.swc"/>
+            </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="player/${local.playerglobal.version}/playerglobal.swc"/>
 				<include name="framework.swc"/>
             </external-library-path>
         </compc>



Mime
View raw message