incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1306105 [1/2] - in /incubator/flex/trunk/frameworks: ./ projects/advancedgrids/ projects/airframework/ projects/airspark/ projects/airspark/bundles/en_US/ projects/charts/ projects/flash-integration/ projects/framework/ projects/mobilecomp...
Date Wed, 28 Mar 2012 01:38:31 GMT
Author: cframpton
Date: Wed Mar 28 01:38:30 2012
New Revision: 1306105

URL: http://svn.apache.org/viewvc?rev=1306105&view=rev
Log:
Download swfobject.js and general cleanup of the build scripts, esp the clean target.  Add ignore property to frameworks for libs directory so it and its contents don't show up as unversioned files.

Added:
    incubator/flex/trunk/frameworks/projects/airspark/bundles/en_US/
Modified:
    incubator/flex/trunk/frameworks/   (props changed)
    incubator/flex/trunk/frameworks/build.xml
    incubator/flex/trunk/frameworks/build_framework.xml
    incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml
    incubator/flex/trunk/frameworks/projects/airframework/build.xml
    incubator/flex/trunk/frameworks/projects/airspark/build.xml
    incubator/flex/trunk/frameworks/projects/charts/build.xml
    incubator/flex/trunk/frameworks/projects/flash-integration/build.xml
    incubator/flex/trunk/frameworks/projects/framework/build.xml
    incubator/flex/trunk/frameworks/projects/mobilecomponents/build.xml
    incubator/flex/trunk/frameworks/projects/mx/build.xml
    incubator/flex/trunk/frameworks/projects/spark/build.xml

Propchange: incubator/flex/trunk/frameworks/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 28 01:38:30 2012
@@ -0,0 +1 @@
+libs

Modified: incubator/flex/trunk/frameworks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build.xml?rev=1306105&r1=1306104&r2=1306105&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build.xml (original)
+++ incubator/flex/trunk/frameworks/build.xml Wed Mar 28 01:38:30 2012
@@ -25,7 +25,7 @@
 -->
 <project name="frameworks" default="main" basedir=".">
 
-	<property name="FLEX_HOME" location=".."/>
+    <property name="FLEX_HOME" location=".."/>
     <property name="playerglobal.version" value="11.1"/>
 
     <!-- Required for OSX 10.6 / Snow Leopard Performance -->
@@ -45,145 +45,170 @@
         <os family="windows" />
     </condition>    
 
-	<property file="${FLEX_HOME}/build.properties"/>
-		
-	<target name="main" depends="clean,thirdparty-downloads,prepare,javascript,compile" description="Clean build of all SWCs"/>
-
-	<!-- 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
-	   property files for all the languages if we choose.
-	   
-	   Should consider updating the OSMF and TLF versions in use.
-	-->
-	
-	<target name="compile" description="Builds all SWCs but not their resource bundles">
-		<antcall target="framework"/>
+    <property file="${FLEX_HOME}/build.properties"/>
+        
+    <target name="main" depends="clean,thirdparty-downloads,prepare,javascript,compile" description="Clean build of all SWCs"/>
+
+    <!-- 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
+       property files for all the languages if we choose.
+       
+       Should consider updating the OSMF and TLF versions in use.
+    -->
+    
+    <target name="compile" description="Builds all SWCs but not their resource bundles">
+        <antcall target="framework"/>
         <antcall target="mx"/>
-		<antcall target="rpc"/>
-		<antcall target="charts"/>
-		<antcall target="advancedgrids"/>
-		<antcall target="spark"/>
-		<antcall target="sparkskins"/>
-		<antcall target="spark_dmv"/>
-		<antcall target="airframework"/>
-        <antcall target="airspark"/>		
-        <antcall target="mobilecomponents"/>		
-        <antcall target="mobiletheme"/>		
+        <antcall target="rpc"/>
+        <antcall target="charts"/>
+        <antcall target="advancedgrids"/>
+        <antcall target="spark"/>
+        <antcall target="sparkskins"/>
+        <antcall target="spark_dmv"/>
+        <antcall target="airframework"/>
+        <antcall target="airspark"/>        
+        <antcall target="mobilecomponents"/>        
+        <antcall target="mobiletheme"/>     
         <antcall target="core"/>
-		<antcall target="flash_integration"/>
-		<antcall target="authoringsupport"/>
-		<antcall target="halo"/>
-		<!--antcall target="osmf"/-->
-		<antcall target="wireframe"/>
-		<!-- need to resolve whether we can donate automation_agent.swc
+        <antcall target="flash_integration"/>
+        <antcall target="authoringsupport"/>
+        <antcall target="halo"/>
+        <antcall target="wireframe"/>
+        <!-- automation removed until sources donated to Apache -->
+        <!--
+            automation: tool was formerly qtp and tool_air was formerly qtp_air
+        -->
+        <!--
+        <antcall target="automation_agent"/>
         <antcall target="automation"/>
         <antcall target="automation_dmv"/>
         <antcall target="automation_spark"/>
         <antcall target="automation_air"/>
         <antcall target="automation_airspark"/>
         <antcall target="automation_flashflexkit"/>
+        <antcall target="tool"/>
+        <antcall target="tool_air"/>
         -->
     </target>
 
-	<target name="other.locales" description ="Builds resource SWCs for all locales">
-		<ant dir="${basedir}/projects/framework" target="other.locales"/>
-		<ant dir="${basedir}/projects/mx" target="other.locales"/>
-		<ant dir="${basedir}/projects/airframework" target="other.locales"/>
+    <target name="other.locales" description ="Builds resource SWCs for all locales">
+        <ant dir="${basedir}/projects/framework" target="other.locales"/>
+        <ant dir="${basedir}/projects/mx" target="other.locales"/>
+        <ant dir="${basedir}/projects/airframework" target="other.locales"/>
         <ant dir="${basedir}/projects/airspark" target="other.locales"/>
-		<ant dir="${basedir}/projects/rpc" target="other.locales"/>
-		<ant dir="${basedir}/projects/charts" target="other.locales"/>
-		<ant dir="${basedir}/projects/advancedgrids" target="other.locales"/>
-		<ant dir="${basedir}/projects/spark" target="other.locales"/>
-		<ant dir="${basedir}/projects/mobilecomponents" target="other.locales" />
-		<ant dir="${basedir}/projects/textLayout" target="other.locales"/>
-		<!--ant dir="${basedir}/projects/osmf" target="other.locales"/-->
-		<ant dir="${basedir}/projects/playerglobal" target="other.locales" />
-		<ant dir="${basedir}/projects/automation" target="other.locales"/>
-		<ant dir="${basedir}/projects/flash-integration" target="other.locales"/>
-	</target>
-	
-	<target name="doc" >
-		<ant dir="${basedir}/projects/framework" target="doc" />
-		<ant dir="${basedir}/projects/mx" target="doc" />
-		<ant dir="${basedir}/projects/rpc" target="doc" />
-		<ant dir="${basedir}/projects/charts" target="doc" />
-		<ant dir="${basedir}/projects/advancedgrids" target="doc" />
-		<ant dir="${basedir}/projects/spark" target="doc" />
-		<ant dir="${basedir}/projects/spark_dmv" target="doc" />
-		<ant dir="${basedir}/projects/sparkskins" target="doc" />
-		<ant dir="${basedir}/projects/airframework" target="doc" />
-	    <ant dir="${basedir}/projects/airspark" target="doc" />
-	    <ant dir="${basedir}/projects/mobilecomponents" target="doc" />
-	    <ant dir="${basedir}/projects/mobiletheme" target="doc" />
-    	<ant dir="${basedir}/projects/core" target="doc" />
-		<ant dir="${basedir}/projects/authoringsupport" target="doc" />
-        <!--ant dir="${basedir}/projects/osmf" target="doc" /-->
-		<ant dir="${basedir}/projects/wireframe" target="doc" />
-		<ant dir="${basedir}/projects/flash-integration" target="doc" />
-		<ant dir="${basedir}/projects/automation" target="doc" />
-	</target>
+        <ant dir="${basedir}/projects/rpc" target="other.locales"/>
+        <ant dir="${basedir}/projects/charts" target="other.locales"/>
+        <ant dir="${basedir}/projects/advancedgrids" target="other.locales"/>
+        <ant dir="${basedir}/projects/spark" target="other.locales"/>
+        <ant dir="${basedir}/projects/mobilecomponents" target="other.locales" />
+        <!--ant dir="${basedir}/projects/textLayout" target="other.locales"/-->
+        <ant dir="${basedir}/projects/playerglobal" target="other.locales" />
+        <ant dir="${basedir}/projects/flash-integration" target="other.locales"/>
+        <!-- removed until sources donated to Apache -->
+        <!--
+        <ant dir="${basedir}/projects/automation" target="other.locales"/>
+        <ant dir="${basedir}/projects/automation_agent" target="other.locales"/>
+        <ant dir="${basedir}/projects/tool" target="other.locales"/>
+        <ant dir="${basedir}/projects/tool_air" target="other.locales"/>
+        -->
+    </target>
+    
+    <target name="doc" >
+        <ant dir="${basedir}/projects/framework" target="doc" />
+        <ant dir="${basedir}/projects/mx" target="doc" />
+        <ant dir="${basedir}/projects/rpc" target="doc" />
+        <ant dir="${basedir}/projects/charts" target="doc" />
+        <ant dir="${basedir}/projects/advancedgrids" target="doc" />
+        <ant dir="${basedir}/projects/spark" target="doc" />
+        <ant dir="${basedir}/projects/spark_dmv" target="doc" />
+        <ant dir="${basedir}/projects/sparkskins" target="doc" />
+        <ant dir="${basedir}/projects/airframework" target="doc" />
+        <ant dir="${basedir}/projects/airspark" target="doc" />
+        <ant dir="${basedir}/projects/mobilecomponents" target="doc" />
+        <ant dir="${basedir}/projects/mobiletheme" target="doc" />
+        <ant dir="${basedir}/projects/core" target="doc" />
+        <ant dir="${basedir}/projects/authoringsupport" target="doc" />
+        <ant dir="${basedir}/projects/wireframe" target="doc" />
+        <ant dir="${basedir}/projects/flash-integration" target="doc" />
+        <!-- removed until sources donated to Apache -->
+        <!--
+        <ant dir="${basedir}/projects/automation" target="doc" />
+        -->
+    </target>
    
