Author: cframpton
Date: Fri Dec  7 21:05:56 2012
New Revision: 1418474

URL: http://svn.apache.org/viewvc?rev=1418474&view=rev
Log:
Merge 1418463 from release4.9 to develop.

Added:
    incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/da_DK/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/da_DK/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/da_DK/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/da_DK/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/de_CH/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/de_CH/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/de_CH/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/de_CH/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/de_DE/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/de_DE/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/de_DE/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/de_DE/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/el_GR/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/el_GR/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/el_GR/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/el_GR/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/en_AU/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/en_AU/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/en_AU/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/en_AU/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/en_CA/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/en_CA/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/en_CA/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/en_CA/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/en_GB/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/en_GB/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/en_GB/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/en_GB/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/en_US/
   (props changed)
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/en_US/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/en_US/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/en_US/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/es_ES/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/es_ES/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/es_ES/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/es_ES/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/fi_FI/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/fi_FI/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/fi_FI/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/fi_FI/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/fr_FR/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/fr_FR/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/fr_FR/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/fr_FR/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/it_IT/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/it_IT/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/it_IT/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/it_IT/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/ja_JP/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/ja_JP/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/ja_JP/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/ja_JP/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/ko_KR/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/ko_KR/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/ko_KR/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/ko_KR/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/nb_NO/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/nb_NO/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/nb_NO/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/nb_NO/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/nl_NL/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/nl_NL/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/nl_NL/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/nl_NL/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/pt_BR/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/pt_BR/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/pt_BR/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/pt_BR/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/pt_PT/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/pt_PT/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/pt_PT/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/pt_PT/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/ru_RU/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/ru_RU/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/ru_RU/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/ru_RU/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/sv_SE/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/sv_SE/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/sv_SE/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/sv_SE/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/zh_CN/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/zh_CN/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/zh_CN/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/zh_CN/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/zh_TW/
      - copied from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/zh_TW/
    
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/zh_TW/textLayout.properties
      - copied unchanged from r1418463, 
incubator/flex/sdk/branches/release4.9/frameworks/projects/textLayout/bundles/zh_TW/textLayout.properties
Removed:
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/da_DK/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/de_CH/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/de_DE/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/el_GR/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/en_AU/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/en_CA/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/en_GB/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/en_US/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/es_ES/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/fi_FI/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/fr_FR/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/it_IT/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/ja_JP/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/ko_KR/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/nb_NO/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/nl_NL/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/pt_BR/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/pt_PT/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/ru_RU/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/sv_SE/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/zh_CN/textLayout.properties
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundles/zh_TW/textLayout.properties
Modified:
    incubator/flex/sdk/branches/develop/   (props changed)
    incubator/flex/sdk/branches/develop/frameworks/build.xml
    
incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/compile-config.xml
    
incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/en_US/   
(props changed)
    incubator/flex/sdk/branches/develop/frameworks/projects/automation/build.xml
    
incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/en_US/
   (props changed)
    
incubator/flex/sdk/branches/develop/frameworks/projects/framework/compile-config.xml
    
incubator/flex/sdk/branches/develop/frameworks/projects/mx/compile-config.xml
    
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundle-config.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml
    
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Interaction/DataGrid_keys_basic03.mxml
    
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/column_withRenderer_test001_lastPage.png
    
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/column_withRenderer_test001_page1.png
    
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_Properties_editable.mxml
    
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_Properties_sortable.mxml
    
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_dataProvider_test002.mxml
    
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/SWFs/DataGrid_basic_001.mxml
    
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/SWFs/DataGrid_basic_002.mxml

Propchange: incubator/flex/sdk/branches/develop/
------------------------------------------------------------------------------
  Merged /incubator/flex/sdk/branches/release4.9:r1418463

Modified: incubator/flex/sdk/branches/develop/frameworks/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/build.xml?rev=1418474&r1=1418473&r2=1418474&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/build.xml Fri Dec  7 
21:05:56 2012
@@ -86,9 +86,9 @@
     -->
     
     <target name="compile" description="Builds all SWCs but not their resource 
