incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1344272 - in /incubator/flex/trunk: ./ frameworks/ frameworks/projects/advancedgrids/ frameworks/projects/airframework/ frameworks/projects/airspark/ frameworks/projects/authoringsupport/ frameworks/projects/automation/ frameworks/projects...
Date Wed, 30 May 2012 14:23:34 GMT
Author: cframpton
Date: Wed May 30 14:23:33 2012
New Revision: 1344272

URL: http://svn.apache.org/viewvc?rev=1344272&view=rev
Log:
Change the directory structure of what PLAYERGLOBAL_HOME points to so that -target-player works correctly again.   PLAYERGLOBAL_HOME should contain the subdirectory 11.1 which contains playerglobal.swc.  In other words, the path to playerglobal.swc should be ${PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc where playerglobal.version is currently defined in build.properties to be 11.1.

Added:
    incubator/flex/trunk/frameworks/README   (with props)
Modified:
    incubator/flex/trunk/README
    incubator/flex/trunk/build.xml
    incubator/flex/trunk/env-template.properties
    incubator/flex/trunk/frameworks/build_framework.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_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/ide/flashbuilder/build.xml
    incubator/flex/trunk/modules/build.xml
    incubator/flex/trunk/modules/downloads.xml
    incubator/flex/trunk/mustella/build.xml

Modified: incubator/flex/trunk/README
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/README?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/README (original)
+++ incubator/flex/trunk/README Wed May 30 14:23:33 2012
@@ -40,10 +40,10 @@ Building Apache Flex
     Apache Flex is a large project and depends on several external libraries which
     are downloaded as part of the build process.
     
-Building Apache Flex 4.8.0
-==========================
+Building Apache Flex 4.8
+========================
 
-    Apache Flex 4.8.0 is a parity release from Apache of Adobe Flex 4.6.
+    Apache Flex 4.8 is a parity release from Apache of Adobe Flex 4.6.
     
     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
@@ -56,6 +56,9 @@ Building Apache Flex 4.8.0
 Install Prerequisites
 ---------------------
 
+    Adobe Flex 4.6 was certified with AIR 3.1 and Flash Player 11.1.  Adobe Flex 4.8
+    will continue to use these.
+
     Before building Flex you must install the following software and set the
     corresponding environment variables using absolute file paths.  Relative file paths
     will result in build errors.
@@ -83,37 +86,45 @@ Install Prerequisites
     or other unix-like shell
     (if Windows)
     
-    Adobe Flash Player                          PLAYERGLOBAL_HOME
-    (rename playerglobal swc to 
-    playerglobal.swc and set to absolute  
-    path of directory containing 
-    playerglobal.swc file) 
-    
-    Adobe AIR Integration Kit                   AIR_HOME 
-    (unzip and set to absolute path of 
-    'AIR Integration Kit' directory)
-    
-    Adobe Flash Player Content Debugger         FLASHPLAYER_DEBUGGER
-    (windows) absolute path of FlashPlayerDebugger.exe
-    (mac) absolute path of Flash Player Debugger.app/Contents/MacOS/Flash Player Debugger
-    (linux) absolute path of flashplayerdebugger
+    Adobe AIR Integration Kit (*1)              AIR_HOME 
+    
+    Adobe Flash Player Content Debugger (*2)    FLASHPLAYER_DEBUGGER
+    
+    Adobe Flash Player (*3)                     PLAYERGLOBAL_HOME
     
     ==================================================================================
-
-    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
+    *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 Flash Player playerglobal.swc for 11.1 can be downloaded from:
-        http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc 
-    
-    The Adobe Flash Player content debuggers can be found here:
-        http://www.adobe.com/support/flashplayer/downloads.html
+         The Adobe AIR integration kit for Mac can be downloaded from:
+            http://airdownload.adobe.com/air/mac/download/3.1/AdobeAIRSDK.tbz2
+        
+        Download the AIR SDK for your platform and unzip it.  Set AIR_HOME to the absolute 
+        path of the AIR SDK directory.
+               
+    *2) The Adobe Flash Player content debuggers can be found here:
+            http://www.adobe.com/support/flashplayer/downloads.html
+            
+        On Windows, set FLASHPLAYER_DEBUGGER to the absolute path of FlashPlayerDebugger.exe
+        
+        On the Mac, set FLASHPLAYER_DEBUGGER to the absolute path of 
+        Flash Player Debugger.app/Contents/MacOS/Flash Player Debugger
+        
+        On Linux, set set FLASHPLAYER_DEBUGGER to the absolute path of flashplayerdebugger
+            
+    *3) The Adobe Flash Player playerglobal.swc for 11.1 can be downloaded from:
+            http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc 
+        
+        Use URL above to download playerglobal11_1.swc. Create the directory, player/11.1
+        and copy playerglobal11_1.swc to player/11.1/playerglobal.swc.
         