-	<target name="clean" description="Cleans all SWCs and their resource bundles">
-		
-		<!-- Delete AIR files and directories from 'prepare' target -->
-		<delete file="${FLEX_HOME}/AIR SDK Readme.txt"/>
-		<delete file="${FLEX_HOME}/SDK license.pdf"/>
-		<delete file="${FLEX_HOME}/bin/adl"/>
-		<delete file="${FLEX_HOME}/bin/adl.exe"/>
-		<delete file="${FLEX_HOME}/bin/adt"/>
-		<delete file="${FLEX_HOME}/bin/adt.bat"/>
-		<delete dir="${FLEX_HOME}/frameworks/libs/air"/>
-		<delete dir="${FLEX_HOME}/frameworks/projects/air"/>
-		<delete file="${FLEX_HOME}/lib/adt.jar"/>
-		<delete dir="${FLEX_HOME}/runtimes"/>
-		<delete dir="${FLEX_HOME}/samples/badge"/>
-		<delete file="${FLEX_HOME}/samples/descriptor-sample.xml"/>
-		<delete dir="${FLEX_HOME}/samples/icons"/>
-		<delete dir="${FLEX_HOME}/templates/air"/>
-		<!-- Delete output from SWC projects -->
-		<ant dir="${basedir}/projects/framework" target="clean"/>
-		<ant dir="${basedir}/projects/mx" target="clean"/>
-		<ant dir="${basedir}/projects/airframework" target="clean"/>
+    <target name="super-clean" depends="thirdparty-clean,clean" description="Cleans everything including thirdparty downloads."/>
+
+    <target name="clean" description="Cleans all SWCs and their resource bundles">
+        
+        <!-- Delete AIR files and directories from 'prepare' target -->
+        <delete file="${FLEX_HOME}/AIR SDK Readme.txt"/>
+        <delete file="${FLEX_HOME}/SDK license.pdf"/>
+        <delete file="${FLEX_HOME}/bin/adl"/>
+        <delete file="${FLEX_HOME}/bin/adl.exe"/>
+        <delete file="${FLEX_HOME}/bin/adt"/>
+        <delete file="${FLEX_HOME}/bin/adt.bat"/>
+        <delete dir="${FLEX_HOME}/frameworks/libs/air"/>
+        <delete dir="${FLEX_HOME}/frameworks/projects/air"/>
+        <delete file="${FLEX_HOME}/lib/adt.jar"/>
+        <delete file="${FLEX_HOME}/lib/win/FlashRuntimeExtensions.lib"/>
+        <delete dir="${FLEX_HOME}/runtimes"/>
+        <delete dir="${FLEX_HOME}/samples/badge"/>
+        <delete file="${FLEX_HOME}/samples/descriptor-sample.xml"/>
+        <delete dir="${FLEX_HOME}/samples/icons"/>
+        <delete dir="${FLEX_HOME}/templates/air"/>
+        <delete dir="${FLEX_HOME}/templates/extensions"/>
+        <!-- Delete output from SWC projects -->
+        <ant dir="${basedir}/projects/framework" target="clean"/>
+        <ant dir="${basedir}/projects/mx" target="clean"/>
+        <ant dir="${basedir}/projects/airframework" target="clean"/>
         <ant dir="${basedir}/projects/airspark" target="clean"/>
         <ant dir="${basedir}/projects/mobilecomponents" target="clean"/>
         <ant dir="${basedir}/projects/mobiletheme" target="clean"/>
-		<ant dir="${basedir}/projects/core" target="clean"/>
-		<ant dir="${basedir}/projects/spark" target="clean"/>
-		<ant dir="${basedir}/projects/spark_dmv" target="clean"/>
-		<ant dir="${basedir}/projects/sparkskins" target="clean"/>
-		<ant dir="${basedir}/projects/authoringsupport" target="clean"/>
-		<ant dir="${basedir}/projects/halo" target="clean"/>
-		<ant dir="${basedir}/projects/wireframe" target="clean"/>
-		<ant dir="${basedir}/projects/flash-integration" target="clean"/>
-		<ant dir="${basedir}/projects/rpc" target="clean"/>
-		<ant dir="${basedir}/projects/authoringsupport" target="clean"/>
-		<ant dir="${basedir}/projects/charts" target="clean"/>
-		<ant dir="${basedir}/projects/advancedgrids" target="clean"/>
-		<ant dir="${basedir}/projects/automation" target="clean"/>
-		<ant dir="${basedir}/projects/automation_air" target="clean"/>
-		<ant dir="${basedir}/projects/automation_dmv" target="clean"/>
-		<ant dir="${basedir}/projects/automation_flashflexkit" target="clean"/>
-		<ant dir="${basedir}/projects/automation_spark" target="clean"/>
-		<ant dir="${basedir}/projects/automation_airspark" target="clean"/>
-		<ant dir="${basedir}/javascript" target="clean"/>
-		<!-- Delete empty folders -->
-		<delete dir="${basedir}/locale">
-			<exclude name="**/automation_agent_rb.swc"/>
-			<exclude name="**/metadata.properties"/>
-			<exclude name="**/qtp_air_rb.swc"/>
-		</delete>
-		<delete dir="${basedir}/libs/generated"/>
-	</target>
-	
-    <target name="thirdparty-clean" description="Cleans thirdparty downloaded files.">
+        <ant dir="${basedir}/projects/core" target="clean"/>
+        <ant dir="${basedir}/projects/spark" target="clean"/>
+        <ant dir="${basedir}/projects/spark_dmv" target="clean"/>
+        <ant dir="${basedir}/projects/sparkskins" target="clean"/>
+        <ant dir="${basedir}/projects/authoringsupport" target="clean"/>
+        <ant dir="${basedir}/projects/halo" target="clean"/>
+        <ant dir="${basedir}/projects/wireframe" target="clean"/>
+        <ant dir="${basedir}/projects/flash-integration" target="clean"/>
+        <ant dir="${basedir}/projects/rpc" target="clean"/>
+        <ant dir="${basedir}/projects/authoringsupport" target="clean"/>
+        <ant dir="${basedir}/projects/charts" target="clean"/>
+        <ant dir="${basedir}/projects/advancedgrids" target="clean"/>
+        <!-- not currently in Apache Flex -->
+        <!--
+        <ant dir="${basedir}/projects/automation_agent" target="clean"/>
+        <ant dir="${basedir}/projects/automation" target="clean"/>
+        <ant dir="${basedir}/projects/automation_air" target="clean"/>
+        <ant dir="${basedir}/projects/automation_dmv" target="clean"/>
+        <ant dir="${basedir}/projects/automation_flashflexkit" target="clean"/>
+        <ant dir="${basedir}/projects/automation_spark" target="clean"/>
+        <ant dir="${basedir}/projects/automation_airspark" target="clean"/>
+        <ant dir="${basedir}/projects/tool" target="clean"/>
+        <ant dir="${basedir}/projects/tool_air" target="clean"/>
+        <ant dir="${basedir}/javascript" target="clean"/>
+        -->
+        <!-- Delete empty folders -->
+        <delete dir="${basedir}/locale">
+            <exclude name="**/metadata.properties"/>
+        </delete>
+        <delete dir="${basedir}/libs/generated"/>
+        <!-- Delete only if it exists and it is empty.  air and swfobject put dirs here. -->
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset dir="${FLEX_HOME}/templates" excludes="**/*" />
+        </delete>    
+    </target>
+    
+    <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"/>
         </delete>
         <delete dir="${FLEX_HOME}/in/air" excludes="*.xml"/>
         <delete dir="${FLEX_HOME}/in/downloads"/>
-    	<!-- textLayout source -->
+        <!-- textLayout source -->
         <delete failonerror="false" verbose="false">
              <fileset dir="${basedir}/projects/textLayout">
                  <include name="**/**"/>
@@ -196,35 +221,35 @@
          </delete>
      </target>
 
-	<target name="prepare" description="Prepares for building framework SWCs">
-		<!-- Expand the Mac AIK on top of the SDK -->
+    <target name="prepare" depends="airsdk-download" description="Prepares for building framework SWCs">
+        <!-- Expand the Mac AIK on top of the SDK -->
         <copy file="${FLEX_HOME}/in/air/mac/AIR Integration Kit.tbz2" todir="${FLEX_HOME}" verbose="true"/>
-		<echo file="${FLEX_HOME}/air_unzip.sh">#!/bin/sh
+        <echo file="${FLEX_HOME}/air_unzip.sh">#!/bin/sh
 tar -xjf "AIR Integration Kit.tbz2" 
