Re: svn commit: r1422687 - /incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml

[Frédéric THOMAS <we...@hotmail.com>]

Hi Justin,

Isn't it plan at some point to merge all what we've got in the develop 
branch ?

- Fred

-----Message d'origine----- 
From: jmclean@apache.org
Sent: Sunday, December 16, 2012 9:55 PM
To: flex-commits@incubator.apache.org
Subject: svn commit: r1422687 - 
/incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml

Author: jmclean
Date: Sun Dec 16 20:55:07 2012
New Revision: 1422687

URL: http://svn.apache.org/viewvc?rev=1422687&view=rev
Log:
merged changes from develop branch so that apache.swc compiles containing 
expected classes

Modified:
    incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml 
(contents, props changed)

Modified: 
incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml
URL: 
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml?rev=1422687&r1=1422686&r2=1422687&view=diff
==============================================================================
---  
incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml 
(original)
+++ 
incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml 
Sun Dec 16 20:55:07 2012
@@ -23,7 +23,8 @@

         <external-library-path>
             <path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
-            <path-element>../../libs/mx/mx.swc</path-element>
+            <path-element>../../libs/framework.swc</path-element>
+            <path-element>../../libs/spark.swc</path-element>
         </external-library-path>

         <keep-as3-metadata>
@@ -51,7 +52,11 @@

         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
-
+
+ <include-namespaces>
+ <uri>http://flex.apache.org/ns</uri>
+ </include-namespaces>
+
     <include-classes>
         <class>ApacheClasses</class>
     </include-classes>

Propchange: 
incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Dec 16 20:55:07 2012
@@ -0,0 +1 @@
+/incubator/flex/sdk/branches/develop/frameworks/projects/apache/compile-config.xml:1417241-1422686

Re: svn commit: r1422687 - /incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml

[Justin Mclean <ju...@classsoftware.com>]

Hi,

> Isn't it plan at some point to merge all what we've got in the develop branch ?
Once we make a release yes. We can also merge at any time if it needed.

That fix was required for the release so I merged it from develop into release.

Thanks,
Justin