+        Set PLAYERGLOBAL_HOME to the absolute path of the player directory. The 
+        target-version option controls which PLAYERGLOBAL_HOME subdirectory is used.
+
+FlashPlayer Configuration
+-------------------------
+
     For testing, the Flash Player's mm.cfg file must have the following entries
     
         ErrorReportingEnable=1
@@ -129,16 +140,18 @@ Building the Source
         cd <flex.dir>
         ant main        (or just ant since the default target is main)
     
-    to download the thirdparty dependencies and build all the sources.  Since the thirdparty
-    dependencies take a little while to download and they don't change very often, they are not
-    cleaned with the regular clean target.  They thirdparty dependencies be found in the "in" 
-    directory.
+    to download the thirdparty dependencies and build the source.  Since the 
+    thirdparty dependencies take a little while to download and they don't change very 
+    often, they are not cleaned with the regular clean target.  The thirdparty 
+    dependencies can be found in the "in" directory.
     
-    To clean the build, of everything other than the downloaded third-party dependencies use
+    To clean the build, of everything other than the downloaded third-party dependencies 
+    use
     
         ant clean 
     
-    To clean the build, of everything, including the downloaded third-party dependencies use
+    To clean the build, of everything, including the downloaded third-party dependencies 
+    use
         
         ant super-clean (which is just thirdparty-clean followed by clean)
         
@@ -147,16 +160,7 @@ Building the Source
         ant release
     
     The output distros can be found in the "out" subdirectory.
-    
-    To download the dependencies use
-    
-        ant thirdparty-downloads
             
-    To clean the build ofjust the downloaded third-party dependencies use
-    
-        ant thirdparty-clean
-        
     To get a brief listing of all the targets type
     
-        ant help
-        
+        ant -projecthelp

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Wed May 30 14:23:33 2012
@@ -45,7 +45,7 @@
     <property name="kit.prefix" value="apache-flex-sdk-${release.version}-incubating"/>
     <property name="source.kit" value="${kit.prefix}-src.zip"/>
     <property name="binary.kit" value="${kit.prefix}-bin.zip"/>
-    
+        
     <!-- 
         For conditions, properties are set or not set.  The value doesn't matter.
     -->    
@@ -98,6 +98,7 @@
     -->
     <target name="thirdparty-downloads" description="Downloads all the required thirdparty code.">
         <ant dir="${basedir}/modules" target="thirdparty-downloads"/>
+        <property name="blazeds.donot.ask" value="set"/>
         <ant dir="${basedir}/frameworks" target="thirdparty-downloads"/>
     </target>
 
@@ -106,16 +107,30 @@
     <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" unless="PLAYERGLOBAL_HOME.set"
+    <target name="check-playerglobal-home" unless="playerglobal.swc.exists"
         description="Check PLAYERGLOBAL for both a directory and a swc file">
 
         <echo message="PLAYERGLOBAL_HOME is ${env.PLAYERGLOBAL_HOME}"/>
+        <echo message="playerglobal.version is ${playerglobal.version}"/>
 