-		</echo>
-		<exec executable="sh" dir="${FLEX_HOME}">
-			<arg line="${FLEX_HOME}/air_unzip.sh"/>
-		</exec>
-		<delete file="${FLEX_HOME}/air_unzip.sh"/>
-		<delete file="${FLEX_HOME}/AIR Integration Kit.tbz2"/>
-		<!-- Expand the Win AIK on top of the SDK -->
-		<unzip src="${FLEX_HOME}/in/air/win/AIR Integration Kit.zip" dest="${FLEX_HOME}"/>
-		<!-- Delete AIK files that we don't put in the SDK -->
-		<delete file="${FLEX_HOME}/frameworks/libs/air/AIRAliases.js"/>
-		<delete file="${FLEX_HOME}/frameworks/libs/air/airglobal.abc"/>
-		<delete file="${FLEX_HOME}/frameworks/libs/air/servicemonitor.swf"/>
-		<delete file="${FLEX_HOME}/AIR SDK Readme.txt"/>
-		<delete dir="${FLEX_HOME}/lib/nai"/>
-		
-		<!-- Delete AIR files for 3.x support -->
-		<delete dir="${FLEX_HOME}/frameworks/libs/air/flex3" quiet="true" />
-	</target>
+        </echo>
+        <exec executable="sh" dir="${FLEX_HOME}">
+            <arg line="${FLEX_HOME}/air_unzip.sh"/>
+        </exec>
+        <delete file="${FLEX_HOME}/air_unzip.sh"/>
+        <delete file="${FLEX_HOME}/AIR Integration Kit.tbz2"/>
+        <!-- Expand the Win AIK on top of the SDK -->
+        <unzip src="${FLEX_HOME}/in/air/win/AIR Integration Kit.zip" dest="${FLEX_HOME}"/>
+        <!-- Delete AIK files that we don't put in the SDK -->
+        <delete file="${FLEX_HOME}/frameworks/libs/air/AIRAliases.js"/>
+        <delete file="${FLEX_HOME}/frameworks/libs/air/airglobal.abc"/>
+        <delete file="${FLEX_HOME}/frameworks/libs/air/servicemonitor.swf"/>
+        <delete file="${FLEX_HOME}/AIR SDK Readme.txt"/>
+        <delete dir="${FLEX_HOME}/lib/nai"/>
+        
+        <!-- Delete AIR files for 3.x support -->
+        <delete dir="${FLEX_HOME}/frameworks/libs/air/flex3" quiet="true" />
+    </target>
 
-	<!-- Download thirdparty code -->
-	
+    <!-- Download thirdparty code -->
+    
     <target name="thirdparty-downloads" 
-    	depends="airsdk-download,playerglobal-download, osmf-download, textLayout-download" 
-    	description="Copies third-party software into place for build">
+        depends="airsdk-download,playerglobal-download,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>
     
@@ -233,14 +258,18 @@ 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.">
+    <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>
-    
+   
+   <target name="swfobject-check" description="Checks if SWFObject has been downloaded.">
+        <available file="${basedir}/../templates/swfobject/swfobject.js" property="swfobject.js.present"/>
+    </target>
+
     <target name="textLayout-check" description="Checks if the Text Layout Framework has been downloaded.">
         <available file="${basedir}/libs/textLayout.swc" property="textLayout.swc.present"/>
     </target>
@@ -249,8 +278,8 @@ tar -xjf "AIR Integration Kit.tbz2" 
 
     <!-- Adobe AIR SDK  -->
     <!-- Because this requires a network connection it is copied only if it doesn't already exist. -->
-	<!-- ToDo: prepare uses both the mac and win kits.  Need to figure out why. -->
-	
+    <!-- ToDo: prepare uses both the mac and win kits.  Need to figure out why. -->
+    
     <target name="airsdk-mac-download" depends="airsdk-check" unless="airsdk.mac.present" description="Copies Adobe AIR SDK for the Mac from the Adobe website">
         <echo message="Be patient.  This takes a few minutes..." />
         <mkdir dir="${FLEX_HOME}/in/air/mac"/>
@@ -258,7 +287,7 @@ tar -xjf "AIR Integration Kit.tbz2" 
             dest="${FLEX_HOME}/in/air/mac/AIR Integration Kit.tbz2" 
             verbose="false"/>
     </target>
-	
+    
     <target name="airsdk-win-download" depends="airsdk-check" unless="airsdk.win.present" description="Copies Adobe AIR SDK for Windows from the Adobe website">
         <echo message="Be patient.  This takes a few minutes..." />
         <mkdir dir="${FLEX_HOME}/in/air/win"/>
@@ -266,7 +295,7 @@ tar -xjf "AIR Integration Kit.tbz2" 
             dest="${FLEX_HOME}/in/air/win/AIR Integration Kit.zip" 
             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">
@@ -278,7 +307,7 @@ tar -xjf "AIR Integration Kit.tbz2" 
 
     <!-- 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. -->
+    <!-- The swc at the top-level has lots of trace statements in it.  Use the one in the source zip. -->
     <target name="osmf-download" depends="osmf-check" unless="osmf.swc.present" description="Copies Text Layout Framework from Sourceforge">
         <mkdir dir="${FLEX_HOME}/in/downloads/OSMF_1.0"/>
         <get src="http://sourceforge.net/projects/osmf.adobe/files/OSMF%201.0%20%28final%20source%2C%20ASDocs%2C%20PDF%20guides%2C%20and%20release%20notes%29/OSMF_1.0.zip/download" 
@@ -290,7 +319,30 @@ tar -xjf "AIR Integration Kit.tbz2" 
         <delete dir="${FLEX_HOME}/in/downloads/OSMF_1.0" failonerror="false"/>
     </target>
 
-	<!-- textLayout.swc (Version 2.0.232) -->
+    <!-- swfobject.js (Version 2.2) -->
+    <!-- Because this requires a network connection it downloads SWFObject only if it doesn't already exist. -->
+    <target name="swfobject-download" depends="swfobject-check" unless="swfobject.js.present" description="Copies SWFObject from code.google.com">
+        <mkdir dir="${FLEX_HOME}/in/downloads/swfobject"/>
+        <get src="http://swfobject.googlecode.com/files/swfobject_2_2.zip" 
+            dest="${FLEX_HOME}/in/downloads/swfobject_2_2.zip" 
+            verbose="false"/>
+        <unzip dest="${FLEX_HOME}/in/downloads/swfobject" src="${FLEX_HOME}/in/downloads/swfobject_2_2.zip" />
+        <copy file="${FLEX_HOME}/in/downloads/swfobject/swfobject/expressInstall.swf" todir="${FLEX_HOME}/templates/swfobject"/>
+        <copy file="${FLEX_HOME}/in/downloads/swfobject/swfobject/swfobject.js" todir="${FLEX_HOME}/templates/swfobject"/>
+        <delete dir="${FLEX_HOME}/in/downloads/swfobject" failonerror="false"/>
+    </target>
+
+    <target name="swfobject-clean" description="Deletes the swfobject directory">
+        <delete dir="${FLEX_HOME}/templates/swfobject" failonerror="false">
+            <fileset dir="${FLEX_HOME}/templates/swfobject">
+                <include name="**/**"/>
+                <exclude name="history"/>
+                <exclude name="index.template.html"/>
+            </fileset>
+        </delete>
+    </target>
+    
+    <!-- textLayout.swc (Version 2.0.232) -->
     <!-- Because this requires a network connection it downloads TLF only if it doesn't already exist. -->
     <target name="textLayout-download" depends="textLayout-check" unless="textLayout.swc.present" description="Copies Text Layout Framework from Sourceforge">
         <mkdir dir="${FLEX_HOME}/in/downloads/textLayout_build"/>
@@ -310,124 +362,139 @@ tar -xjf "AIR Integration Kit.tbz2" 
         <delete dir="${FLEX_HOME}/in/downloads/textLayout_build" failonerror="false"/>
     </target>
 
-	<target name="airframework" description="Clean build of airframework.swc">
-		<ant dir="${basedir}/projects/airframework"/>
+    <target name="airframework" description="Clean build of airframework.swc">
+        <ant dir="${basedir}/projects/airframework"/>
     </target>
 
     <target name="airspark" description="Clean build of airspark.swc">
-		<ant dir="${basedir}/projects/airspark"/>
+        <ant dir="${basedir}/projects/airspark"/>
     </target>
 
     <target name="mobilecomponents" description="Clean build of mobilecomponents.swc">
-		<ant dir="${basedir}/projects/mobilecomponents"/>
+        <ant dir="${basedir}/projects/mobilecomponents"/>
     </target>
 
     <target name="mobiletheme" description="Clean build of mobile.swc">
-		<ant dir="${basedir}/projects/mobiletheme"/>
-    </target>	
+        <ant dir="${basedir}/projects/mobiletheme"/>
+    </target>   
 
     <target name="charts" description="Clean build of charts.swc">
-		<ant dir="${basedir}/projects/charts"/>
+        <ant dir="${basedir}/projects/charts"/>
     </target>
 
     <target name="advancedgrids" description="Clean build of advancedgrids.swc">
-		<ant dir="${basedir}/projects/advancedgrids"/>
+        <ant dir="${basedir}/projects/advancedgrids"/>
     </target>
-	
+    
     <target name="core" description="Clean build of core.swc">
-		<ant dir="${basedir}/projects/core"/>
+        <ant dir="${basedir}/projects/core"/>
     </target>
 
     <target name="framework" description="Clean build of framework.swc and its resource bundles">
-		<ant dir="${basedir}/projects/framework"/>
+        <ant dir="${basedir}/projects/framework"/>
     </target>
 
     <target name="halo" description="Clean build of halo.swc">
-		<ant dir="${basedir}/projects/halo"/>
+        <ant dir="${basedir}/projects/halo"/>
     </target>
 
     <target name="mx" description="Clean build of mx.swc and its resource bundles">
-		<ant dir="${basedir}/projects/mx"/>
+        <ant dir="${basedir}/projects/mx"/>
     </target>
 
     <target name="spark" description="Clean build of spark.swc">
