incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1412253 - in /incubator/flex/sdk/branches/develop: asdoc/build.xml build.properties build.xml frameworks/projects/textLayout/build.xml mustella/build.xml
Date Wed, 21 Nov 2012 19:45:59 GMT
Author: cframpton
Date: Wed Nov 21 19:45:58 2012
New Revision: 1412253

URL: http://svn.apache.org/viewvc?rev=1412253&view=rev
Log:
Kit work.  asdoc needs more work since it doesn't generate seem to generate any files but
the paths are now correct.

Modified:
    incubator/flex/sdk/branches/develop/asdoc/build.xml
    incubator/flex/sdk/branches/develop/build.properties
    incubator/flex/sdk/branches/develop/build.xml
    incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml
    incubator/flex/sdk/branches/develop/mustella/build.xml

Modified: incubator/flex/sdk/branches/develop/asdoc/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/asdoc/build.xml?rev=1412253&r1=1412252&r2=1412253&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/asdoc/build.xml (original)
+++ incubator/flex/sdk/branches/develop/asdoc/build.xml Wed Nov 21 19:45:58 2012
@@ -24,6 +24,7 @@
 
     <property file="${FLEX_HOME}/env.properties"/>
     <property environment="env"/>
+	<property file="${FLEX_HOME}/build.properties"/>
 
 	<target name="main" depends="clean,doc" description="Clean build of all ASDocs"/>
 
@@ -45,12 +46,13 @@
 	        <os family="unix"/>
 	    </condition>
 
-	    <available property="flexTasksJar" value="${FLEX_HOME}/lib/flexTasks.jar" file="${FLEX_HOME}/lib/flexTasks.jar"/>
-	    <available property="flexTasksJar" value="${FLEX_HOME}/ant/lib/flexTasks.jar" file="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-
-		<!-- Load the <asdoc> task. We can't do this at the <project> level -->
-		<!-- because targets that run before flexTasks.jar gets built would fail. -->
-		<taskdef resource="flexTasks.tasks" classpath="${flexTasksJar}"/>
+        <path id="flexTasks.path">
+            <fileset dir="${FLEX_HOME}">
+                <include name="lib/flexTasks.jar" />
+                <include name="ant/lib/flexTasks.jar" />
+            </fileset>
+        </path>
+        <taskdef resource="flexTasks.tasks" classpathref="flexTasks.path"/>
 
 		<!-- Call asdoc to generate dita xml files -->
 		<asdoc output="${FLEX_HOME}/asdoc-output" lenient="true" failonerror="true" warnings="false"
strict="false" locale="en_US" fork="true">
@@ -66,9 +68,9 @@
 		    <doc-classes class="MobileComponentsClasses"/>		    
 		    <doc-classes class="SparkDmvClasses"/>
 	    		    
-			<!--doc-classes class="flashx.textLayout.CoreClasses"/-->
-			<!--doc-classes class="flashx.textLayout.EditClasses"/-->
-			<!--doc-classes class="flashx.textLayout.ConversionClasses"/-->
+			<doc-classes class="flashx.textLayout.CoreClasses"/>
+			<doc-classes class="flashx.textLayout.EditClasses"/>
+			<doc-classes class="flashx.textLayout.ConversionClasses"/>
 
 			<!-- source path for asdoc -->
 			<compiler.source-path path-element="${flexlib}/projects/airframework/src"/>
@@ -79,7 +81,7 @@
 			<compiler.source-path path-element="${flexlib}/projects/mx/src"/>
 			<compiler.source-path path-element="${flexlib}/projects/sparkskins/src"/>
 			<compiler.source-path path-element="${flexlib}/projects/rpc/src"/>
-		    <!--compiler.source-path path-element="${flexlib}/projects/textLayout/src"/-->
+		    <compiler.source-path path-element="${flexlib}/projects/textLayout/${tlf.version}/src"/>
 			<!--compiler.source-path path-element="${flexlib}/projects/osmf/src"/-->
 			<compiler.source-path path-element="${flexlib}/projects/advancedgrids/src"/>
 			<compiler.source-path path-element="${flexlib}/projects/charts/src"/>
@@ -92,14 +94,14 @@
 		    <doc-namespaces uri="library://ns.adobe.com/flex/spark"/>
 		    <doc-namespaces uri="http://www.adobe.com/2006/mxml"/>
 		    <doc-namespaces uri="http://www.adobe.com/2006/rpcmxml"/>
- 			<!--doc-namespaces uri="library://ns.adobe.com/flashx/textLayout"/-->
+ 			<doc-namespaces uri="library://ns.adobe.com/flashx/textLayout"/>
  			<doc-namespaces uri="http://ns.adobe.com/2009/mx-mxml"/>
  			<doc-namespaces uri="http://www.adobe.com/2006/advancedgridsmxml"/>
  			<doc-namespaces uri="http://www.adobe.com/2006/charts"/>
  			<doc-namespaces uri="library://ns.adobe.com/flex/spark-mobilecomponents"/>
  			<doc-namespaces uri="library://ns.adobe.com/flex/spark-dmv"/>
  			
-		    <!--namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${flexlib}/projects/textLayout/manifest.xml"/-->
+		    <namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${flexlib}/projects/textLayout/${tlf.version}/manifest.xml"/>
 
 			<!-- namespace declaration for asdoc -->
 		    <namespace uri="http://www.adobe.com/2006/airmxml" manifest="${flexlib}/projects/airframework/manifest.xml"/>
