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/09/05 23:27:42 UTC

svn commit: r1381397 - /incubator/flex/sdk/branches/develop/mustella/build.xml

Author: cframpton
Date: Wed Sep  5 21:27:41 2012
New Revision: 1381397

URL: http://svn.apache.org/viewvc?rev=1381397&view=rev
Log:
mustella.swc is only built if it either doesn't exist, or any of the .as files in as3/src/mustella changed (will not detect changes in included assets).  Also moved where some properties are set so they are set before they are used.

Modified:
    incubator/flex/sdk/branches/develop/mustella/build.xml

Modified: incubator/flex/sdk/branches/develop/mustella/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/build.xml?rev=1381397&r1=1381396&r2=1381397&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/build.xml (original)
+++ incubator/flex/sdk/branches/develop/mustella/build.xml Wed Sep  5 21:27:41 2012
@@ -23,7 +23,10 @@
     <property file="${FLEX_HOME}/env.properties"/>
     <property environment="env"/>
 
-    <property name="mustella.dir" value="${basedir}" />
+    <pathconvert property="mustella.dir" dirsep="/" >
+       <path location="${basedir}" />
+    </pathconvert>
+
     <property name="tmp.dir" value="${mustella.dir}/tmp" />
 
     <property name="feature" value=""/>
@@ -39,10 +42,10 @@
     
     <property name="HOMEPATH" value="${env.HOMEDRIVE}${env.HOMEPATH}" />
 
-    <pathconvert property="mustella.dir" dirsep="/" >
-       <path location="${basedir}" />
-    </pathconvert>
-
+    <echo>mustella.dir is ${mustella.dir}</echo>
+    
+    <property name="mustella.swc.dir" value="${mustella.dir}" />
+    <property name="mustella.swc.name" value="mustella.swc" />
 
     <!-- default version file -->
     <property name="build.version.file" value="successfulBuild.properties" />
@@ -70,6 +73,8 @@
     <property name="mustellagen.dir" value="${mustella.dir}/gen" />
     <property name="sdk.bin.dir" value="${sdk.dir}/bin" />
 
+    <echo>sdk.dir is ${sdk.dir}</echo>
+    
     <property name="branch" value="trunk"/>
 
     <property name="compc.dir" value="${sdk.dir}/bin" />
@@ -287,12 +292,11 @@
         </or>
     </condition>
 
-    <condition property="do_mustellaswc_compile" value="true" >
-        <not>
-            <available file="${mustella.dir}/${mustella.swc.name}" />
-        </not>
-    </condition>
-
+    <!-- Only recompile mustella.swc if it doesn't exist or if any of the its .as files have changed. -->
+    <uptodate property="compilemustellaswc.notRequired" targetfile="${mustella.dir}/${mustella.swc.name}" >
+        <srcfiles dir="${mustella.dir}/as3/src/mustella" includes="**/*.as"/>
+    </uptodate>
+    
     <condition property="vetting" value="Vetting" >
         <equals arg1="${run_type}" arg2="mini"/>
     </condition>
@@ -598,15 +602,16 @@
         </pathconvert>
         <exec  executable="${shell}" failonerror="${exit_on_compile_error}">
             <arg value="${sdk.mustella.dir}/../scripts/shellrunner.sh" />
-                <arg value="${sdk.mustella.scripts2}" />
+            <arg value="${sdk.mustella.scripts2}" />
             <env key="SDK_DIR" value="${sdk.dir}" />
-                <env key="MUSTELLA_DIR" value="${mustella.dir}" />
-                <env key="USE_APOLLO" value="${use_apollo}" />
-                <env key="APOLLO_TRANSFORM" value="${apollo_transform}" />
+            <env key="MUSTELLA_DIR" value="${mustella.dir}" />
+            <env key="USE_APOLLO" value="${use_apollo}" />
+            <env key="APOLLO_TRANSFORM" value="${apollo_transform}" />
         </exec>
      </target>
 
-     <target name="chmod_shells" depends="build_shell_set" description=" make user-defined shells executatble">
+     <target name="chmod_shells" depends="build_shell_set" unless="chmod_shells.notRequired"
+            description=" make user-defined shells executatble">
         <echo>changing user shell files to executable </echo>
         <chmod perm="555" maxparallel="50">
             <fileset dir="${mustella.dir}" >
@@ -856,7 +861,7 @@
             <fileset dir="${sdk.mustella.dir}" includes="${previous.generated.testfiles},**/bin-debug/*.swf,**/bin-release/*.swf" excludes="**/Assets/*.swf,**/small.swf,**/undo-redo_icons.swf,**/focusSkinSWF.swf,**/atEmbed/images/*.swf,**/atEmbed/**/assets/*.swf,**/Components/Assets/Skinning/ImageAssets/*.swf,**/CellRenderers/assets/*.swf,**/player/**/assets/*.swf,**/atEmbed/PathResolution/**/box.swf,**/Assets/*.swf,**/assets/*.swf"/>
             <fileset dir="${mustella.dir}">
                 <include name="**/*.log"/>
-                <include name="**/*.png.bad.png"/>
+                <include name="**/*.png.bad.png*"/>
             </fileset>
         </delete>
     </target>
@@ -1141,6 +1146,7 @@
         </antcall>    
     </target>
 
+    <!-- this seems to be the same as the compileswfs target -->
     <target name="compileLite" depends="prepare,setup,getRunId,getExcludes,realCompile" description="- compile the mustella tests into swfs">
 
     <antcall target="continue_always_send" />
@@ -1697,15 +1703,9 @@
     <property name="test_interval" value="15" />
 
     <!-- make the mustella swc. Defaulting to putting that in the suites area for the moment -->
-    <property name="mustella.swc.dir" value="${mustella.dir}" />
-    <property name="mustella.swc.name" value="mustella.swc" />
-
-
     <target name="makemustellaswc" depends="setup">
-        <condition property="do_mustellaswc_compile" value="true" >
-            <not>
-                <equals arg1="${use_mustella_framework_dir}" arg2="true"/>
-            </not>
+        <condition property="compilemustellaswc.notRequired">
+            <equals arg1="${use_mustella_framework_dir}" arg2="true"/>
         </condition>
         <antcall target="compilemustellaswc" />
     </target>
@@ -1714,7 +1714,7 @@
         <delete file="${mustella.swc.dir}/${mustella.swc.name}"/>
     </target>
         
-    <target name="compilemustellaswc" if="do_mustellaswc_compile" >
+    <target name="compilemustellaswc" unless="compilemustellaswc.notRequired" >
         <exec  executable="${compc.dir}/${compc.exe}" >
             <!-- output swc name    -->
             <arg value="-output=${mustella.swc.dir}/${mustella.swc.name}" />