-		<ant dir="${basedir}/projects/spark"/>
+        <ant dir="${basedir}/projects/spark"/>
     </target>
 
      <target name="sparkskins" description="Clean build of sparkskins.swc">
-		<ant dir="${basedir}/projects/sparkskins"/>
+        <ant dir="${basedir}/projects/sparkskins"/>
     </target>
 
     <target name="spark_dmv" description="Clean build of sparkskins.swc">
-		<ant dir="${basedir}/projects/spark_dmv"/>
+        <ant dir="${basedir}/projects/spark_dmv"/>
     </target>
 
     <target name="wireframe" description="Clean build of wireframe.swc">
-		<ant dir="${basedir}/projects/wireframe"/>
+        <ant dir="${basedir}/projects/wireframe"/>
     </target>
 
-	<target name="flash_integration" description="Clean build of FlexComponentBase.swc">
-		<ant dir="${basedir}/projects/flash-integration"/>
-	</target>
-	
-	 <target name="osmf" description="Clean build of osmf.swc">
-		<ant dir="${basedir}/projects/osmf"/>
-	</target>
+    <target name="flash_integration" description="Clean build of FlexComponentBase.swc">
+        <ant dir="${basedir}/projects/flash-integration"/>
+    </target>
+    
+     <target name="osmf" description="Clean build of osmf.swc">
+        <ant dir="${basedir}/projects/osmf"/>
+    </target>
 
     <target name="rpc" description="Clean build of rpc.swc">
-		<ant dir="${basedir}/projects/rpc"/>
+        <ant dir="${basedir}/projects/rpc"/>
     </target>
 
-	<!-- For debugging only.  For release, we distribute the swc built by the TLF team. -->
-	<target name="tlf" description="Clean build of textLayout.swc">
-		<ant dir="${basedir}/projects/textLayout"/>
-	</target>
-	
+    <!-- For debugging only.  For release, we distribute the swc built by the TLF team. -->
+    <target name="tlf" description="Clean build of textLayout.swc">
+        <ant dir="${basedir}/projects/textLayout"/>
+    </target>
+    
     <target name="authoringsupport" description="Clean build of authoringsupport.swc">
-		<ant dir="${basedir}/projects/authoringsupport"/>
+        <ant dir="${basedir}/projects/authoringsupport"/>
+    </target>
+
+    <target name="javascript" description="Clean build of javascript examples">
+        <!-- not currently in Apache Flex -->
+        <!--
+        <ant dir="${basedir}/javascript"/>
+        -->
+    </target>
+    
+    <target name="automation" description="Clean build of automation swc">
+        <ant dir="${basedir}/projects/automation"/>
+    </target>
+
+    <target name="automation_air" description="Clean build of automation_air swc">
+        <ant dir="${basedir}/projects/automation_air"/>
+    </target>
+    
+    <target name="automation_dmv" description="Clean build of automation_dmv swc">
+        <ant dir="${basedir}/projects/automation_dmv"/>
+    </target>
+    
+    <target name="automation_flashflexkit" description="Clean build of automation_flashflexkit swc">
+        <ant dir="${basedir}/projects/automation_flashflexkit"/>
+    </target>
+    
+    <target name="automation_spark" description="Clean build of automation_spark swc">
+        <ant dir="${basedir}/projects/automation_spark"/>
+    </target>
+    
+    <target name="automation_airspark" description="Clean build of automation_airspark swc">
+        <ant dir="${basedir}/projects/automation_airspark"/>
     </target>
 
-	<target name="javascript" description="Clean build of javascript examples">
-		<ant dir="${basedir}/javascript"/>
-	</target>
-	
-	<target name="automation" description="Clean build of automation swc">
-		<ant dir="${basedir}/projects/automation"/>
-	</target>
-
-	<target name="automation_air" description="Clean build of automation_air swc">
-		<ant dir="${basedir}/projects/automation_air"/>
-	</target>
-	
-	<target name="automation_dmv" description="Clean build of automation_dmv swc">
-		<ant dir="${basedir}/projects/automation_dmv"/>
-	</target>
-	
-	<target name="automation_flashflexkit" description="Clean build of automation_flashflexkit swc">
-		<ant dir="${basedir}/projects/automation_flashflexkit"/>
-	</target>
-	
-	<target name="automation_spark" description="Clean build of automation_spark swc">
-		<ant dir="${basedir}/projects/automation_spark"/>
-	</target>
-	
-	<target name="automation_airspark" description="Clean build of automation_airspark swc">
-		<ant dir="${basedir}/projects/automation_airspark"/>
-	</target>
+    <target name="automation_agent" description="Clean build of automation_agent swc">
+        <ant dir="${basedir}/projects/automation_agent"/>
+    </target>
+
+    <target name="tool" description="Clean build of tool swc">
+        <ant dir="${basedir}/projects/tool"/>
+    </target>
 
-<!--	
+    <target name="tool_air" description="Clean build of tool_air swc">
+        <ant dir="${basedir}/projects/tool_air"/>
+    </target>
+
+<!--    
     <target name="updateAIR" description="Rebuild a AIK SWC and SWF that depend on Flex" >
-		<property name="flex.home" value="${FLEX_HOME}" />     
-		
-		<delete dir="${basedir}/projects/air/build" quiet="true" />
-		<ant dir="${basedir}/projects/air" antfile="sample-frameworks-build.xml" target="application_updater.application_updater_ui" />
-		<copy todir="${basedir}/libs/air">
-			<fileset dir="${basedir}/projects/air/build/results">
-				<include name="applicationupdater_ui.swc"/>
-				<include name="applicationupdater_ui.swf"/>
-			</fileset>
-		</copy>
-		<delete dir="${basedir}/projects/air/build" quiet="true" />
+        <property name="flex.home" value="${FLEX_HOME}" />     
+        
+        <delete dir="${basedir}/projects/air/build" quiet="true" />
+        <ant dir="${basedir}/projects/air" antfile="sample-frameworks-build.xml" target="application_updater.application_updater_ui" />
+        <copy todir="${basedir}/libs/air">
+            <fileset dir="${basedir}/projects/air/build/results">
+                <include name="applicationupdater_ui.swc"/>
+                <include name="applicationupdater_ui.swf"/>
+            </fileset>
+        </copy>
+        <delete dir="${basedir}/projects/air/build" quiet="true" />
     </target>
 -->
 

Modified: incubator/flex/trunk/frameworks/build_framework.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build_framework.xml?rev=1306105&r1=1306104&r2=1306105&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build_framework.xml (original)
+++ incubator/flex/trunk/frameworks/build_framework.xml Wed Mar 28 01:38:30 2012
@@ -53,6 +53,7 @@
     
     <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
 
+	<!-- This does not contain the automation jars but they could be added.  -->
     <target name="main" depends="clean,thirdparty-downloads,prepare,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,authoringsupport,bundles,themes,sparkskins,spark_dmv"/>
 
     <target name="bundles" depends="framework_rb,mx_rb,spark_rb,airframework_rb,airspark_rb,mobilecomponents_rb,rpc_rb,charts_rb,advancedgrids_rb"/>
@@ -639,7 +640,7 @@
     <!-- Download thirdparty code -->
     
     <target name="thirdparty-downloads" 
-        depends="airsdk-download,playerglobal-download, osmf-download, textLayout-download" 
+        depends="airsdk-download,playerglobal-download, osmf-download, textLayout-download, swfobject-download" 
         description="Copies third-party software into place for build" />
     
     <target name="airsdk-check" description="Checks if the Air SDK has been downloaded.">
@@ -658,6 +659,10 @@
         <available file="${basedir}/libs/textLayout.swc" property="textLayout.swc.present"/>
     </target>
 
+    <target name="swfobject-check" description="Checks if SWFObject has been downloaded.">
+        <available file="${basedir}/../templates/swfobject/swfobject.js" property="swfobject.js.present"/>
+    </target>
+    
     <!-- Adobe AIR SDK  -->
     <!-- Because this requires a network connection it is copied only if it doesn't already exist. -->
     <!-- Regardless of platform use the win kit to get airglobal.swc. -->
@@ -717,6 +722,19 @@
         <delete dir="${FLEX_HOME}/in/downloads/textLayout_build" failonerror="false"/>
     </target>
 
+    <!-- swfobject.js (Version 2.2) -->
+    <!-- Because this requires a network connection it downloads SWFObject only if it doesn't already exist. -->
+    <target name="swfobject-download" depends="swfobject-check" unless="swfobject.js.present" description="Copies SWFObject from code.google.com">
+        <mkdir dir="${FLEX_HOME}/in/downloads/swfobject"/>
+        <get src="http://swfobject.googlecode.com/files/swfobject_2_2.zip" 
+            dest="${FLEX_HOME}/in/downloads/swfobject_2_2.zip" 
+            verbose="false"/>
+        <unzip dest="${FLEX_HOME}/in/downloads/swfobject" src="${FLEX_HOME}/in/downloads/swfobject_2_2.zip" />
+        <copy file="${FLEX_HOME}/in/downloads/swfobject/swfobject/expressInstall.swf" todir="${FLEX_HOME}/templates/swfobject"/>
+        <copy file="${FLEX_HOME}/in/downloads/swfobject/swfobject/swfobject.js" todir="${FLEX_HOME}/templates/swfobject"/>
+        <delete dir="${FLEX_HOME}/in/downloads/swfobject" failonerror="false"/>
+    </target>
+
     <target name="clean" depends="bundles-clean" description="Cleans all SWCs.">
         <delete failonerror="false">
             <fileset dir="${basedir}/libs">
@@ -758,6 +776,9 @@
         </delete>
         <delete dir="${basedir}/projects" includes="*/bundles.properties"/>
     </target>
