incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1403428 - in /incubator/flex/sdk/branches/develop/mustella: ./ build.xml
Date Mon, 29 Oct 2012 17:10:06 GMT
Author: cframpton
Date: Mon Oct 29 17:10:06 2012
New Revision: 1403428

URL: http://svn.apache.org/viewvc?rev=1403428&view=rev
Log:
Minor tweak in font check.

Modified:
    incubator/flex/sdk/branches/develop/mustella/   (props changed)
    incubator/flex/sdk/branches/develop/mustella/build.xml

Propchange: incubator/flex/sdk/branches/develop/mustella/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 29 17:10:06 2012
@@ -2,6 +2,6 @@ mustella.swc
 *.class
 classes
 tmp
-failures.txt
-results.txt
+fail*.txt
+results*.txt
 local.properties

Modified: incubator/flex/sdk/branches/develop/mustella/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/build.xml?rev=1403428&r1=1403427&r2=1403428&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/build.xml (original)
+++ incubator/flex/sdk/branches/develop/mustella/build.xml Mon Oct 29 17:10:06 2012
@@ -363,25 +363,6 @@
         <istrue value="${use_apollo}" />
     </condition>
 
-    <!-- Summary Info -->
-    <echo message="    JAVA_HOME:               ${env.JAVA_HOME}"/>
-    <echo message="    FLASHPLAYER_DEBUGGER:    ${env.FLASHPLAYER_DEBUGGER}"/>
-    <echo message="    sdk.dir:                 ${sdk.dir}"/>
-    <echo message="    air.sdk.dir:             ${air.sdk.dir}"/>
-    <echo message="    mustella exclude file:   ${exclude_filename}"/> 
-
-    <!-- Check that Adobe's embedded font jars exist and fail if any are missing.  -->
-    <condition property="fonts.exist">
-    <and>
-        <available file="${sdk.dir}/lib/external/optional/afe.jar" />
-        <available file="${sdk.dir}/lib/external/optional/aglj40.jar" />
-        <available file="${sdk.dir}/lib/external/optional/flex-fontkit.jar" />
-        <available file="${sdk.dir}/lib/external/optional/rideau.jar" />
-     </and>
-    </condition>
-    
-    <fail message="Mustella uses embedded fonts.  Please install Adobe's embedded font
support." unless="fonts.exist"/>
-    
     <target name="getExcludeIds" unless="exclude_ids" description="Fetch exclude ids"
>
         <taskdef name="excluder" classname="mustella.GetExcludeIdsTask" classpathref="flex.test.classpath"/>
         <excluder property="exclude_ids" type="${exclude_type}" filename="${exclude_filename}"
branch="${branch_name}" os="${target_os_name}" browser="${browser_name}" apollo="${use_apollo}"
bbrowser="${use_browser}" untilTime="${db_time}" write="false" excludeIds=""/>
@@ -497,7 +478,29 @@
         <echo>apollo_location is ${apollo_location}</echo>        
     </target>
 
-    <target name="setup" depends="get_date,get_os,setup_mac,setup_windows,setup_linux,db_time,handle_mobile_config,echo-browser,echo-apollo"
 description="--> set platform specific properties">
+    <target name="echo-info">
+        <!-- Summary Info -->
+        <echo message="    JAVA_HOME:               ${env.JAVA_HOME}"/>
+        <echo message="    FLASHPLAYER_DEBUGGER:    ${env.FLASHPLAYER_DEBUGGER}"/>
+        <echo message="    sdk.dir:                 ${sdk.dir}"/>
+    
+        <echo message="    mustella exclude file:   ${exclude_filename}"/> 
+    </target>
+    
+    <target name="check-fonts">
+        <!-- Check that Adobe's embedded font jars exist and fail if any are missing.
 -->
+        <condition property="fonts.exist">
+        <and>
+            <available file="${sdk.dir}/lib/external/optional/afe.jar" />
+            <available file="${sdk.dir}/lib/external/optional/aglj40.jar" />
+            <available file="${sdk.dir}/lib/external/optional/flex-fontkit.jar" />
+            <available file="${sdk.dir}/lib/external/optional/rideau.jar" />
+         </and>
+        </condition>       
+        <fail message="Mustella uses embedded fonts.  Please install Adobe's embedded
font support." unless="fonts.exist"/>
+    </target>
+    
+    <target name="setup" depends="check-fonts,echo-info,get_date,get_os,setup_mac,setup_windows,setup_linux,db_time,handle_mobile_config,echo-browser,echo-apollo"
 description="--> set platform specific properties">
         <!-- antcall target="db_time">
             <param name="no_quote" value="true" />
             <param name="db_time_vetting_file" value="${tmp.dir}/.db.time.mini" />



Mime
View raw message