-        <available file="${env.PLAYERGLOBAL_HOME}/playerglobal.swc" type="file" 
+        <available file="${env.PLAYERGLOBAL_HOME}" 
+            type="dir" 
             property="PLAYERGLOBAL_HOME.set"/>
-        
-        <fail message="The environment variable PLAYERGLOBAL_HOME must be set to a valid directory that contains playerglobal.swc" 
+
+        <fail message="The environment variable PLAYERGLOBAL_HOME is not set to a directory" 
             unless="PLAYERGLOBAL_HOME.set"/>
+
+        <property name="playerglobal.swc" 
+            value="${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc"/>
+
+        <available file="${playerglobal.swc}" 
+            type="file" 
+            property="playerglobal.swc.exists"/>
+        
+        <fail message="The file ${playerglobal.swc} does not exist" 
+            unless="playerglobal.swc.exists"/>
+            
+        <echo message="playerglobal.swc is ${playerglobal.swc}"/>
     </target>
     
     <target name="check-air-home" unless="AIR_HOME.set"
@@ -484,10 +499,11 @@
     </target>
     
     <target name="stage-modules" unless="no.modules">
-        <!-- modules -->
+            <!-- modules -->
         <copy todir="${basedir}/temp/modules" includeEmptyDirs="false">
             <fileset dir="${basedir}/modules">
                 <include name="**"/>
+                <exclude name="thirdparty/**"/>
                 <exclude name="**/*.jar"/>
                 <exclude name="**/*.vms"/>
                 <exclude name="*/test/**"/>
@@ -498,7 +514,16 @@
                 <exclude name="compiler/**/Token.java"/>
                 <exclude name="compiler/**/TokenManager.java"/>
                 <exclude name="compiler/**/TokenMgrError.java"/>
-                <exclude name="thirdparty/*/merged/**"/>
+                <exclude name="**/classes/**"/>
+                <exclude name="**/.classpath"/>
+                <exclude name="**/.project"/>
+            </fileset>
+        </copy>  
+
+        <!-- modules/thirdparty -->
+        <copy todir="${basedir}/temp/modules/thirdparty" includeEmptyDirs="false">
+            <fileset dir="${basedir}/modules/thirdparty">
+                <include name="**"/>
                 <exclude name="**/classes/**"/>
                 <exclude name="**/.classpath"/>
                 <exclude name="**/.project"/>

Modified: incubator/flex/trunk/env-template.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/env-template.properties?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/env-template.properties (original)
+++ incubator/flex/trunk/env-template.properties Wed May 30 14:23:33 2012
@@ -53,7 +53,17 @@
 #env.FLASHPLAYER_DEBUGGER=
 
 #
-# Set this to the directory that contains the Adobe Flash Player playerglobal.swc.
+# PLAYERGLOBAL_HOME is a directory which contains one or more subdirectories.
+# The name of each subdirectory corresponds to a supported target player version and
+# in each of the subdirectories is the playerglobal.swc that corresponds to that target 
+# player.  The default 
+# 
+# For this sample directory structure, set PLAYERGLOBAL_HOME to the full path of the
+# player directory.
+#
+#       - player (dir)
+#           - 11.1 (dir)
+#               playerglobal.swc (file)
 #
 #env.PLAYERGLOBAL_HOME=
 

Added: incubator/flex/trunk/frameworks/README
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/README?rev=1344272&view=auto
==============================================================================
--- incubator/flex/trunk/frameworks/README (added)
+++ incubator/flex/trunk/frameworks/README Wed May 30 14:23:33 2012
@@ -0,0 +1,29 @@
+Apache Flex (Flex) Binary Distribution
+======================================
+
+The source for the framework is included in the binary distribution.  It can be useful
+if you wish to debug and/or extend components.
+
+Use ../README to complete the "Install Prerequisites" and "FlashPlayer Configuration".
+
+Building the Framework
+----------------------
+
+    When you have all the prerequisites in place and the environment variables set, use
+
+        ant main        (or just ant since the default target is main)
+    
+    to download the thirdparty dependencies and build the Flex framework.  Since the 
+    thirdparty dependencies take a little while to download and they don't change very 
+    often, they are not cleaned with the regular clean target.  The thirdparty 
+    dependencies can be found in the "in" directory.
+    
+    To clean the build, of everything other than the downloaded third-party dependencies 
+    use
+    
+        ant clean 
+    
+    To clean the build, of everything, including the downloaded third-party dependencies 
+    use
+        
+        ant super-clean (which is just thirdparty-clean followed by clean)
\ No newline at end of file

