incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject svn commit: r1425859 - in /incubator/flex/sdk/branches/develop: ./ frameworks/ frameworks/projects/apache/ frameworks/projects/apache/bundles/de_DE/ frameworks/projects/apache/bundles/fi_FI/ frameworks/projects/apache/bundles/fr_AR/ frameworks/projects...
Date Wed, 26 Dec 2012 09:10:55 GMT
Author: jmclean
Date: Wed Dec 26 09:10:54 2012
New Revision: 1425859

URL: http://svn.apache.org/viewvc?rev=1425859&view=rev
Log:
Merged with Apache Flex 4.9 release branch

Added:
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/de_DE/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/de_DE/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/de_DE/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/de_DE/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/fi_FI/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/fi_FI/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/fi_FI/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/fi_FI/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/fr_AR/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/fr_AR/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/fr_AR/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/fr_AR/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/it_IT/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/it_IT/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/it_IT/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/it_IT/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/ja_JP/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/ja_JP/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/ja_JP/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/ja_JP/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/ko_KR/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/ko_KR/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/ko_KR/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/ko_KR/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/nb_NO/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/nb_NO/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/nb_NO/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/nb_NO/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/nl_NL/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/nl_NL/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/nl_NL/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/nl_NL/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/pt_BR/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/pt_BR/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/pt_BR/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/pt_BR/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/pt_PT/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/pt_PT/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/pt_PT/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/pt_PT/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/ru_RU/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/ru_RU/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/ru_RU/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/ru_RU/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/sv_SE/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/sv_SE/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/sv_SE/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/sv_SE/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/zh_CN/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/zh_CN/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/zh_CN/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/zh_CN/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/zh_TW/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/zh_TW/
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/bundles/zh_TW/apache.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/bundles/zh_TW/apache.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/de_CH/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/de_CH/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/de_CH/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/de_CH/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/de_DE/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/de_DE/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/de_DE/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/de_DE/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/en_AU/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/en_AU/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/en_AU/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/en_AU/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/en_CA/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/en_CA/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/en_CA/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/en_CA/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/en_GB/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/en_GB/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/en_GB/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/en_GB/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/en_US/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/en_US/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/es_ES/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/es_ES/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/es_ES/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/es_ES/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/fi_FI/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/fi_FI/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/fi_FI/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/fi_FI/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/fr_AR/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/fr_AR/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/fr_AR/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/fr_AR/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/it_IT/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/it_IT/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/it_IT/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/it_IT/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/ja_JP/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/ja_JP/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/ja_JP/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/ja_JP/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/ko_KR/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/ko_KR/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/ko_KR/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/ko_KR/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/nb_NO/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/nb_NO/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/nb_NO/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/nb_NO/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/nl_NL/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/nl_NL/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/nl_NL/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/nl_NL/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/pt_BR/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/pt_BR/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/pt_BR/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/pt_BR/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/pt_PT/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/pt_PT/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/pt_PT/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/pt_PT/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/ru_RU/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/ru_RU/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/ru_RU/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/ru_RU/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/sv_SE/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/sv_SE/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/sv_SE/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/sv_SE/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/zh_CN/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/zh_CN/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/zh_CN/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/zh_CN/experimental.properties
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/zh_TW/
      - copied from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/zh_TW/
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/zh_TW/experimental.properties
      - copied unchanged from r1425808, incubator/flex/sdk/branches/release4.9/frameworks/projects/experimental/bundles/zh_TW/experimental.properties
Removed:
    incubator/flex/sdk/branches/develop/DISCLAIMER
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundles/en_US/empty.properties
Modified:
    incubator/flex/sdk/branches/develop/   (props changed)
    incubator/flex/sdk/branches/develop/build.xml
    incubator/flex/sdk/branches/develop/frameworks/build_framework.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/apache/compile-config.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/automation_agent/build.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundle-config.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/core/UITextField.as
  (props changed)
    incubator/flex/sdk/branches/develop/frameworks/projects/rpc/build.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml
    incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml

Propchange: incubator/flex/sdk/branches/develop/
------------------------------------------------------------------------------
  Merged /incubator/flex/sdk/branches/release4.9:r1421329-1421399,1421401-1421997,1421999-1422139

Modified: incubator/flex/sdk/branches/develop/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/build.xml?rev=1425859&r1=1425858&r2=1425859&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/build.xml (original)
+++ incubator/flex/sdk/branches/develop/build.xml Wed Dec 26 09:10:54 2012
@@ -811,8 +811,10 @@
                 <include name="air/airframework.swc"/>
                 <include name="air/airspark.swc"/>
                 <include name="mobile/mobilecomponents.swc"/>