+        <delete includeemptydirs="true">
+            <fileset dir="${FLEX_HOME}/templates" excludes="**/*" />
+        </delete>    
 
     <target name="thirdparty-clean" description="Cleans thirdparty downloaded files.">
         <delete failonerror="false" verbose="true">

Modified: incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml?rev=1306105&r1=1306104&r2=1306105&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/advancedgrids/build.xml Wed Mar 28 01:38:30 2012
@@ -149,6 +149,7 @@
 		<delete failonerror="false">
 			<fileset dir="${basedir}" >
 				<include name="bundles.properties"/>
+			    <include name="bundles/en_US/packages.dita"/>
 			</fileset>
 			<fileset dir="${FLEX_HOME}/frameworks/libs">
 				<include name="advancedgrids.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=1306105&r1=1306104&r2=1306105&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airframework/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/airframework/build.xml Wed Mar 28 01:38:30 2012
@@ -153,7 +153,10 @@
 			
 	<target name="clean" depends="bundles-clean">
 		<delete failonerror="false">
-			<fileset file="${basedir}/bundles.properties"/>
+			<fileset dir="${basedir}">
+				<include name="bundles.properties"/>
+			    <include name="bundles/en_US/packages.dita"/>
+			</fileset>
 			<fileset dir="${FLEX_HOME}/frameworks/libs/air">
 				<include name="airframework.swc"/>
 				<include name="airframework.swc.incr"/>

Modified: incubator/flex/trunk/frameworks/projects/airspark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/airspark/build.xml?rev=1306105&r1=1306104&r2=1306105&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/airspark/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/airspark/build.xml Wed Mar 28 01:38:30 2012
@@ -21,248 +21,251 @@
 
 <project name="airspark" default="main" basedir=".">
 
-	<property name="FLEX_HOME" location="${basedir}/../../.."/>
+    <property name="FLEX_HOME" location="${basedir}/../../.."/>
     <property file="${FLEX_HOME}/build.properties"/>
-	<property name="locale" value="en_US"/>
+    <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"/>
-				<!-- 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}/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"/>
-					<include-namespaces/>
-					<include-classes/>
-					<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/> 
-					<include-libraries/>
-					<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>
-			</sequential>
-	</macrodef>	
-	
-	<macrodef name="fat-swc">
-		<attribute name="locale"/>
-		<sequential>
-			<echo message="creating 'fat-swc' in airspark_rb.swc for @{locale}"/>
-			<mkdir dir="${basedir}/bundles/@{locale}/docs" />
-			<zip destfile="${FLEX_HOME}/frameworks/locale/@{locale}/airspark_rb.swc" update="true">
-				<zipfileset dir="${basedir}/bundles/@{locale}/docs" prefix="docs">
-					<include name="*.*"/>
-				</zipfileset>
-				<zipfileset dir="${basedir}/bundles/en_US" prefix="docs">
-					<include name="packages.dita"/>
-				</zipfileset>
-			</zip>
-		</sequential>
-	</macrodef>	
-	
-	<macrodef name="bundle-clean">
-		<attribute name="locale"/>
-		<sequential>
-			<delete failonerror="false">
-				<fileset dir="${FLEX_HOME}/frameworks/locale">
-					<include name="@{locale}/airspark_rb.swc"/>
-					<include name="@{locale}/airspark_rb.swc.incr"/>
-				</fileset>
-			</delete>
-		</sequential>
-	</macrodef>
-	
-	<macrodef name="bundler">
-		<attribute name="locale"/>
-		<element name="run.fat.swc" optional="yes"/>
-		<sequential>
-			<bundle-clean locale="@{locale}"/>
-			<bundle locale="@{locale}"/>
-			<run.fat.swc/>
-		</sequential>
-	</macrodef>
-	
-	<target name="main" depends="clean,compile" description="Clean build of airspark.swc and en_US">
-		<bundle locale="${locale}"/>
-	</target>
-
-	<target name="other.locales" depends="bundles" description="Build other locale SWCs"/>
-
-	<!-- This is a private target for building airspark_rb.swc for various locales. -->
-	<!-- The targets below set the 'locale' parameter and call it with <antcall>. -->
-	<target name="bundles">
-		<!-- these languages do not have localized docs-->
-		<bundler locale="da_DK"/><!-- Danish resources -->
-		<bundler locale="de_DE"><!-- German resources -->
-			<run.fat.swc>
-				<fat-swc locale="de_DE"/>
-			</run.fat.swc>
-		</bundler>
-		<bundler locale="es_ES"/><!-- Spanish resources -->
-		<bundler locale="fi_FI"/><!--  Finnish resources-->
-		<bundler locale="fr_FR"><!-- French resources -->
-			<run.fat.swc>
-				<fat-swc locale="fr_FR"/>
-			</run.fat.swc>
-		</bundler>
-		<bundler locale="it_IT"/><!-- Italian resources -->
-		<bundler locale="ja_JP"><!-- Japanese resources -->
-			<run.fat.swc>
-				<fat-swc locale="ja_JP"/>
-			</run.fat.swc>
-		</bundler>
-		<bundler locale="ko_KR"/><!-- Korean resources -->
-		<bundler locale="nb_NO"/><!-- Norwegian Bokmal resources -->
-		<bundler locale="nl_NL"/><!-- Dutch resources -->
-		<bundler locale="pt_BR"/><!-- Brazilian Portuguese resources -->
-		<bundler locale="ru_RU"><!-- Swedish resources -->
-			<run.fat.swc>
-				<fat-swc locale="ru_RU"/>
-			</run.fat.swc>
-		</bundler>
-		<bundler locale="sv_SE"/><!-- Swedish resources -->
-		<bundler locale="zh_CN"><!-- Simplified Chinese resources -->
-			<run.fat.swc>
-				<fat-swc locale="zh_CN"/>
-			</run.fat.swc>
-		</bundler>
-		<bundler locale="zh_TW"/><!-- Traditional Chinese resources -->
-	</target>
-	
-	<target name="clean" depends="bundles-clean">
-		<delete failonerror="false">
-			<fileset file="${basedir}/bundles.properties"/>
-			<fileset dir="${FLEX_HOME}/frameworks/libs/air">
-				<include name="airspark.swc"/>
-				<include name="airspark.swc.incr"/>
-			</fileset>
-			<!-- airspark.swc was mistakenly being compiled into this directory for awhile. -->
-			<!-- This can eventually be removed. -->
-			<fileset dir="${FLEX_HOME}/frameworks/libs">
-				<include name="airspark.swc"/>
-				<include name="airspark.swc.incr"/>
-			</fileset>
-		</delete>
-	</target>
-	
-	<target name="bundles-clean">
-		<delete failonerror="false">
-			<fileset dir="${FLEX_HOME}/frameworks/locale">
-				<include name="*/airspark_rb.swc"/>
-				<include name="*/airspark_rb.swc.incr"/>
-			</fileset>
-		</delete>
-	</target>
-
-	<target name="compile" description="Compiles airspark.swc">
-		<echo message="Compiling frameworks/libs/air/airspark.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. -->
-		<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
-		<!--
-			Link in the classes (and their dependencies) for the MXML tags
-			listed in this project's manifest.xml.
-			Also link the additional classes (and their dependencies)
-			listed in AIRSparkClasses.as,
-			because these aren't referenced by the manifest classes.
-			Compile against framework.swc, but don't link it into airspark.swc.
-			Link in accessibility support.
-			Include the appropriate CSS files and assets in the SWC.
-			Don't include any resources in the SWC.
-			Write a bundle list of referenced resource bundles
-			into the file bundles.properties in this directory.
-		-->
-		<compc fork="true"
-			   output="${FLEX_HOME}/frameworks/libs/air/airspark.swc"
-			   resource-bundle-list="${basedir}/bundles.properties">
+        <macrodef name="bundle">
+            <attribute name="locale"/>
+            <sequential>
+                <echo message="Compiling frameworks/locale/@{locale}/airspark_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. -->
+                <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
+                
+                <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"/>
+                    <include-namespaces/>
+                    <include-classes/>
+                    <source-path path-element="${FLEX_HOME}/frameworks/projects/framework/bundles/@{locale}"/> 
+                    <include-libraries/>
+                    <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>
+            </sequential>
+    </macrodef> 
+    
+    <macrodef name="fat-swc">
+        <attribute name="locale"/>
+        <sequential>
+            <echo message="creating 'fat-swc' in airspark_rb.swc for @{locale}"/>
+            <mkdir dir="${basedir}/bundles/@{locale}/docs" />
+            <zip destfile="${FLEX_HOME}/frameworks/locale/@{locale}/airspark_rb.swc" update="true">
+                <zipfileset dir="${basedir}/bundles/@{locale}/docs" prefix="docs">
+                    <include name="*.*"/>
+                </zipfileset>
+                <zipfileset dir="${basedir}/bundles/en_US" prefix="docs">
+                    <include name="packages.dita"/>
+                </zipfileset>
+            </zip>
+        </sequential>
+    </macrodef> 
+    
+    <macrodef name="bundle-clean">
+        <attribute name="locale"/>
+        <sequential>
+            <delete failonerror="false">
+                <fileset dir="${FLEX_HOME}/frameworks/locale">
+                    <include name="@{locale}/airspark_rb.swc"/>
+                    <include name="@{locale}/airspark_rb.swc.incr"/>
+                </fileset>
+            </delete>
+        </sequential>
+    </macrodef>
+    
+    <macrodef name="bundler">
+        <attribute name="locale"/>
+        <element name="run.fat.swc" optional="yes"/>
+        <sequential>
+            <bundle-clean locale="@{locale}"/>
+            <bundle locale="@{locale}"/>
+            <run.fat.swc/>
+        </sequential>
+    </macrodef>
+    
+    <target name="main" depends="clean,compile" description="Clean build of airspark.swc and en_US">
+        <bundle locale="${locale}"/>
+    </target>
+
+    <target name="other.locales" depends="bundles" description="Build other locale SWCs"/>
+
+    <!-- This is a private target for building airspark_rb.swc for various locales. -->
+    <!-- The targets below set the 'locale' parameter and call it with <antcall>. -->
+    <target name="bundles">
+        <!-- these languages do not have localized docs-->
+        <bundler locale="da_DK"/><!-- Danish resources -->
+        <bundler locale="de_DE"><!-- German resources -->
+            <run.fat.swc>
+                <fat-swc locale="de_DE"/>
+            </run.fat.swc>
+        </bundler>
+        <bundler locale="es_ES"/><!-- Spanish resources -->
+        <bundler locale="fi_FI"/><!--  Finnish resources-->
+        <bundler locale="fr_FR"><!-- French resources -->
+            <run.fat.swc>
+                <fat-swc locale="fr_FR"/>
+            </run.fat.swc>
+        </bundler>
+        <bundler locale="it_IT"/><!-- Italian resources -->
+        <bundler locale="ja_JP"><!-- Japanese resources -->
+            <run.fat.swc>
+                <fat-swc locale="ja_JP"/>
+            </run.fat.swc>
+        </bundler>
+        <bundler locale="ko_KR"/><!-- Korean resources -->
+        <bundler locale="nb_NO"/><!-- Norwegian Bokmal resources -->
+        <bundler locale="nl_NL"/><!-- Dutch resources -->
+        <bundler locale="pt_BR"/><!-- Brazilian Portuguese resources -->
+        <bundler locale="ru_RU"><!-- Swedish resources -->
+            <run.fat.swc>
+                <fat-swc locale="ru_RU"/>
+            </run.fat.swc>
+        </bundler>
+        <bundler locale="sv_SE"/><!-- Swedish resources -->
+        <bundler locale="zh_CN"><!-- Simplified Chinese resources -->
+            <run.fat.swc>
+                <fat-swc locale="zh_CN"/>
+            </run.fat.swc>
+        </bundler>
+        <bundler locale="zh_TW"/><!-- Traditional Chinese resources -->
+    </target>
+    
+    <target name="clean" depends="bundles-clean">
+        <delete failonerror="false">
+            <fileset dir="${basedir}" >
+                <include name="bundles.properties"/>
+                <include name="bundles/en_US/packages.dita"/>
+            </fileset>
+            <fileset dir="${FLEX_HOME}/frameworks/libs/air">
+                <include name="airspark.swc"/>
+                <include name="airspark.swc.incr"/>
+            </fileset>
+            <!-- airspark.swc was mistakenly being compiled into this directory for awhile. -->
+            <!-- This can eventually be removed. -->
+            <fileset dir="${FLEX_HOME}/frameworks/libs">
+                <include name="airspark.swc"/>
+                <include name="airspark.swc.incr"/>
+            </fileset>
+        </delete>
+    </target>
+    
+    <target name="bundles-clean">
+        <delete failonerror="false">
+            <fileset dir="${FLEX_HOME}/frameworks/locale">
+                <include name="*/airspark_rb.swc"/>
+                <include name="*/airspark_rb.swc.incr"/>
+            </fileset>
+        </delete>
+    </target>
+
+    <target name="compile" description="Compiles airspark.swc">
+        <echo message="Compiling frameworks/libs/air/airspark.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. -->
+        <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
+        <!--
+            Link in the classes (and their dependencies) for the MXML tags
+            listed in this project's manifest.xml.
+            Also link the additional classes (and their dependencies)
+            listed in AIRSparkClasses.as,
+            because these aren't referenced by the manifest classes.
+            Compile against framework.swc, but don't link it into airspark.swc.
+            Link in accessibility support.
+            Include the appropriate CSS files and assets in the SWC.
+            Don't include any resources in the SWC.
+            Write a bundle list of referenced resource bundles
+            into the file bundles.properties in this directory.
+        -->
+        <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"/>
-			<include-namespaces uri="library://ns.adobe.com/flex/spark"/>
-			<include-classes>AIRSparkClasses</include-classes>
-			<source-path path-element="${basedir}/src"/>
-			<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"/>
-			</external-library-path>
-			<include-file name="defaults.css" path="${basedir}/defaults.css"/>
-			<locale/>
-		        <keep-as3-metadata name="SkinPart"/>
-		        <accessible>true</accessible>
-		</compc>
-	</target>
-	
-	<target name="doc" depends="clean-temp-docs" description="updates airspark.swc with asdoc xml">
-		<!-- Load the <asdoc> 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"/>
-
-	    <condition property="asdoc.jvm.args" value="-Xmx384m">
-	        <os family="windows"/>
-	    </condition>
-
-	    <condition property="asdoc.jvm.args" value="-Xmx512m">
-	        <os family="mac"/>
-	    </condition>
-
-	    <condition property="asdoc.jvm.args" value="-Xmx512m">
-	        <os family="unix"/>
-	    </condition>
-
-		<!-- Call asdoc to generate dita xml files -->
-		<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="${FLEX_HOME}/frameworks/libs/air">
-		    	<include name="airglobal.swc" />
-		    	<include name="airframework.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" />
-			</external-library-path>
+            <target-player>11.1</target-player>
+            <jvmarg line="${compc.jvm.args}"/>
+            <namespace uri="library://ns.adobe.com/flex/spark" manifest="${basedir}/manifest.xml"/>
+            <include-namespaces uri="library://ns.adobe.com/flex/spark"/>
+            <include-classes>AIRSparkClasses</include-classes>
+            <source-path path-element="${basedir}/src"/>
+            <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"/>
+            </external-library-path>
+            <include-file name="defaults.css" path="${basedir}/defaults.css"/>
+            <locale/>
+                <keep-as3-metadata name="SkinPart"/>
+                <accessible>true</accessible>
+        </compc>
+    </target>
+    
+    <target name="doc" depends="clean-temp-docs" description="updates airspark.swc with asdoc xml">
+        <!-- Load the <asdoc> 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"/>
+
+        <condition property="asdoc.jvm.args" value="-Xmx384m">
+            <os family="windows"/>
+        </condition>
+
+        <condition property="asdoc.jvm.args" value="-Xmx512m">
+            <os family="mac"/>
+        </condition>
+
+        <condition property="asdoc.jvm.args" value="-Xmx512m">
+            <os family="unix"/>
+        </condition>
+
+        <!-- Call asdoc to generate dita xml files -->
+        <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="${FLEX_HOME}/frameworks/libs/air">
+                <include name="airglobal.swc" />
+                <include name="airframework.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" />
+            </external-library-path>
 