Propchange: incubator/flex/trunk/frameworks/README
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/flex/trunk/frameworks/build_framework.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build_framework.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build_framework.xml (original)
+++ incubator/flex/trunk/frameworks/build_framework.xml Wed May 30 14:23:33 2012
@@ -32,7 +32,8 @@
     <property name="build.number" value="0"/>
 
     <property environment="env"/>    
-    <property name="playerglobal.dir" value="${env.PLAYERGLOBAL_HOME}"/>
+    <property name="playerglobal.version" value="11.1"/>
+    <property name="playerglobal.dir" value="${env.PLAYERGLOBAL_HOME}/${playerglobal.version}"/>
     <property name="airsdk.dir" value="${env.AIR_HOME}"/>
     
     <property name="locale" value="en_US"/>
@@ -55,7 +56,6 @@
     <property name="mobiletheme.dir" value="${projects.dir}/mobiletheme"/>
     <property name="wireframe.dir" value="${projects.dir}/wireframe"/>
     <property name="compc.jvm.args" value="-Xmx384m" />
-    <property name="playerglobal.version" value="11.1"/>
     
     <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
 
@@ -73,14 +73,30 @@
     <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"
+    <target name="check-playerglobal-home" unless="playerglobal.swc.exists"
         description="Check PLAYERGLOBAL for both a directory and a swc file">
 
-        <available file="${env.PLAYERGLOBAL_HOME}/playerglobal.swc" type="file" 
+        <echo message="PLAYERGLOBAL_HOME is ${env.PLAYERGLOBAL_HOME}"/>
+        <echo message="playerglobal.version is ${playerglobal.version}"/>
+
+        <available file="${env.PLAYERGLOBAL_HOME}" 
+            type="dir" 
             property="PLAYERGLOBAL_HOME.set"/>
-        
-        <fail message="The environemnt variable PLAYERGLOBAL_HOME must be set to a valid directory that contains playerglobal.swc" 
+
+        <fail message="The environment variable PLAYERGLOBAL_HOME is not set to a directory" 
             unless="PLAYERGLOBAL_HOME.set"/>
+
+        <property name="playerglobal.swc" 
+            value="${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc"/>
+
+        <available file="${playerglobal.swc}" 
+            type="file" 
+            property="playerglobal.swc.exists"/>
+        
+        <fail message="The file ${playerglobal.swc} does not exist" 
+            unless="playerglobal.swc.exists"/>
+            
+        <echo message="playerglobal.swc is ${playerglobal.swc}"/>
     </target>
     
     <target name="check-air-home"

Modified: incubator/flex/trunk/frameworks/flex-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/flex-config.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/flex-config.xml (original)
+++ incubator/flex/trunk/frameworks/flex-config.xml Wed May 30 14:23:33 2012
@@ -58,7 +58,7 @@
       <!-- List of SWC files or directories to compile against but to omit from -->
       <!-- linking.                                                             -->
       <external-library-path>
-          <path-element>{playerglobalHome}/playerglobal.swc</path-element>
+          <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
       </external-library-path>
 
       <!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -78,7 +78,7 @@
          <path-element>libs</path-element>
          <path-element>libs/mx</path-element>
          <path-element>locale/{locale}</path-element>
-         <path-element>{playerglobalHome}</path-element>
+         <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml Wed May 30 14:23:33 2012
@@ -48,7 +48,7 @@
 					<include-libraries/>
 					<library-path/>
 					<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-						<include name="playerglobal.swc"/>