+                <include name="apache.swc"/>
                 <include name="authoringsupport.swc"/>
                 <include name="core.swc"/>
+                <include name="experimental.swc"/>
                 <include name="spark.swc"/>
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
@@ -825,8 +827,6 @@
                 <include name="spark_dmv.swc"/>
             	<include name="textLayout.swc"/>
                 <exclude name="osmf.swc"/>
-            	<exclude name="apache.swc"/>
-                <include name="experimental.swc"/>
             </fileset>
         </copy>
 

Modified: incubator/flex/sdk/branches/develop/frameworks/build_framework.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/build_framework.xml?rev=1425859&r1=1425858&r2=1425859&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/build_framework.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/build_framework.xml Wed Dec 26 09:10:54
2012
@@ -55,8 +55,11 @@
     <property name="rpc.dir" value="${projects.dir}/rpc"/>
     <property name="spark.dir" value="${projects.dir}/spark"/>
     <property name="sparkskin.dir" value="${projects.dir}/sparkskins"/>
-    <property name="spark_dmv.dir" value="${projects.dir}/spark_dmv"/>
-    <property name="textLayout.dir" value="${projects.dir}/textLayout/3.0.33"/>
+	<property name="spark_dmv.dir" value="${projects.dir}/spark_dmv"/>
+	<property name="apache.dir" value="${projects.dir}/apache"/>
+	<property name="experimental.dir" value="${projects.dir}/experimental"/>
+    <property name="textLayout.dir" value="${projects.dir}/textLayout"/>
+    <property name="textLayout.ver.dir" value="${textLayout.dir}/${tlf.version}"/>
     <property name="experimental.dir" value="${projects.dir}/experimental"/>
 
     <!-- automation -->
@@ -79,9 +82,9 @@
     
     <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar;${FLEX_HOME}/lib/flexTasks.jar"/>
 
-    <target name="main" depends="check-compile-env,clean,thirdparty-downloads,prepare,textLayout,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,automation-swcs,bundles,themes,sparkskins,spark_dmv,experimental"/>
+    <target name="main" depends="check-compile-env,clean,thirdparty-downloads,prepare,textLayout,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,automation-swcs,bundles,themes,sparkskins,spark_dmv,apache,experimental"/>
 
-    <target name="bundles" depends="framework_rb,mx_rb,spark_rb,airframework_rb,airspark_rb,mobilecomponents_rb,rpc_rb,charts_rb,advancedgrids_rb,automation-rbs"/>
+    <target name="bundles" depends="framework_rb,mx_rb,textLayout_rb,spark_rb,airframework_rb,airspark_rb,mobilecomponents_rb,rpc_rb,charts_rb,advancedgrids_rb,automation-rbs,apache_rb,experimental_rb"/>
     
     <target name="automation-swcs" 
         depends="automation_agent,automation_dmv,tool,tool_air,automation,automation_air,automation_spark,automation_flashflexkit,automation_air,automation_airspark"
@@ -807,7 +810,6 @@
             <include-resource-bundles bundle="components"/>
             <include-resource-bundles bundle="sparkEffects"/>
             <include-resource-bundles bundle="layout"/>
-            <include-resource-bundles bundle="textLayout"/>
             <include-resource-bundles bundle="osmf"/>
             <source-path path-element="${spark.dir}/bundles/${locale}"/>
             <source-path path-element="${spark.dir}/src"/>
@@ -870,16 +872,30 @@
 			<jvmarg line="${compc.jvm.args}"/>
 			<keep-as3-metadata>IMXMLObject</keep-as3-metadata>
 			<include-namespaces uri="library://ns.adobe.com/flashx/textLayout"/>
-			<namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${textLayout.dir}/manifest.xml"/>
-			<source-path path-element="${textLayout.dir}/src"/>
+			<namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${textLayout.ver.dir}/manifest.xml"/>
+			<source-path path-element="${textLayout.ver.dir}/src"/>
 			<library-path/>
-			<include-file name="manifest.xml" path="${textLayout.dir}/manifest.xml"/>
+			<include-file name="manifest.xml" path="${textLayout.ver.dir}/manifest.xml"/>
 			<static-link-runtime-shared-libraries/>
 			<define name="CONFIG::debug" value="false"/>
 			<define name="CONFIG::release" value="true"/>
 		</compc>
      </target>
 
+    <target name="textLayout_rb" description="Builds default locale textLayout_rb.swc">
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}"