-		    <library-path/>
+            <library-path/>
 
             <namespace uri="library://ns.adobe.com/flex/spark" manifest="${basedir}/manifest.xml"/>
-			<doc-namespaces uri="library://ns.adobe.com/flex/spark"/>
+            <doc-namespaces uri="library://ns.adobe.com/flex/spark"/>
 
       <jvmarg line="${asdoc.jvm.args}"/>
-		</asdoc>
+        </asdoc>
 
-		<!-- updates airspark.swc with asdoc xml -->
-		<zip destfile="${FLEX_HOME}/frameworks/locale/en_US/airspark_rb.swc" update="true">
-		    <zipfileset dir="${FLEX_HOME}/tempDoc/tempdita" prefix="docs">
-			    <include name="*.*"/>
-				<exclude name="ASDoc_Config.xml"/>
-				<exclude name="overviews.xml"/>
-		    </zipfileset>
-		</zip>
-		<copy file="${FLEX_HOME}/tempDoc/tempdita/packages.dita" tofile="${basedir}/bundles/en_US/packages.dita"/> 
-	</target>
-
-	<target name="clean-temp-docs">
-		<delete dir="${FLEX_HOME}/tempDoc" failonerror="false" includeEmptyDirs="true"/>
-		<delete file="${basedir}/bundles/en_US/packages.dita" failonerror="false"/>
-	</target>
+        <!-- updates airspark.swc with asdoc xml -->
+        <zip destfile="${FLEX_HOME}/frameworks/locale/en_US/airspark_rb.swc" update="true">
+            <zipfileset dir="${FLEX_HOME}/tempDoc/tempdita" prefix="docs">
+                <include name="*.*"/>
+                <exclude name="ASDoc_Config.xml"/>
+                <exclude name="overviews.xml"/>
+            </zipfileset>
+        </zip>
+        <copy file="${FLEX_HOME}/tempDoc/tempdita/packages.dita" tofile="${basedir}/bundles/en_US/packages.dita"/> 
+    </target>
+
+    <target name="clean-temp-docs">
+        <delete dir="${FLEX_HOME}/tempDoc" failonerror="false" includeEmptyDirs="true"/>
+        <delete file="${basedir}/bundles/en_US/packages.dita" failonerror="false"/>
+    </target>
 </project>

Modified: incubator/flex/trunk/frameworks/projects/charts/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/charts/build.xml?rev=1306105&r1=1306104&r2=1306105&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/charts/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/charts/build.xml Wed Mar 28 01:38:30 2012
@@ -20,238 +20,239 @@
 <project name="charts" default="main" basedir=".">
 
     <property name="FLEX_HOME" location="${basedir}/../../.."/>