+						<include name="${playerglobal.version}/playerglobal.swc"/>
 					</external-library-path>
 					<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 						<include name="framework.swc"/>
@@ -204,7 +204,7 @@
 			<source-path path-element="${basedir}/src"/>
 			<library-path />
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airframework/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/airframework/build.xml Wed May 30 14:23:33 2012
@@ -60,7 +60,7 @@
 			<include-libraries/>
 			<library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
                 <include name="framework.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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airspark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/airspark/build.xml Wed May 30 14:23:33 2012
@@ -50,7 +50,7 @@
                     <include-libraries/>
                     <library-path/>
                     <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                        <include name="playerglobal.swc"/>
+                        <include name="${playerglobal.version}/playerglobal.swc"/>
                     </external-library-path>
                     <external-library-path dir="${FLEX_HOME}/frameworks/libs">
                         <include name="framework.swc"/> 

Modified: incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/authoringsupport/build.xml Wed May 30 14:23:33 2012
@@ -69,7 +69,7 @@
 				<include name="FlexContentHolderThumbnail.swc"/>
 			</library-path>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.swc"/>
@@ -109,7 +109,7 @@
 		    <compiler.source-path path-element="${basedir}/src"/>
 		    <doc-classes class="AuthoringSupportClasses"/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
 		    <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 		    	<include name="framework.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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation/build.xml Wed May 30 14:23:33 2012
@@ -48,7 +48,7 @@
 				<include-libraries/>
 				<library-path/>
                 <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                    <include name="playerglobal.swc"/>
+                    <include name="${playerglobal.version}/playerglobal.swc"/>
                 </external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 					<include name="framework.swc"/>
@@ -173,7 +173,7 @@
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_airspark/build.xml Wed May 30 14:23:33 2012
@@ -46,7 +46,7 @@
 				<include-libraries/>
 				<library-path/>
                 <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                    <include name="playerglobal.swc"/>
+                    <include name="${playerglobal.version}/playerglobal.swc"/>
                 </external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 					<include name="framework.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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_dmv/build.xml Wed May 30 14:23:33 2012
@@ -60,7 +60,7 @@
 			<source-path path-element="${FLEX_HOME}/frameworks/projects/automation/src"/>
 			<library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_flashflexkit/build.xml Wed May 30 14:23:33 2012
@@ -74,7 +74,7 @@
 			<include-classes>AutomationFlashFlexKitClasses</include-classes>
 			<source-path path-element="${basedir}/src"/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/automation_spark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/automation_spark/build.xml Wed May 30 14:23:33 2012
@@ -60,7 +60,7 @@
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
                 <include name="framework.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/charts/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/charts/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/charts/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/charts/build.xml Wed May 30 14:23:33 2012
@@ -52,7 +52,7 @@
                     <include-libraries/>
                     <library-path/>
                     <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                        <include name="playerglobal.swc"/>
+                        <include name="${playerglobal.version}/playerglobal.swc"/>
                     </external-library-path>
                     <external-library-path dir="${FLEX_HOME}/frameworks/libs">
                         <include name="framework.swc"/>
@@ -208,7 +208,7 @@
             <source-path path-element="${basedir}/src"/>
             <library-path />
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
                 <include name="framework.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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/core/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/core/build.xml Wed May 30 14:23:33 2012
@@ -72,7 +72,7 @@
             <load-config filename="${FLEX_HOME}/frameworks/projects/framework/framework-config.xml"/>
 			<library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
                 <include name="textLayout.swc"/>

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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/flash-integration/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/flash-integration/build.xml Wed May 30 14:23:33 2012
@@ -51,7 +51,7 @@
 					<include-libraries/>
 					<library-path/>
                     <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                        <include name="playerglobal.swc"/>
+                        <include name="${playerglobal.version}/playerglobal.swc"/>
                     </external-library-path>
 					<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 						<include name="framework.swc"/>