+            output="${basedir}/locale/${locale}/mx_rb.swc">
+            <include-resource-bundles bundle="textLayout"/>
+            <source-path path-element="${textLayout.dir}/bundles/${locale}"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <external-library-path dir="${basedir}/libs">
+                <include name="framework.swc"/>
+            </external-library-path>
+            <library-path/>
+            <jvmarg line="${compc.jvm.args}"/>
+        </compc>
+    </target>   
+    
     <target name="tool_air" description="Builds the tool_air.swc">
         <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}"
accessible="true"
             include-classes="ToolAIRClasses" output="${basedir}/libs/automation/tool_air.swc"
@@ -1019,6 +1035,78 @@
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>
+	
+    <target name="apache" description="Builds the apache.swc">
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}"
accessible="true" 
+            include-classes="ApacheClasses" output="${basedir}/libs/apache.swc"
+            resource-bundle-list="${apache.dir}/bundles.properties">
+        	<namespace uri="http://flex.apache.org/ns" manifest="${apache.dir}/manifest.xml"/>
+            <source-path path-element="${apache.dir}/src"/>
+            <library-path />
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <external-library-path dir="${basedir}/libs">
+            	<include name="mx.swc"/>
+            </external-library-path>
+            <include-file name="defaults.css" path="${mx.dir}/defaults.css"/>
+            <jvmarg line="${compc.jvm.args}"/>
+            <keep-as3-metadata name="Bindable"/>
+            <keep-as3-metadata name="Managed"/>
+            <keep-as3-metadata name="ChangeEvent"/>
+            <keep-as3-metadata name="NonCommittingChangeEvent"/>
+            <keep-as3-metadata name="Transient"/>
+        </compc>
+    </target>
+    
+    <target name="apache_rb" description="Builds default locale apache_rb.swc">
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}"

+            output="${basedir}/locale/${locale}/apache_rb.swc">
+            <include-resource-bundles bundle="apache"/>
+            <source-path path-element="${apache.dir}/bundles/${locale}"/>
+            <source-path path-element="${apache.dir}/src"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <external-library-path dir="${basedir}/libs">
+                <include name="framework.swc"/>
+            </external-library-path>
+            <library-path/>
+            <jvmarg line="${compc.jvm.args}"/>
+        </compc>
+    </target>   
+	
+    <target name="experimental" description="Builds the experimental.swc">
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}"
accessible="true" 
+            include-classes="ExperimentalClasses" output="${basedir}/libs/experimental.swc"
+            resource-bundle-list="${experimental.dir}/bundles.properties">
+            <source-path path-element="${experimental.dir}/src"/>
+            <library-path />
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <external-library-path dir="${basedir}/libs">
+            	<include name="mx.swc"/>
+            </external-library-path>
+            <include-file name="defaults.css" path="${mx.dir}/defaults.css"/>
+            <jvmarg line="${compc.jvm.args}"/>
+            <keep-as3-metadata name="Bindable"/>
+            <keep-as3-metadata name="Managed"/>
+            <keep-as3-metadata name="ChangeEvent"/>
+            <keep-as3-metadata name="NonCommittingChangeEvent"/>
+            <keep-as3-metadata name="Transient"/>
+        </compc>
+    </target>
+    
+    <target name="experimental_rb" description="Builds default locale experimental_rb.swc">
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}"

+            output="${basedir}/locale/${locale}/experimental_rb.swc">
+            <include-resource-bundles bundle="experimental"/>
+            <source-path path-element="${experimental.dir}/bundles/${locale}"/>
+            <source-path path-element="${experimental.dir}/src"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <external-library-path dir="${basedir}/libs">
+                <include name="framework.swc"/>
+            </external-library-path>
+            <library-path/>
+            <jvmarg line="${compc.jvm.args}"/>
+        </compc>
+    </target>
+
         
     <!-- Download thirdparty code -->
     
@@ -1048,7 +1136,8 @@
                 <include name="textLayout.swc"/>
                 <include name="authoringsupport.swc"/>
                 <include name="flash-integration.swc"/>
-                <include name="experimental.swc"/>
+            	<include name="apache.swc"/>
+            	<include name="experimental.swc"/>	
             </fileset>
             <fileset dir="${basedir}/libs/automation">
                 <include name="automation_agent.swc"/>
@@ -1081,7 +1170,10 @@
                 <include name="mx_rb.swc"/>
                 <include name="rpc_rb.swc"/>
                 <include name="spark_rb.swc"/>
