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/06/06 22:00:44 UTC
svn commit: r1347085 - in /incubator/flex/trunk: ./ build.xml
frameworks/build.xml frameworks/localFonts.ser frameworks/macFonts.ser
frameworks/winFonts.ser
Author: cframpton
Date: Wed Jun 6 20:00:44 2012
New Revision: 1347085
URL: http://svn.apache.org/viewvc?rev=1347085&view=rev
Log:
Remove binary files, localFonts.ser, macFonts.ser, windowsFonts.ser and have the ant file create 0-length files with these names. Add creation of ratasc.log to rat task and ignore rat*.log files in top-level directory.
Removed:
incubator/flex/trunk/frameworks/localFonts.ser
incubator/flex/trunk/frameworks/macFonts.ser
incubator/flex/trunk/frameworks/winFonts.ser
Modified:
incubator/flex/trunk/ (props changed)
incubator/flex/trunk/build.xml
incubator/flex/trunk/frameworks/build.xml
Propchange: incubator/flex/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jun 6 20:00:44 2012
@@ -8,3 +8,4 @@ lib
out
runtimes
temp
+rat*.log
Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1347085&r1=1347084&r2=1347085&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Wed Jun 6 20:00:44 2012
@@ -200,7 +200,7 @@
description="Full clean excluding thirdparty downloads">
<delete file="${basedir}/flex-sdk-description.xml" failonerror="false"/>
- <delete file="${basedir}/rat.log" failonerror="false"/>
+ <delete file="${basedir}/rat*.log" failonerror="false"/>
<!-- These directory would exist if the AIR SDK was merged in. -->
<delete dir="${basedir}/lib" failonerror="false" includeEmptyDirs="true">
@@ -1420,5 +1420,11 @@
<exclude name="modules/asc/src/**" />
</fileset>
</rat:report>
+ <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
+ reportFile="${basedir}/ratasc.log">
+ <fileset dir="${rat.dir}">
+ <include name="modules/asc/src/**" />
+ </fileset>
+ </rat:report>
</target>
</project>
Modified: incubator/flex/trunk/frameworks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build.xml?rev=1347085&r1=1347084&r2=1347085&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build.xml (original)
+++ incubator/flex/trunk/frameworks/build.xml Wed Jun 6 20:00:44 2012
@@ -47,18 +47,36 @@
<property file="${FLEX_HOME}/env.properties"/>
<property environment="env"/>
<property file="${FLEX_HOME}/build.properties"/>
-
- <target name="main" depends="check-compile-env,clean,thirdparty-downloads,javascript,compile"
+
+ <available file="localFonts.ser" property="localFonts.ser.present"/>
+ <available file="macFonts.ser" property="macFonts.ser.present"/>
+ <available file="winFonts.ser" property="winFonts.ser.present"/>
+
+ <target name="main" depends="check-compile-env,clean,prepare,javascript,compile"
description="Clean build of all SWCs"/>
- <target name="thirdparty-downloads" description="Downloads all the required thirdparty code.">
- <ant antfile="${basedir}/downloads.xml" dir="${basedir}"/>
- </target>
-
<target name="check-compile-env" description="Check for the required environment variables">
<ant antfile="${FLEX_HOME}/build.xml" target="check-compile-env" dir="${FLEX_HOME}"/>
</target>
+ <target name="prepare" depends="local-fonts, mac-fonts, win-fonts, thirdparty-downloads"/>
+
+ <target name="local-fonts" unless="localFonts.ser.present" description="local-fonts-snapshot">
+ <touch file="localFonts.ser"/>
+ </target>
+
+ <target name="mac-fonts" unless="macFonts.ser.present" description="local-fonts-snapshot for Mac">
+ <touch file="macFonts.ser"/>
+ </target>
+
+ <target name="win-fonts" unless="winFonts.ser.present" description="local-fonts-snapshot for Windows">
+ <touch file="winFonts.ser"/>
+ </target>
+
+ <target name="thirdparty-downloads" description="Downloads all the required thirdparty code.">
+ <ant antfile="${basedir}/downloads.xml" dir="${basedir}"/>
+ </target>
+
<!-- Note:
Removed osmf from build. For now, just use the downloaded swc.
We can move the osmf source from osmf-download to projects/osmf and add back the