You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cz...@apache.org on 2012/12/05 06:15:18 UTC

svn commit: r1417280 - in /incubator/flex/sdk/branches/develop/frameworks/projects: rpc/build.xml rpc/compile-config.xml spark/build.xml spark/compile-config.xml spark_dmv/build.xml spark_dmv/compile-config.xml

Author: czadra
Date: Wed Dec  5 05:15:17 2012
New Revision: 1417280

URL: http://svn.apache.org/viewvc?rev=1417280&view=rev
Log:
FLEX-33286 applied Chema Balsas patch - moved version.properties include from compile-config.xml to compc task in build.xml

Modified:
    incubator/flex/sdk/branches/develop/frameworks/projects/rpc/build.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/rpc/compile-config.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/spark/build.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/spark/compile-config.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/spark_dmv/build.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/spark_dmv/compile-config.xml

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=1417280&r1=1417279&r2=1417280&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  5 05:15:17 2012
@@ -183,6 +183,7 @@
                output="${FLEX_HOME}/frameworks/libs/rpc.swc">
             <jvmarg line="${compc.jvm.args}"/>
             <load-config filename="compile-config.xml" />
+            <include-file name="version.properties" path="${FLEX_HOME}/frameworks/version.properties"/>
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
         </compc>

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/rpc/compile-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/rpc/compile-config.xml?rev=1417280&r1=1417279&r2=1417280&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/rpc/compile-config.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/rpc/compile-config.xml Wed Dec  5 05:15:17 2012
@@ -49,11 +49,6 @@
         <class>RPCClasses</class>
     </include-classes>
     
-    <include-file>
-        <name>version.properties</name>
-        <path>../../version.properties</path>
-    </include-file>
-    
     <include-namespaces>
         <uri>library://ns.adobe.com/flex/mx</uri>
     </include-namespaces>  

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/spark/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/spark/build.xml?rev=1417280&r1=1417279&r2=1417280&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/spark/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/spark/build.xml Wed Dec  5 05:15:17 2012
@@ -229,6 +229,7 @@
                output="${FLEX_HOME}/frameworks/libs/spark.swc">
             <jvmarg line="${compc.jvm.args}"/>
             <load-config filename="compile-config.xml" />
+            <include-file name="version.properties" path="${FLEX_HOME}/frameworks/version.properties"/>
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
         </compc>

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/spark/compile-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/spark/compile-config.xml?rev=1417280&r1=1417279&r2=1417280&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/spark/compile-config.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/spark/compile-config.xml Wed Dec  5 05:15:17 2012
@@ -60,10 +60,6 @@
     </include-classes>
     
     <include-file>
-        <name>version.properties</name>
-        <path>../../version.properties</path>
-    </include-file>
-    <include-file>
         <name>defaults.css</name>
         <path>defaults.css</path>
     </include-file>

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/spark_dmv/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/spark_dmv/build.xml?rev=1417280&r1=1417279&r2=1417280&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/spark_dmv/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/spark_dmv/build.xml Wed Dec  5 05:15:17 2012
@@ -63,6 +63,7 @@
                output="${FLEX_HOME}/frameworks/libs/spark_dmv.swc">
             <jvmarg line="${compc.jvm.args}"/>
             <load-config filename="compile-config.xml" />
+            <include-file name="version.properties" path="${FLEX_HOME}/frameworks/version.properties"/>
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
         </compc>

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/spark_dmv/compile-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/spark_dmv/compile-config.xml?rev=1417280&r1=1417279&r2=1417280&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/spark_dmv/compile-config.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/spark_dmv/compile-config.xml Wed Dec  5 05:15:17 2012
@@ -56,11 +56,6 @@
         <class>SparkDmvClasses</class>
     </include-classes>
     
-    <include-file>
-        <name>version.properties</name>
-        <path>../../version.properties</path>
-    </include-file>
-    
     <include-namespaces>
         <uri>library://ns.adobe.com/flex/spark</uri>
     </include-namespaces>