bundles" depends="flex-config">
-        <antcall target="textLayout"/>
         <antcall target="framework"/>
         <antcall target="mx"/>
+        <antcall target="textLayout"/>
         <antcall target="rpc"/>
         <antcall target="charts"/>
         <antcall target="advancedgrids"/>
@@ -164,9 +164,9 @@
     </target>
     
     <target name="other.locales" description ="Builds resource SWCs for all 
locales">
-        <ant dir="${basedir}/projects/textLayout" target="other.locales"/>
         <ant dir="${basedir}/projects/framework" target="other.locales"/>
         <ant dir="${basedir}/projects/mx" target="other.locales"/>
+        <ant dir="${basedir}/projects/textLayout" 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"/>
@@ -185,9 +185,9 @@
     </target>
     
     <target name="doc" >
-        <ant dir="${basedir}/projects/textLayout" target="doc" />
         <ant dir="${basedir}/projects/framework" target="doc" />
         <ant dir="${basedir}/projects/mx" target="doc" />
+        <ant dir="${basedir}/projects/textLayout" target="doc" />
         <ant dir="${basedir}/projects/rpc" target="doc" />
         <ant dir="${basedir}/projects/charts" target="doc" />
         <ant dir="${basedir}/projects/advancedgrids" target="doc" />
@@ -206,7 +206,7 @@
         <!--
         <ant dir="${basedir}/projects/automation" target="doc" />
         -->
-       <ant dir="${basedir}/projects/apache" target="doc" />
+        <ant dir="${basedir}/projects/apache" target="doc" />
        <ant dir="${basedir}/projects/experimental" target="doc" />
     </target>
    

Modified: 
incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/compile-config.xml
URL: 
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/compile-config.xml?rev=1418474&r1=1418473&r2=1418474&view=diff
==============================================================================
--- 
incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/compile-config.xml
 (original)
+++ 
incubator/flex/sdk/branches/develop/frameworks/projects/advancedgrids/compile-config.xml
 Fri Dec  7 21:05:56 2012
@@ -26,7 +26,6 @@
             <path-element>../../libs/framework.swc</path-element>
             <path-element>../../libs/mx/mx.swc</path-element>
             <path-element>../../libs/rpc.swc</path-element>
-            <path-element>../../libs/textLayout.swc</path-element>
         </external-library-path>
         
         <locale/>

Propchange: 
incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/en_US/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec  7 21:05:56 2012
@@ -0,0 +1 @@
+packages.dita

Modified: 
incubator/flex/sdk/branches/develop/frameworks/projects/automation/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/automation/build.xml?rev=1418474&r1=1418473&r2=1418474&view=diff
==============================================================================
--- 
incubator/flex/sdk/branches/develop/frameworks/projects/automation/build.xml 
(original)
+++ 
incubator/flex/sdk/branches/develop/frameworks/projects/automation/build.xml 
Fri Dec  7 21:05:56 2012
@@ -182,9 +182,9 @@
 
                <!-- 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>AutomationClasses</doc-classes>
-                       
+                   <compiler.source-path path-element="${basedir}/src"/>
+                       <doc-classes>AutomationClasses</doc-classes>
+                       <external-library-path 
dir="${FLEX_HOME}/frameworks/libs/automation/automation_agent.swc"/>
                    <namespace uri="http://www.adobe.com/2006/automation_mxml"; 
manifest="${basedir}/manifest_automation.xml"/>
                    <jvmarg line="${asdoc.jvm.args}"/>
                </asdoc>

Propchange: 
incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/en_US/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec  7 21:05:56 2012
@@ -0,0 +1 @@
+packages.dita

Modified: 
incubator/flex/sdk/branches/develop/frameworks/projects/framework/compile-config.xml
URL: 
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/framework/compile-config.xml?rev=1418474&r1=1418473&r2=1418474&view=diff
==============================================================================
--- 
incubator/flex/sdk/branches/develop/frameworks/projects/framework/compile-config.xml
 (original)