@@ -145,7 +145,7 @@
             <load-config filename="${FLEX_HOME}/frameworks/projects/framework/framework-config.xml"/>
 			<library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="textLayout.swc"/>
@@ -192,7 +192,7 @@
 			<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_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
 		    <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 		    	<include name="framework.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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/framework/build.xml Wed May 30 14:23:33 2012
@@ -62,7 +62,7 @@
 				<include-libraries/>
 				<library-path/>
 				<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-					<include name="playerglobal.swc"/>
+					<include name="${playerglobal.version}/playerglobal.swc"/>
 				</external-library-path>
 			</compc>
 		</sequential>
@@ -207,7 +207,7 @@
                 <include name="textLayout.swc"/>
 			</external-library-path>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
 			</external-library-path>
             <load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
 			<load-config filename="framework-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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/halo/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/halo/build.xml Wed May 30 14:23:33 2012
@@ -62,7 +62,7 @@
 			<jvmarg line="${compc.jvm.args}"/>
 			<library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml Wed May 30 14:23:33 2012
@@ -50,7 +50,7 @@
                     <include-libraries/>
                     <library-path/>
                     <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                        <include name="playerglobal.swc"/>
+                        <include name="${playerglobal.version}/playerglobal.swc"/>
                     </external-library-path>
                     <external-library-path dir="${FLEX_HOME}/frameworks/libs">
                         <include name="framework.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml Wed May 30 14:23:33 2012
@@ -67,7 +67,7 @@
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.swc"/>
@@ -105,7 +105,7 @@
 			<compiler.source-path path-element="${basedir}/src"/>
 			<doc-classes class="MobileThemeClasses"/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mx/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mx/build.xml Wed May 30 14:23:33 2012
@@ -50,7 +50,7 @@
 				<include-libraries/>
 				<library-path/>
 				<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-					<include name="playerglobal.swc"/>
+					<include name="${playerglobal.version}/playerglobal.swc"/>
 				</external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 	                <include name="framework.swc"/>
@@ -196,7 +196,7 @@
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
 			<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
                   <include name="textLayout.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/playerglobal/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/playerglobal/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/playerglobal/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/playerglobal/build.xml Wed May 30 14:23:33 2012
@@ -45,7 +45,7 @@
 					<include-libraries/>
 					<library-path/>
                     <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                        <include name="playerglobal.swc"/>
+                        <include name="${playerglobal.version}/playerglobal.swc"/>
                     </external-library-path>
 					<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 						<include name="framework.swc"/>
@@ -116,7 +116,7 @@
             <include-libraries/>
             <library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/rpc/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/rpc/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/rpc/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/rpc/build.xml Wed May 30 14:23:33 2012
@@ -55,7 +55,7 @@
 			<include-libraries/>
 			<library-path/>
 			<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
                 <include name="framework.swc"/>
@@ -204,7 +204,7 @@
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
 			<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/spark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/spark/build.xml Wed May 30 14:23:33 2012
@@ -58,7 +58,7 @@
 				<include-libraries/>
 				<library-path/>
                 <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                    <include name="playerglobal.swc"/>
+                    <include name="${playerglobal.version}/playerglobal.swc"/>
                 </external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 					<include name="framework.swc"/>
@@ -213,7 +213,7 @@
 			<source-path path-element="${basedir}/src"/>
 			<library-path />
 			<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.swc"/>

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=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml Wed May 30 14:23:33 2012
@@ -69,7 +69,7 @@
 			<source-path path-element="${basedir}/src"/>
 			<library-path />
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/sparkskins/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/sparkskins/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/sparkskins/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/sparkskins/build.xml Wed May 30 14:23:33 2012
@@ -67,7 +67,7 @@
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.swc"/>
@@ -101,7 +101,7 @@
 		    <compiler.source-path path-element="${basedir}/src"/>
 		    <doc-classes class="SparkSkinsClasses"/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
 		    <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 		    	<include name="framework.swc" />

