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/07 20:33:35 UTC
svn commit: r1347750 - in /incubator/flex/trunk: build.xml
frameworks/build.xml
Author: cframpton
Date: Thu Jun 7 18:33:34 2012
New Revision: 1347750
URL: http://svn.apache.org/viewvc?rev=1347750&view=rev
Log:
UNIX scripts need UNIX line endings to run correctly. Clean generated *Fonts.ser files.
Modified:
incubator/flex/trunk/build.xml
incubator/flex/trunk/frameworks/build.xml
Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1347750&r1=1347749&r2=1347750&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Thu Jun 7 18:33:34 2012
@@ -517,15 +517,32 @@
<!--
Source files have Windows line endings. Most UNIX editors can handle
- either type of line endings but the converse is often not true.
+ either type of line endings but the converse is often not true.
+ The bin directory is handled in stage-bin.
-->
- <fixcrlf srcdir="${basedir}/temp"
- eol="crlf"
- preservelastmodified="true"
- excludes="**/*.gif, **/*.png, **/*.jpg, **/*.swf,
- **/*.fla, **/*.flv, **/*.mp3, **/*.pbj"/>
+ <fixcrlf srcdir="${basedir}/temp" eol="crlf">
+ <exclude name="bin/**"/>
+ <exclude name="**/*.fla"/>
+ <exclude name="**/*.flv"/>
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.mp3"/>
+ <exclude name="**/*.jpg"/>
+ <exclude name="**/*.pbj"/>
+ <exclude name="**/*.png"/>
+ <exclude name="**/*.sh"/>
+ <exclude name="**/*.swf"/>
+ </fixcrlf>
+
+ <!--
+ Unix shell scripts need the correct line endings.
+ The bin directory is handled in stage-bin.
+ -->
+ <fixcrlf srcdir="${basedir}/temp" eol="unix">
+ <include name="**.sh"/>
+ <exclude name="bin/**"/>
+ </fixcrlf>
</target>
-
+
<target name="stage-frameworks">
<!-- frameworks -->
<copy todir="${basedir}/temp/frameworks" includeEmptyDirs="false">
@@ -555,7 +572,16 @@
<exclude name="adl*"/>
<exclude name="adt*"/>
</fileset>
- </copy>
+ </copy>
+
+ <fixcrlf srcdir="${basedir}/temp/bin" eol="crlf">
+ <include name="**/*.bat"/>
+ </fixcrlf>
+
+ <!-- Unix shell scripts need the correct line endings. -->
+ <fixcrlf srcdir="${basedir}/temp/bin" eol="unix">
+ <exclude name="**/*.bat"/>
+ </fixcrlf>
</target>
<target name="stage-modules" unless="no.modules">
Modified: incubator/flex/trunk/frameworks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build.xml?rev=1347750&r1=1347749&r2=1347750&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build.xml (original)
+++ incubator/flex/trunk/frameworks/build.xml Thu Jun 7 18:33:34 2012
@@ -48,10 +48,6 @@
<property environment="env"/>
<property file="${FLEX_HOME}/build.properties"/>
- <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"/>
@@ -59,20 +55,21 @@
<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="prepare" depends="local-fonts-snapshot, thirdparty-downloads"/>
- <target name="local-fonts" unless="localFonts.ser.present" description="local-fonts-snapshot">
+ <!--
+ Font snapshot files for the JREFontManager.
+ For some fonts it is possible to determine if it is illegal to embed them.
+ If that information is known for a particular font, a warning message can be
+ displayed.if an attempt is made to embed that font.
+ -->
+ <target name="local-fonts-snapshot"
+ description="Files required by FlashBuilder but not by Flex.">
<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>
@@ -217,7 +214,11 @@
<!-- Delete only if it exists and it is empty. air and swfobject put dirs here. -->
<delete includeemptydirs="true" failonerror="false">
<fileset dir="${FLEX_HOME}/templates" excludes="**/*" />
- </delete>
+ </delete>
+ <!-- remove these if/when they actually have content -->
+ <delete file="localFonts.ser"/>
+ <delete file="macFonts.ser"/>
+ <delete file="winFonts.ser"/>
</target>
<target name="airsdk-clean" description="Delete files copied from the AIR SDK">