You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/10/26 22:24:13 UTC

svn commit: r1402648 - in /incubator/flex/sdk/branches/develop/frameworks/projects/textLayout: build.xml compile-config.xml

Author: cframpton
Date: Fri Oct 26 20:24:12 2012
New Revision: 1402648

URL: http://svn.apache.org/viewvc?rev=1402648&view=rev
Log:
FLEX-33226. Convert compile targets to include flex-config format xml.

Added:
    incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/compile-config.xml   (with props)
Modified:
    incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml

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=1402648&r1=1402647&r2=1402648&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml Fri Oct 26 20:24:12 2012
@@ -189,22 +189,17 @@
 	
 	<target name="compile" description="Compiles textLayout.swc">
 		<taskdef resource="flexTasks.tasks" classpath="${flexTasks.location}"/>
-		<compc fork="true"
-			   output="${output.file}"
-			   show-actionscript-warnings="false"
-			   compute-digest="true"
-			   include-classes="flashx.textLayout.CoreClasses flashx.textLayout.EditClasses flashx.textLayout.ConversionClasses">
-			<jvmarg line="${compc.jvm.args}"/>
-			<keep-as3-metadata>IMXMLObject</keep-as3-metadata>
-			<include-namespaces uri="${project.uri}"/>
-			<namespace uri="${project.uri}" manifest="${source.dir}/manifest.xml"/>
-			<source-path path-element="${source.dir}/src"/>
-			<library-path/>
-			<include-file name="manifest.xml" path="${source.dir}/manifest.xml"/>
-			<static-link-runtime-shared-libraries/>
-			<define name="CONFIG::debug" value="${dbg}"/>
+		<compc fork="true" 
+		       output="${output.file}">
+            <jvmarg line="${compc.jvm.args}"/>
+            <load-config filename="compile-config.xml" />
+            <arg value="+playerglobal.version=${playerglobal.version}" />
+            <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+            <arg value="+source.dir=${source.dir}" />
+            <define name="CONFIG::debug" value="${dbg}"/>
 			<define name="CONFIG::release" value="${rel}"/>
-		</compc>
+
+        </compc>
      </target>
 
 	<target name="doc" description="Updates textLayout.swc with ASDoc XML">

Added: incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/compile-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/compile-config.xml?rev=1402648&view=auto
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/compile-config.xml (added)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/compile-config.xml Fri Oct 26 20:24:12 2012
@@ -0,0 +1,67 @@
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+<flex-config>
+    <compiler>
+        <external-library-path>
+            <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
+        </external-library-path>
+        
+        <keep-as3-metadata>
+            <name>IMXMLObject</name>
+        </keep-as3-metadata>
+        
+        <locale/>
+        
+        <library-path/>
+        
+        <namespaces>
+            <namespace>
+                <uri>library://ns.adobe.com/flashx/textLayout</uri>
+                <manifest>${source.dir}/manifest.xml</manifest>
+            </namespace>
+        </namespaces>
+        
+        <source-path>
+            <path-element>${source.dir}/src</path-element>
+        </source-path>
+        
+        <show-actionscript-warnings>false</show-actionscript-warnings>
+    </compiler>
+   
+    <compute-digest>true</compute-digest>
+    
+    <include-classes>
+        <class>flashx.textLayout.CoreClasses</class>
+        <class>flashx.textLayout.EditClasses</class>
+        <class>flashx.textLayout.ConversionClasses</class>
+    </include-classes>
+    
+    <include-file>
+        <name>manifest.xml</name>
+        <path>${source.dir}/manifest.xml</path>
+    </include-file>
+    
+    <include-namespaces>
+        <uri>library://ns.adobe.com/flashx/textLayout</uri>
+    </include-namespaces>  
+
+    <resource-bundle-list>bundles.properties</resource-bundle-list>
+            
+    <target-player>${playerglobal.version}</target-player>
+</flex-config>

Propchange: incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/compile-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native