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:23 UTC

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

Author: cframpton
Date: Fri Oct 26 20:24:23 2012
New Revision: 1402649

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

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

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/core/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/core/build.xml?rev=1402649&r1=1402648&r2=1402649&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/core/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/core/build.xml Fri Oct 26 20:24:23 2012
@@ -62,28 +62,10 @@
 			(This should be an empty list.)
 		-->
 		<compc fork="true"
-			   output="${FLEX_HOME}/frameworks/libs/core.swc"
-			   resource-bundle-list="${basedir}/bundles.properties">
-            <target-player>${playerglobal.version}</target-player>
-			<jvmarg line="${compc.jvm.args}"/>
-			<include-classes>CoreClasses</include-classes>
-			<source-path path-element="${basedir}/src"/>
-			<source-path path-element="${FLEX_HOME}/frameworks/projects/framework/src"/>
-            <load-config filename="${FLEX_HOME}/frameworks/projects/framework/framework-config.xml"/>
-			<library-path/>
-            <external-library-path dir="${env.PLAYERGLOBAL_HOME}">
-                <include name="${playerglobal.version}/playerglobal.swc"/>
-            </external-library-path>
-			<external-library-path dir="${FLEX_HOME}/frameworks/libs">
-                <include name="textLayout.swc"/>
-			</external-library-path>
-			<locale/>
-			<accessible>true</accessible>
-			<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"/>
+			   output="${FLEX_HOME}/frameworks/libs/core.swc">
+			<load-config filename="compile-config.xml" />
+            <arg value="+playerglobal.version=${playerglobal.version}" />
+            <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
 		</compc>
 	</target>
 

Added: incubator/flex/sdk/branches/develop/frameworks/projects/core/compile-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/core/compile-config.xml?rev=1402649&view=auto
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/core/compile-config.xml (added)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/core/compile-config.xml Fri Oct 26 20:24:23 2012
@@ -0,0 +1,53 @@
+<!--
+
+  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>
+		<accessible>true</accessible>
+               
+        <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>
+                
+        <locale/>
+        
+        <library-path/>
+                
+        <source-path>
+            <path-element>src</path-element>
+            <path-element>../framework/src</path-element>
+        </source-path>
+        
+        <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"/>
+    </compiler>
+    
+    <include-classes>
+        <class>CoreClasses</class>
+    </include-classes>
+        
+    <resource-bundle-list>bundles.properties</resource-bundle-list>
+    
+    <target-player>${playerglobal.version}</target-player>
+</flex-config>

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