-	<property file="${FLEX_HOME}/build.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"/>
-				<!-- 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}/charts_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>10.1</target-player>
-					<jvmarg line="${compc.jvm.args}"/>
-					<include-resource-bundles bundle="charts"/>
-					<include-namespaces/>
-					<include-classes/>
-					<source-path path-element="${basedir}/bundles/@{locale}"/>
-					<source-path path-element="${FLEX_HOME}/frameworks/projects/charts/src"/>
-					<include-libraries/>
-					<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>
-		</sequential>
-	</macrodef>	
-	
-	<macrodef name="fat-swc">
-		<attribute name="locale"/>
-		<sequential>
-			<echo message="creating 'fat-swc' with en_US dita files in charts_rb.swc for @{locale}"/>
-			<mkdir dir="${basedir}/bundles/@{locale}/docs" />
-			<zip destfile="${FLEX_HOME}/frameworks/locale/@{locale}/charts_rb.swc" update="true">
-				<zipfileset dir="${basedir}/bundles/@{locale}/docs" prefix="docs">
-					<include name="*.*"/>
-				</zipfileset>
-				<zipfileset dir="${basedir}/bundles/en_US" prefix="docs">
-					<include name="packages.dita"/>
-					<include name="*.xml"/>
-				</zipfileset>
-			</zip>
-		</sequential>
-	</macrodef>
-
-	<macrodef name="bundle-clean">
-		<attribute name="locale"/>
-		<sequential>
-			<delete failonerror="false">
-				<fileset dir="${FLEX_HOME}/frameworks/locale">
-					<include name="@{locale}/charts_rb.swc"/>
-					<include name="@{locale}/charts_rb.swc.incr"/>
-				</fileset>
-			</delete>
-		</sequential>
-	</macrodef>	
-	
-	<macrodef name="bundler">
-		<attribute name="locale"/>
-		<element name="run.fat.swc" optional="yes"/>
-
-		<sequential>
-			<bundle-clean locale="@{locale}"/>
-			<bundle locale="@{locale}"/>
-			<run.fat.swc/>
-		</sequential>
-	</macrodef>
-			
-	<target name="main" depends="clean,compile" description="Clean build of charts.swc and en_US">
-		<bundle locale="${locale}"/>
-	</target>
-	
-	<target name="other.locales" depends="bundles" description="Build other locale SWCs"/>
-	
-	
-	<!-- This is a private target for building automation_flashflexkit_rb.swc for various locales. -->
-	<!-- The targets below set the 'locale' parameter and call it with <antcall>. -->
-
-	<target name="bundles">
-		<!-- these languages do not have localized docs-->
-		<bundler locale="da_DK"/><!-- Danish resources -->
-		<bundler locale="de_DE"><!-- German resources -->
-			<run.fat.swc>
-				<fat-swc locale="de_DE"/>
-			</run.fat.swc>
-		</bundler>
-		<bundler locale="es_ES"/><!-- Spanish resources -->
-		<bundler locale="fi_FI"/><!--  Finnish resources-->
-		<bundler locale="fr_FR"><!-- French resources -->
-			<run.fat.swc>
-				<fat-swc locale="fr_FR"/>
-			</run.fat.swc>
-		</bundler>
-		<bundler locale="it_IT"/><!-- Italian resources -->
-		<bundler locale="ja_JP"><!-- Japanese resources -->
-			<run.fat.swc>
-				<fat-swc locale="ja_JP"/>
-			</run.fat.swc>
-		</bundler>
-		<bundler locale="ko_KR"/><!-- Korean resources -->
-		<bundler locale="nb_NO"/><!-- Norwegian Bokmal resources -->
-		<bundler locale="nl_NL"/><!-- Dutch resources -->
-		<bundler locale="pt_BR"/><!-- Brazilian Portuguese resources -->
-		<bundler locale="ru_RU"><!-- Swedish resources -->
-			<run.fat.swc>
-				<fat-swc locale="ru_RU"/>
-			</run.fat.swc>
-		</bundler>
-		<bundler locale="sv_SE"/><!-- Swedish resources -->
-		<bundler locale="zh_CN"><!-- Simplified Chinese resources -->
-			<run.fat.swc>
-				<fat-swc locale="zh_CN"/>
-			</run.fat.swc>
-		</bundler>
-		<bundler locale="zh_TW"/><!-- Traditional Chinese resources -->
-	</target>
-	
-	<target name="clean" depends="bundles-clean">
-		<delete failonerror="false">
-			<fileset dir="${basedir}" >
-				<include name="bundles.properties"/>
-			</fileset>
-			<fileset dir="${FLEX_HOME}/frameworks/libs">
-				<include name="charts.swc"/>
-				<include name="charts.swc.incr"/>
-			</fileset>
-			<fileset dir="${FLEX_HOME}/frameworks/locale">
-				<include name="*/charts_rb.swc"/>
-				<include name="*/charts_rb.swc.incr"/>
-			</fileset>
-		</delete>
-	</target>
-	
-	<target name="bundles-clean">
-		<delete failonerror="false">
-			<fileset dir="${basedir}" >
-				<include name="bundles.properties"/>
-			</fileset>
-			<fileset dir="${FLEX_HOME}/frameworks/locale">
-				<include name="*/charts_rb.swc"/>
-				<include name="*/charts_rb.swc.incr"/>
-			</fileset>
-		</delete>
-	</target>
-		
-	<target name="compile" description="Compiles charts.swc">
-		
-		<echo message="Compiling frameworks/libs/charts.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. -->
-		<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
-		<!--
-			Link in the classes (and their dependencies) for the MXML tags
-			listed in this project's manifest.xml.
-			Also link the additional classes (and their dependencies)
-			listed in AdvancedDataGridClasses.as ChartsClasses.as,
-			because these aren't referenced by the manifest classes.
-			Link in accessibility support.
-			Include the appropriate CSS files and assets in the SWC.
-			Don't include any resources in the SWC.
-			Write a bundle list of referenced resource bundles
-			into the file bundles.properties in this directory.
-		-->
-		<compc fork="true"
-			include-classes="ChartsClasses"
-			output="${FLEX_HOME}/frameworks/libs/charts.swc"
-			resource-bundle-list="${basedir}/bundles.properties">
-			<jvmarg line="${compc.jvm.args}"/>
-			<namespace uri="library://ns.adobe.com/flex/mx" manifest="${basedir}/manifest_charts.xml"/>
-			<include-namespaces>library://ns.adobe.com/flex/mx</include-namespaces>
-			<source-path path-element="${basedir}/src"/>
-			<library-path />
-			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
+    
+    <macrodef name="bundle">
+        <attribute name="locale"/>
+            <sequential>
+                <echo message="Compiling frameworks/locale/@{locale}/charts_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. -->
+                <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
+                <compc fork="true"
+                    output="${FLEX_HOME}/frameworks/locale/@{locale}/charts_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>10.1</target-player>
+                    <jvmarg line="${compc.jvm.args}"/>
+                    <include-resource-bundles bundle="charts"/>
+                    <include-namespaces/>
+                    <include-classes/>
+                    <source-path path-element="${basedir}/bundles/@{locale}"/>
+                    <source-path path-element="${FLEX_HOME}/frameworks/projects/charts/src"/>
+                    <include-libraries/>
+                    <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>
+        </sequential>
+    </macrodef> 
+    
+    <macrodef name="fat-swc">
+        <attribute name="locale"/>
+        <sequential>
+            <echo message="creating 'fat-swc' with en_US dita files in charts_rb.swc for @{locale}"/>
+            <mkdir dir="${basedir}/bundles/@{locale}/docs" />
+            <zip destfile="${FLEX_HOME}/frameworks/locale/@{locale}/charts_rb.swc" update="true">
+                <zipfileset dir="${basedir}/bundles/@{locale}/docs" prefix="docs">
+                    <include name="*.*"/>
+                </zipfileset>
+                <zipfileset dir="${basedir}/bundles/en_US" prefix="docs">
+                    <include name="packages.dita"/>
+                    <include name="*.xml"/>
+                </zipfileset>
+            </zip>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="bundle-clean">
+        <attribute name="locale"/>
+        <sequential>
+            <delete failonerror="false">
+                <fileset dir="${FLEX_HOME}/frameworks/locale">
+                    <include name="@{locale}/charts_rb.swc"/>
+                    <include name="@{locale}/charts_rb.swc.incr"/>
+                </fileset>
+            </delete>
+        </sequential>
+    </macrodef> 
+    
+    <macrodef name="bundler">
+        <attribute name="locale"/>
+        <element name="run.fat.swc" optional="yes"/>
+
+        <sequential>
+            <bundle-clean locale="@{locale}"/>
+            <bundle locale="@{locale}"/>
+            <run.fat.swc/>
+        </sequential>
+    </macrodef>
+            
+    <target name="main" depends="clean,compile" description="Clean build of charts.swc and en_US">
+        <bundle locale="${locale}"/>
+    </target>
+    
+    <target name="other.locales" depends="bundles" description="Build other locale SWCs"/>
+    
+    
+    <!-- This is a private target for building automation_flashflexkit_rb.swc for various locales. -->
+    <!-- The targets below set the 'locale' parameter and call it with <antcall>. -->
+
+    <target name="bundles">
+        <!-- these languages do not have localized docs-->
+        <bundler locale="da_DK"/><!-- Danish resources -->
+        <bundler locale="de_DE"><!-- German resources -->
+            <run.fat.swc>
+                <fat-swc locale="de_DE"/>
+            </run.fat.swc>
+        </bundler>
+        <bundler locale="es_ES"/><!-- Spanish resources -->
+        <bundler locale="fi_FI"/><!--  Finnish resources-->
+        <bundler locale="fr_FR"><!-- French resources -->
+            <run.fat.swc>
+                <fat-swc locale="fr_FR"/>
+            </run.fat.swc>
+        </bundler>
+        <bundler locale="it_IT"/><!-- Italian resources -->
+        <bundler locale="ja_JP"><!-- Japanese resources -->
+            <run.fat.swc>
+                <fat-swc locale="ja_JP"/>
+            </run.fat.swc>
+        </bundler>
+        <bundler locale="ko_KR"/><!-- Korean resources -->
+        <bundler locale="nb_NO"/><!-- Norwegian Bokmal resources -->
+        <bundler locale="nl_NL"/><!-- Dutch resources -->
+        <bundler locale="pt_BR"/><!-- Brazilian Portuguese resources -->
+        <bundler locale="ru_RU"><!-- Swedish resources -->
+            <run.fat.swc>
+                <fat-swc locale="ru_RU"/>
+            </run.fat.swc>
+        </bundler>
+        <bundler locale="sv_SE"/><!-- Swedish resources -->
+        <bundler locale="zh_CN"><!-- Simplified Chinese resources -->
+            <run.fat.swc>
+                <fat-swc locale="zh_CN"/>
+            </run.fat.swc>
+        </bundler>
+        <bundler locale="zh_TW"/><!-- Traditional Chinese resources -->
+    </target>
+    
+    <target name="clean" depends="bundles-clean">
+        <delete failonerror="false">
+            <fileset dir="${basedir}" >
+                <include name="bundles.properties"/>
+                <include name="bundles/en_US/packages.dita"/>
+            </fileset>
+            <fileset dir="${FLEX_HOME}/frameworks/libs">
+                <include name="charts.swc"/>
+                <include name="charts.swc.incr"/>
+            </fileset>
+            <fileset dir="${FLEX_HOME}/frameworks/locale">
+                <include name="*/charts_rb.swc"/>
+                <include name="*/charts_rb.swc.incr"/>
+            </fileset>
+        </delete>
+    </target>
+    
+    <target name="bundles-clean">
+        <delete failonerror="false">
+            <fileset dir="${basedir}" >
+                <include name="bundles.properties"/>
+            </fileset>
+            <fileset dir="${FLEX_HOME}/frameworks/locale">
+                <include name="*/charts_rb.swc"/>
+                <include name="*/charts_rb.swc.incr"/>
+            </fileset>
+        </delete>
+    </target>
+        
+    <target name="compile" description="Compiles charts.swc">
+        
+        <echo message="Compiling frameworks/libs/charts.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. -->
+        <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
+        <!--
+            Link in the classes (and their dependencies) for the MXML tags
+            listed in this project's manifest.xml.
+            Also link the additional classes (and their dependencies)
+            listed in AdvancedDataGridClasses.as ChartsClasses.as,
+            because these aren't referenced by the manifest classes.
+            Link in accessibility support.
+            Include the appropriate CSS files and assets in the SWC.
+            Don't include any resources in the SWC.
+            Write a bundle list of referenced resource bundles
+            into the file bundles.properties in this directory.
+        -->
+        <compc fork="true"
+            include-classes="ChartsClasses"
+            output="${FLEX_HOME}/frameworks/libs/charts.swc"
+            resource-bundle-list="${basedir}/bundles.properties">
+            <jvmarg line="${compc.jvm.args}"/>
+            <namespace uri="library://ns.adobe.com/flex/mx" manifest="${basedir}/manifest_charts.xml"/>
+            <include-namespaces>library://ns.adobe.com/flex/mx</include-namespaces>
+            <source-path path-element="${basedir}/src"/>
+            <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="framework.swc"/>
+                <include name="rpc.swc"/>
                 <include name="textLayout.swc"/>