@@ -124,7 +126,7 @@
 		    	<!-- if no osfm sources -->
 		    	<include name="osmf.swc" />
 		    	<!-- if no textLayout sources -->
-		    	<include name="textLayout.swc" />
+		    	<!--include name="textLayout.swc" /-->
 		    </external-library-path>
 
 			<jvmarg line="${asdoc.jvm.args}"/>

Modified: incubator/flex/sdk/branches/develop/build.properties
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/build.properties?rev=1412253&r1=1412252&r2=1412253&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/build.properties (original)
+++ incubator/flex/sdk/branches/develop/build.properties Wed Nov 21 19:45:58 2012
@@ -31,6 +31,9 @@ locale = en_US
 qa.dir = ${basedir}/../qa
 asc = ${basedir}/bin/asc
 
+# TextLayoutFormat version.  This is a sub-directory in frameworks/textLayout.
+tlf.version = 3.0.33
+
 # For Java 7 on Mac OS X, you need an Intel-based Mac running Mac OS X version 10.7.3 
 # (Lion) and above.  Only the 64-bit data model is available so leave this blank.
 # Since ant properties are immutable, if this property is set in the build file before

Modified: incubator/flex/sdk/branches/develop/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/build.xml?rev=1412253&r1=1412252&r2=1412253&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/build.xml (original)
+++ incubator/flex/sdk/branches/develop/build.xml Wed Nov 21 19:45:58 2012
@@ -1279,8 +1279,6 @@
     <target name="mustella-setup" depends="runtime-setup" description="compile mustella
java file">
         <ant dir="${basedir}/mustella" target="makemustellaswc">
             <property name="use_mustella_framework_dir" value="false"/>
-            <!-- Since we don't need embedded fonts for the checkintests fake out mustella.
 -->
-            <property name="fonts.exist" value="set"/>
         </ant>
         <property name="moreCompilerArgs" value=""/>
         <!-- compile the results parser -->
@@ -1619,10 +1617,10 @@
         <property name="rat.dir" value="${basedir}/temp"/>
         <antcall target="rat-unzip" />
         
-        <echo message="Checking files at ${rat.dir}, report is ${basedir}/rat.report"/>
+        <property name="rat.report" value="${basedir}/rat.report"/>
+        <echo message="Checking files at ${rat.dir}, report is ${rat.report}"/>
              
-        <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" 
-            reportFile="${basedir}/rat.report">
+        <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
             <fileset dir="${rat.dir}">
                 <!--          Start of binary files           -->
                 <!-- exclude Flash Professional file used for integration with Flash Professional
-->
@@ -1680,5 +1678,32 @@
         <echo message="Rat report not generated."/>
         <echo message="rat jars (apache-rat-*.jar, apache-rat-tasks-*.jar)"/>
         <echo message="not found in anttask.classpath"/>
-    </target>   
+    </target>
+    
+    <target name="rat-check-mustella" depends="rat-taskdef" if="have.rattasks"
+        description="Report on licenses in mustella directory.">
+    
+        <ant dir="${basedir}/mustella" target="clean"/>
+        
+        <property name="rat.mustella.dir" value="${basedir}/mustella"/>
+        <property name="rat.mustella.report" value="${basedir}/rat.mustella.report"/>
+                
+        <echo message="Checking files at ${rat.mustella.dir}, report is ${basedir}/${rat.mustella.report}"/>
+             
+        <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" 
+            reportFile="${basedir}/${rat.mustella.report}">
+            <fileset dir="${rat.mustella.dir}">
+                <!--          Start of binary files           -->
+                <!-- exclude media (png, gif, jpg, mp3, flv) -->
+                <exclude name="assets/**"/>
+                <exclude name="tests/**/*.png"/>
+                <exclude name="tests/**/*.gif"/>
+                <exclude name="tests/**/*.jpg"/>
+                <exclude name="tests/**/*.mp3"/>
+                <exclude name="tests/**/*.flv"/>
+                <!--          End of binary files           -->
+                <exclude name="tests/**/*.compile"/>
+            </fileset>
+        </rat:report>
+    </target>
 </project>

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml?rev=1412253&r1=1412252&r2=1412253&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml Wed Nov 21
19:45:58 2012
@@ -24,9 +24,6 @@
     <property environment="env"/>
 	<property file="${FLEX_HOME}/build.properties"/>
 
-    <!--property name="tlf.version" value="2.0.232"/-->
-    <property name="tlf.version" value="3.0.33"/>
-    
     <property name="source.dir" value="${basedir}/${tlf.version}"/>
 	<property name="output.file" value="${FLEX_HOME}/frameworks/libs/textLayout.swc"/>
 	<property name="output.docs" value="${FLEX_HOME}/tempDoc"/>

Modified: incubator/flex/sdk/branches/develop/mustella/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/build.xml?rev=1412253&r1=1412252&r2=1412253&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/build.xml (original)
+++ incubator/flex/sdk/branches/develop/mustella/build.xml Wed Nov 21 19:45:58 2012
@@ -500,7 +500,7 @@
         <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">
+    <target name="setup" depends="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" />
@@ -896,7 +896,7 @@
         <istrue value="${run_mobile_tests}" />
     </condition>
 
-    <target name="prepare" unless="already_prepared" depends="handle_adt_jar" description="-->
create test suite directories" >
+    <target name="prepare" unless="already_prepared" depends="check-fonts,handle_adt_jar"
description="--> create test suite directories" >
         <echo message="Preparing testsuite."/>
         <mkdir dir="${sdk.dir}/lib"/>
         <mkdir dir="${classes.dir}"/>



Mime
View raw message