Modified: incubator/flex/trunk/frameworks/projects/textLayout/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/textLayout/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/textLayout/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/textLayout/build.xml Wed May 30 14:23:33 2012
@@ -56,7 +56,7 @@
 				<include-libraries/>
 				<library-path/>
 				<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-					<include name="playerglobal.swc"/>
+					<include name="${playerglobal.version}/playerglobal.swc"/>
 				</external-library-path>
 				<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 					<include name="framework.swc"/>

Modified: incubator/flex/trunk/frameworks/projects/wireframe/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/wireframe/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/wireframe/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/wireframe/build.xml Wed May 30 14:23:33 2012
@@ -67,7 +67,7 @@
 			<source-path path-element="${basedir}/src"/>
 			<library-path/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
 			</external-library-path>
             <external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.swc"/>
@@ -106,7 +106,7 @@
 			<compiler.source-path path-element="${basedir}/src"/>
 			<doc-classes class="WireframeClasses"/>
             <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="playerglobal.swc"/>
+                <include name="${playerglobal.version}/playerglobal.swc"/>
             </external-library-path>
 			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.swc" />

Modified: incubator/flex/trunk/ide/flashbuilder/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/ide/flashbuilder/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/ide/flashbuilder/build.xml (original)
+++ incubator/flex/trunk/ide/flashbuilder/build.xml Wed May 30 14:23:33 2012
@@ -108,7 +108,7 @@
     
     <target name="install-playerglobal">
         <copy todir="${frameworks.dir}/libs/player/${playerglobal.version}" verbose="true">
-            <fileset file="${env.PLAYERGLOBAL_HOME}/playerglobal.swc"/> 
+            <fileset file="${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc"/> 
         </copy>
     </target>
     

Modified: incubator/flex/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/modules/build.xml (original)
+++ incubator/flex/trunk/modules/build.xml Wed May 30 14:23:33 2012
@@ -190,6 +190,7 @@
 	
     <target name="velocity" description="Build velocity-dep-1.4-flex.jar">
 		<echo message="This target should be run with Java 1.4.2_14. It doesn't work with Java 1.5."/>
+		<echo message="Note that velocity builds with several 'enum' is a keyword warnings"/>
 
 		<ant dir="${basedir}/thirdparty/velocity/build" target="jar-dep"/>
 		<copy file="${basedir}/thirdparty/velocity/bin/velocity-dep-1.4.jar"

Modified: incubator/flex/trunk/modules/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/downloads.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/modules/downloads.xml (original)
+++ incubator/flex/trunk/modules/downloads.xml Wed May 30 14:23:33 2012
@@ -49,7 +49,7 @@
 	        javacc (5.0) - BSD - http://en.wikipedia.org/wiki/BSD_licenses
 	        velocity (1.4) - Apache 2.0
 	        
-	        OSMF - MPL1.1       
+	        OSMF - Mozilla Public License, version 1.1 (MPL)      
 	-->
 	
     <property name="commons-collections.name" value="commons-collections-3.0"/>

Modified: incubator/flex/trunk/mustella/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/mustella/build.xml?rev=1344272&r1=1344271&r2=1344272&view=diff
==============================================================================
--- incubator/flex/trunk/mustella/build.xml (original)
+++ incubator/flex/trunk/mustella/build.xml Wed May 30 14:23:33 2012
@@ -84,7 +84,7 @@
     <property name="aschartspath" value="."/>
     <property name="frameworks.dir1" value="${frameworks}" />
     <property name="librarypath" value="${frameworks.dir1}/libs/framework.swc,${frameworks.dir1}/libs/charts.swc,${frameworks.dir1}/libs/rpc.swc"/>
-    <property name="external.librarypath" value="${env.PLAYERGLOBAL_HOME}/playerglobal.swc"/>
+    <property name="external.librarypath" value="${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc"/>
     <property name="rsl" value="" />
 
     <property name="coach" value="true" />



Mime
View raw message