-			</external-library-path>
-			<include-file name="defaults.css" path="${basedir}/charts.css"/>
-			<include-file name="defaults-4.1.0.css" path="${basedir}/charts-4.X.0.css"/>
-			<include-file name="defaults-4.0.0.css" path="${basedir}/charts-4.X.0.css"/>
-			<include-file name="defaults-3.0.0.css" path="${basedir}/charts-3.0.0.css"/>
-			<locale/>
+            </external-library-path>
+            <include-file name="defaults.css" path="${basedir}/charts.css"/>
+            <include-file name="defaults-4.1.0.css" path="${basedir}/charts-4.X.0.css"/>
+            <include-file name="defaults-4.0.0.css" path="${basedir}/charts-4.X.0.css"/>
+            <include-file name="defaults-3.0.0.css" path="${basedir}/charts-3.0.0.css"/>
+            <locale/>
             <accessible>true</accessible>
-			<show-deprecation-warnings>false</show-deprecation-warnings>
-		</compc>
-	</target>
-	
-	<!-- documentation -->
-	<target name="doc" depends="clean-temp-docs" description="updates framework.swc with asdoc xml">
-		<!-- Load the <asdoc> 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"/>
-	    <condition property="asdoc.jvm.args" value="-Xmx384m">
-	        <os family="windows"/>
-	    </condition>
-	    <condition property="asdoc.jvm.args" value="-Xmx512m">
-	        <os family="mac"/>
-	    </condition>
-	    <condition property="asdoc.jvm.args" value="-Xmx512m">
-	        <os family="unix"/>
-	    </condition>
-
-		<!-- Call asdoc to generate dita xml files -->
-			<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-namespaces uri="library://ns.adobe.com/flex/mx"/>
-		    <namespace uri="library://ns.adobe.com/flex/mx" manifest="${basedir}/manifest_charts.xml"/>
-		    <jvmarg line="${asdoc.jvm.args}"/>
-		</asdoc>
+            <show-deprecation-warnings>false</show-deprecation-warnings>
+        </compc>
+    </target>
+    
+    <!-- documentation -->
+    <target name="doc" depends="clean-temp-docs" description="updates framework.swc with asdoc xml">
+        <!-- Load the <asdoc> 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"/>
+        <condition property="asdoc.jvm.args" value="-Xmx384m">
+            <os family="windows"/>
+        </condition>
+        <condition property="asdoc.jvm.args" value="-Xmx512m">
+            <os family="mac"/>
+        </condition>
+        <condition property="asdoc.jvm.args" value="-Xmx512m">
+            <os family="unix"/>
+        </condition>
+
+        <!-- Call asdoc to generate dita xml files -->
+            <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-namespaces uri="library://ns.adobe.com/flex/mx"/>
+            <namespace uri="library://ns.adobe.com/flex/mx" manifest="${basedir}/manifest_charts.xml"/>
+            <jvmarg line="${asdoc.jvm.args}"/>
+        </asdoc>
  
-		<!-- updates charts.swc with asdoc xml -->
-		<zip destfile="${FLEX_HOME}/frameworks/locale/en_US/charts_rb.swc" update="true">
-		    <zipfileset dir="${FLEX_HOME}/tempDoc/tempdita" prefix="docs">
-			    <include name="*.*"/>
-				<exclude name="ASDoc_Config.xml"/>
-				<exclude name="overviews.xml"/>
-		    </zipfileset>
-		</zip>
-		<copy file="${FLEX_HOME}/tempDoc/tempdita/packages.dita" tofile="${basedir}/bundles/en_US/packages.dita"/>
-	</target>
-
-	<target name="clean-temp-docs">
-		<delete dir="${FLEX_HOME}/tempDoc" failonerror="false" includeEmptyDirs="true"/>
-		<delete file="${basedir}/bundles/en_US/packages.dita" failonerror="false"/>
-	</target>
+        <!-- updates charts.swc with asdoc xml -->
+        <zip destfile="${FLEX_HOME}/frameworks/locale/en_US/charts_rb.swc" update="true">
+            <zipfileset dir="${FLEX_HOME}/tempDoc/tempdita" prefix="docs">
+                <include name="*.*"/>
+                <exclude name="ASDoc_Config.xml"/>
+                <exclude name="overviews.xml"/>
+            </zipfileset>
+        </zip>
+        <copy file="${FLEX_HOME}/tempDoc/tempdita/packages.dita" tofile="${basedir}/bundles/en_US/packages.dita"/>
+    </target>
+
+    <target name="clean-temp-docs">
+        <delete dir="${FLEX_HOME}/tempDoc" failonerror="false" includeEmptyDirs="true"/>
+        <delete file="${basedir}/bundles/en_US/packages.dita" failonerror="false"/>
+    </target>
 </project>

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=1306105&r1=1306104&r2=1306105&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/flash-integration/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/flash-integration/build.xml Wed Mar 28 01:38:30 2012
@@ -24,7 +24,7 @@
 	<property name="FLEX_HOME" location="${basedir}/../../.."/>
 
 	<property file="${FLEX_HOME}/build.properties"/>
-  <property name="locale" value="en_US"/>
+    <property name="locale" value="en_US"/>
 	<property name="local.playerglobal.version" value="11.1"/>
 	
 	<macrodef name="bundle">
@@ -98,7 +98,11 @@
 
 	<target name="clean" depends="bundles-clean">
 		<delete failonerror="false">
-			<fileset file="${basedir}/bundles.properties"/>
+			<fileset dir="${basedir}">
+			    <include name="bundles.properties"/>
+			    <include name="bundles/*/empty.properties"/>
+			    <exclude name="bundles/en_US/empty.properties"/>
+			</fileset>
             <fileset dir="${basedir}/libs">
                 <include name="flash-integration.swc"/>
 				<include name="flash-integration.swc.incr"/>

Modified: incubator/flex/trunk/frameworks/projects/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/build.xml?rev=1306105&r1=1306104&r2=1306105&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/framework/build.xml Wed Mar 28 01:38:30 2012
@@ -157,6 +157,7 @@
 		<delete failonerror="false">
 			<fileset dir="${basedir}" >
 				<include name="bundles.properties"/>
+			    <include name="bundles/en_US/packages.dita"/>
 			</fileset>
 			<fileset dir="${FLEX_HOME}/frameworks/libs">
 				<include name="framework.swc"/>



Mime
View raw message