flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1453009 - in /flex/sdk/branches/develop/frameworks/projects/core: build.xml compile-config.xml
Date Tue, 05 Mar 2013 21:27:01 GMT
Author: cframpton
Date: Tue Mar  5 21:27:01 2013
New Revision: 1453009

URL: http://svn.apache.org/r1453009
Log:
FLEX-33417.  core.swc doesn't link correctly if playerglobal.swc is included in compile-config.xml
rather than directly in the compc tag in build.xml.

Modified:
    flex/sdk/branches/develop/frameworks/projects/core/build.xml
    flex/sdk/branches/develop/frameworks/projects/core/compile-config.xml

Modified: flex/sdk/branches/develop/frameworks/projects/core/build.xml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/frameworks/projects/core/build.xml?rev=1453009&r1=1453008&r2=1453009&view=diff
==============================================================================
--- flex/sdk/branches/develop/frameworks/projects/core/build.xml (original)
+++ flex/sdk/branches/develop/frameworks/projects/core/build.xml Tue Mar  5 21:27:01 2013
@@ -63,9 +63,18 @@
 		-->
 		<compc fork="true"
 			   output="${FLEX_HOME}/frameworks/libs/core.swc">
-			<load-config filename="compile-config.xml" />
+            <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}" />
+            <load-config filename="${FLEX_HOME}/frameworks/projects/framework/framework-config.xml"/>
+            <!-- 
+            	 For some reason core.swc doesn't package correctly if this
+            	 external-library-path is moved to compile-config.xml.
+        	-->		   
+			<external-library-path dir="${env.PLAYERGLOBAL_HOME}">
+                <include name="${playerglobal.version}/playerglobal.swc"/>
+            </external-library-path>
 		</compc>
 	</target>
 

Modified: flex/sdk/branches/develop/frameworks/projects/core/compile-config.xml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/frameworks/projects/core/compile-config.xml?rev=1453009&r1=1453008&r2=1453009&view=diff
==============================================================================
--- flex/sdk/branches/develop/frameworks/projects/core/compile-config.xml (original)
+++ flex/sdk/branches/develop/frameworks/projects/core/compile-config.xml Tue Mar  5 21:27:01
2013
@@ -20,13 +20,7 @@
 
     <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/>



Mime
View raw message