-                <include name="tool_air_rb.swc"/>
+                <include name="textLayout_rb.swc"/>
+            	<include name="tool_air_rb.swc"/>
+            	<include name="apache_rb.swc"/>
+                <include name="experimental_rb.swc"/>
             </fileset>
         </delete>
         <delete dir="${basedir}/projects" includes="*/bundles.properties"/>

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/apache/compile-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/apache/compile-config.xml?rev=1425859&r1=1425858&r2=1425859&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/apache/compile-config.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/apache/compile-config.xml Wed
Dec 26 09:10:54 2012
@@ -51,12 +51,12 @@
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
-    </compiler>    
+    </compiler>
 
 	<include-namespaces>
 		 <uri>http://flex.apache.org/ns</uri>
 	</include-namespaces>
-	
+
     <include-classes>
         <class>ApacheClasses</class>
     </include-classes>

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/automation_agent/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/automation_agent/build.xml?rev=1425859&r1=1425858&r2=1425859&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/automation_agent/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/automation_agent/build.xml Wed
Dec 26 09:10:54 2012
@@ -92,7 +92,6 @@
     </target>
     	
 	<target name="bundles" depends="bundles_en_US">
-	    <echo message="IN bundles"/>
             <antcall target="automation_agent_bundles">
                 <param name="locale" value="da_DK"/>
             </antcall>
@@ -150,7 +149,6 @@
 	</target>
 	
 	<target name="bundles-clean">
-	    <echo message="IN bundles clean"/>
         <antcall target="automation_agent_bundles-clean">
             <param name="locale" value="da_DK"/>
         </antcall>

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundle-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundle-config.xml?rev=1425859&r1=1425858&r2=1425859&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundle-config.xml
(original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/experimental/bundle-config.xml
Wed Dec 26 09:10:54 2012
@@ -46,6 +46,7 @@
     <include-resource-bundles>
         <bundle>alert</bundle>
         <bundle>dividers</bundle>
+        <bundle>experimental</bundle>
     </include-resource-bundles>
         
     <target-player>${playerglobal.version}</target-player>

Propchange: incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/core/UITextField.as
------------------------------------------------------------------------------
  Merged /incubator/flex/sdk/branches/release4.9/frameworks/projects/framework/src/mx/core/UITextField.as:r1421329-1421399,1421401-1421997,1421999-1422139

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/rpc/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/rpc/build.xml?rev=1425859&r1=1425858&r2=1425859&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/rpc/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/rpc/build.xml Wed Dec 26 09:10:54
2012
@@ -138,7 +138,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">
                 <include name="rpc.swc"/>
                 <include name="rpc.swc.incr"/>

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=1425859&r1=1425858&r2=1425859&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml Wed Dec 26
09:10:54 2012
@@ -153,6 +153,10 @@
 	
 	<target name="clean" depends="bundles-clean" description="Deletes the combined swc">
 		<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="textLayout.swc"/>
 				<include name="combined_link.xml"/>

Modified: incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml?rev=1425859&r1=1425858&r2=1425859&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml (original)
+++ incubator/flex/sdk/branches/develop/modules/thirdparty/batik/build.xml Wed Dec 26 09:10:54
2012
@@ -97,7 +97,11 @@ To display the available targets type:
     <property name="debug"              value="off"/>
     <property name="optimize"           value="on"/>
     <property name="deprecation"        value="on"/>
-  
+
+    <!-- Added by Apache Flex -->  
+    <property name="javac.source" value="1.6"/>
+    <property name="javac.target" value="1.6"/>
+
     <property name="src"                value="sources"/>
     <property name="src-internal-codec" value="sources-internal-codec"/>
     <property name="resources"          value="resources"/>
@@ -230,8 +234,10 @@ To display the available targets type:
     <!-- Info ............................................................... -->
     <echo message=" == ${Project} ${completeVersion} build file ================================"/>
     <echo message=""/>
-    <echo message="    JAVA_HOME: ${env.JAVA_HOME}"/>
-    <echo message="    VM:        ${java.vm.version}, ${java.vm.vendor}"/>
+    <echo message="    JAVA_HOME:       ${env.JAVA_HOME}"/>
+    <echo message="    VM:              ${java.vm.version}, ${java.vm.vendor}"/>
+    <echo message="    javac.source:    ${javac.source}"/>
+    <echo message="    javac.target:    ${javac.target}"/>
 
     <property name="init.done" value="true"/>
   </target>
@@ -1009,7 +1015,10 @@ JAVA=/usr/bin/java
   </target>
 
   <target name="compile" depends="init, compile-prepare" unless="compile.done">
-    <javac destdir="${dest}" deprecation="${deprecation}" 
+    <javac destdir="${dest}" 
+           source="${javac.source}" 
+           target="${javac.target}" 
+           deprecation="${deprecation}" 
            debug="${debug}" optimize="${optimize}" encoding="UTF-8">
       <src path="${src}"/>
       <src path="${src-jdk}"/>



Mime
View raw message