+++ 
incubator/flex/sdk/branches/develop/frameworks/projects/framework/compile-config.xml
 Fri Dec  7 21:05:56 2012
@@ -23,7 +23,6 @@
         
         <external-library-path>
             
<path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
-            <path-element>../../libs/textLayout.swc</path-element>
         </external-library-path>
         
         <keep-as3-metadata>

Modified: 
incubator/flex/sdk/branches/develop/frameworks/projects/mx/compile-config.xml
URL: 
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/mx/compile-config.xml?rev=1418474&r1=1418473&r2=1418474&view=diff
==============================================================================
--- 
incubator/flex/sdk/branches/develop/frameworks/projects/mx/compile-config.xml 
(original)
+++ 
incubator/flex/sdk/branches/develop/frameworks/projects/mx/compile-config.xml 
Fri Dec  7 21:05:56 2012
@@ -24,7 +24,6 @@
         <external-library-path>
             
<path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
             <path-element>../../libs/framework.swc</path-element>
-            <path-element>../../libs/textLayout.swc</path-element>
         </external-library-path>
         
         <keep-as3-metadata>

Modified: 
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundle-config.xml
URL: 
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundle-config.xml?rev=1418474&r1=1418473&r2=1418474&view=diff
==============================================================================
--- 
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundle-config.xml 
(original)
+++ 
incubator/flex/sdk/branches/develop/frameworks/projects/spark/bundle-config.xml 
Fri Dec  7 21:05:56 2012
@@ -52,7 +52,6 @@
         <bundle>collections</bundle>
         <bundle>components</bundle>
         <bundle>sparkEffects</bundle>
-        <bundle>textLayout</bundle>
         <bundle>osmf</bundle>
     </include-resource-bundles>
         

Modified: 
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml?rev=1418474&r1=1418473&r2=1418474&view=diff
==============================================================================
--- 
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml 
(original)
+++ 
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml 
Fri Dec  7 21:05:56 2012
@@ -52,7 +52,8 @@
                 <arg value="+playerglobal.version=${playerglobal.version}" />
                 <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
                 <arg value="+locale=@{locale}" />
-                <arg value="+srcdir=${source.dir}" />
+                <!-- this is the directory the bundles dir is in -->
+                <arg value="+srcdir=${basedir}" />
                        </compc>
                </sequential>
        </macrodef>     
@@ -94,13 +95,9 @@
                
                                
        <target name="main" depends="clean,compile" description="Clean build of 
textLayout.swc">
-               <!--bundle locale="${locale}"/-->
+               <bundle locale="${locale}"/>
        </target>
        
-       <!--target name="other.locales" description="Build other locale SWCs">
-           <echo message="There are no locales for textLayout."/>
-       </target-->
-       
        <target name="other.locales" depends="bundles" description="Build other 
locale SWCs"/>
        
        <!-- This is a private target for building automation_rb.swc for 
various locales. -->
@@ -192,6 +189,9 @@
     </target>
 
     <target name="doc" depends="clean-temp-docs" description="updates 
textLayout.swc with asdoc xml">
+        <available 
file="${FLEX_HOME}/frameworks/locale/en_US/textLayout_rb.swc" 
property="resource.exists"/>
+        <fail message="${FLEX_HOME}/frameworks/locale/en_US/textLayout_rb.swc 
does not exist." unless="resource.exists"/> 
+        
         <!-- 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"/>
@@ -223,7 +223,7 @@
                        <define name="CONFIG::release" value="${rel}"/>
         </asdoc>
 
-        <!-- updates textLayout.swc with asdoc xml -->
+        <!-- updates textLayout_rb.swc with asdoc xml -->
         <zip destfile="${FLEX_HOME}/frameworks/locale/en_US/textLayout_rb.swc" 
update="true">
             <zipfileset dir="${FLEX_HOME}/tempDoc/tempdita" prefix="docs">
                 <include name="*.*"/>

Propchange: 
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/bundles/en_US/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec  7 21:05:56 2012
@@ -0,0 +1 @@
+packages.dita


Reply via email to