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/10/10 21:00:09 UTC
svn commit: r1396732 - in /incubator/flex/sdk/branches/develop: build.xml
frameworks/build.xml frameworks/downloads.xml
frameworks/projects/textLayout/ frameworks/projects/textLayout/build.xml
Author: cframpton
Date: Wed Oct 10 19:00:09 2012
New Revision: 1396732
URL: http://svn.apache.org/viewvc?rev=1396732&view=rev
Log:
No longer download TLF 2.0.232 since we can build it from source. The textLayout directory has an svn:external which points to https://svn.apache.org/repos/asf/incubator/flex/tlf/branches/2.0/textLayout/ so when you sync the textLayout directory it will populate the textLayout/2.0.232 directory using the URL.
Modified:
incubator/flex/sdk/branches/develop/build.xml
incubator/flex/sdk/branches/develop/frameworks/build.xml
incubator/flex/sdk/branches/develop/frameworks/downloads.xml
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/ (props changed)
incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml
Modified: incubator/flex/sdk/branches/develop/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/build.xml?rev=1396732&r1=1396731&r2=1396732&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/build.xml (original)
+++ incubator/flex/sdk/branches/develop/build.xml Wed Oct 10 19:00:09 2012
@@ -793,7 +793,6 @@
</fileset>
</copy>
-
<!-- frameworks/libs -->
<copy todir="${basedir}/temp/frameworks/libs">
<fileset dir="${basedir}/frameworks/libs">
@@ -812,8 +811,8 @@
<include name="charts.swc"/>
<include name="advancedgrids.swc"/>
<include name="spark_dmv.swc"/>
+ <include name="textLayout.swc"/>
<exclude name="osmf.swc"/>
- <exclude name="textLayout.swc"/>
<exclude name="apache.swc"/>
<exclude name="experimental.swc"/>
</fileset>
Modified: incubator/flex/sdk/branches/develop/frameworks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/build.xml?rev=1396732&r1=1396731&r2=1396732&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/build.xml Wed Oct 10 19:00:09 2012
@@ -83,6 +83,7 @@
-->
<target name="compile" description="Builds all SWCs but not their resource bundles" depends="flex-config">
+ <antcall target="textLayout"/>
<antcall target="framework"/>
<antcall target="mx"/>
<antcall target="rpc"/>
@@ -157,6 +158,7 @@
</target>
<target name="other.locales" description ="Builds resource SWCs for all locales">
+ <ant dir="${basedir}/projects/textLayout" target="other.locales"/>
<ant dir="${basedir}/projects/framework" target="other.locales"/>
<ant dir="${basedir}/projects/mx" target="other.locales"/>
<ant dir="${basedir}/projects/airframework" target="other.locales"/>
@@ -166,7 +168,6 @@
<ant dir="${basedir}/projects/advancedgrids" target="other.locales"/>
<ant dir="${basedir}/projects/spark" target="other.locales"/>
<ant dir="${basedir}/projects/mobilecomponents" target="other.locales" />
- <!--ant dir="${basedir}/projects/textLayout" target="other.locales"/-->
<ant dir="${basedir}/projects/playerglobal" target="other.locales" />
<ant dir="${basedir}/projects/flash-integration" target="other.locales"/>
<ant dir="${basedir}/projects/automation" target="other.locales"/>
@@ -178,6 +179,7 @@
</target>
<target name="doc" >
+ <ant dir="${basedir}/projects/textLayout" target="doc" />
<ant dir="${basedir}/projects/framework" target="doc" />
<ant dir="${basedir}/projects/mx" target="doc" />
<ant dir="${basedir}/projects/rpc" target="doc" />
@@ -214,6 +216,7 @@
<target name="clean" depends="automation-clean,airsdk-clean" description="Cleans all SWCs and their resource bundles">
<!-- Delete output from SWC projects -->
+ <ant dir="${basedir}/projects/textLayout" target="clean"/>
<ant dir="${basedir}/projects/framework" target="clean"/>
<ant dir="${basedir}/projects/mx" target="clean"/>
<ant dir="${basedir}/projects/airframework" target="clean"/>
@@ -365,8 +368,7 @@
<ant dir="${basedir}/projects/rpc"/>
</target>
- <!-- For debugging only. For release, we distribute the swc built by the TLF team. -->
- <target name="tlf" description="Clean build of textLayout.swc">
+ <target name="textLayout" description="Clean build of textLayout.swc">
<ant dir="${basedir}/projects/textLayout"/>
</target>
Modified: incubator/flex/sdk/branches/develop/frameworks/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/downloads.xml?rev=1396732&r1=1396731&r2=1396732&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/downloads.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/downloads.xml Wed Oct 10 19:00:09 2012
@@ -52,7 +52,7 @@
clean does not remove these since they don't change often and the downloads take time.
-->
<target name="main"
- depends="swfobject-download,swfobject-fabridge-download,textLayout-download,osmf-download,optional-downloads"
+ depends="swfobject-download,swfobject-fabridge-download,osmf-download,optional-downloads"
description="Copies third-party software into place for build">
<echo message="Use thirdparty-clean or super-clean to remove these."/>
</target>
@@ -66,7 +66,6 @@
<delete failonerror="false">
<fileset dir="${basedir}/libs">
<include name="osmf.swc"/>
- <include name="textLayout.swc"/>
</fileset>
</delete>
<delete includeEmptyDirs="true" failonerror="false">
@@ -74,7 +73,6 @@
<include name="${adobe.flex.zip.file}"/>
<include name="OSMF*/**"/>
<include name="osmf*/**"/>
- <include name="textLayout*/**"/>
<include name="swfobject*/**"/>
</fileset>
</delete>
@@ -193,41 +191,6 @@
</fileset>
</delete>
</target>
-
- <!-- textLayout.swc (Version 2.0.232) -->
- <!-- Because this requires a network connection it downloads TLF only if it doesn't already exist. -->
- <target name="textLayout-check" description="Checks if the Text Layout Framework has been downloaded.">
- <available file="${basedir}/libs/textLayout.swc" property="textLayout.swc.present"/>
- </target>
-
- <!--
- Notify before downloading file with MPL1.1 license.
- -->
- <target name="ask-tlf" unless="build.noprompt">
- <echo message="The Adobe Text Layout Framework (TLF) used by the Spark text components"/>
- <echo message="is licensed under the Mozilla Public License Version 1.1."/>
- <antcall target="echo-mpl1.1-license"/>
- </target>
-
- <target name="textLayout-download" depends="textLayout-check" unless="textLayout.swc.present">
- <antcall target="ask-tlf"/>
-
- <available file="${download.dir}/textLayout_build.zip" type="file" property="tlf.zip.exists"/>
- <antcall target="download-tlf-zip" />
-
- <unzip src="${download.dir}/textLayout_build.zip" dest="${basedir}">
- <patternset>
- <include name="libs/textLayout.swc"/>
- </patternset>
- </unzip>
- </target>
-
- <target name="download-tlf-zip" unless="tlf.zip.exists">
- <mkdir dir="${download.dir}"/>
- <get src="http://sourceforge.net/projects/tlf.adobe/files/2.0/232/textLayout_build.zip/download"
- dest="${download.dir}/textLayout_build.zip"
- verbose="false"/>
- </target>
<!--============================================================================= -->
<!-- Optional Jars. Licenses are not compatible with Apache v2 license. -->
Propchange: incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Wed Oct 10 19:00:09 2012
@@ -0,0 +1 @@
+2.0.232 https://svn.apache.org/repos/asf/incubator/flex/tlf/branches/2.0/textLayout
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=1396732&r1=1396731&r2=1396732&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/textLayout/build.xml Wed Oct 10 19:00:09 2012
@@ -24,14 +24,18 @@
<property environment="env"/>
<property file="${FLEX_HOME}/build.properties"/>
+ <property name="tlf.version" value="2.0.232"/>
+
+ <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"/>
<property name="flexTasks.location" value="${FLEX_HOME}/lib/flexTasks.jar"/>
<property name="project.uri" value="library://ns.adobe.com/flashx/textLayout"/>
- <!-- We use abbreviated token names here as, the 'release'
- and 'debug' tokens conflict with those specified in
- build.properties -->
+ <!-- We use abbreviated token names here as, the 'release'
+ and 'debug' tokens conflict with those specified in
+ build.properties
+ -->
<property name="dbg" value="false"/>
<property name="rel" value="true"/>
@@ -100,11 +104,15 @@
</macrodef>
- <target name="main" depends="clean" description="Clean build of automation_dmv.swc and en_US">
- <bundle locale="${locale}"/>
+ <target name="main" depends="clean,compile" description="Clean build of textLayout.swc">
+ <!--bundle locale="${locale}"/-->
</target>
- <target name="other.locales" depends="bundles" description="Build other locale SWCs"/>
+ <target name="other.locales" description="Build other locale SWCs">
+ <echo message="There are no locales for textLayout."/>
+ </target>
+
+ <!--target name="other.locales" depends="bundles" description="Build other locale SWCs"/-->
<!-- This is a private target for building automation_rb.swc for various locales. -->
<!-- The targets below set the 'locale' parameter -->
@@ -187,10 +195,10 @@
<jvmarg line="${compc.jvm.args}"/>
<keep-as3-metadata>IMXMLObject</keep-as3-metadata>
<include-namespaces uri="${project.uri}"/>
- <namespace uri="${project.uri}" manifest="manifest.xml"/>
- <source-path path-element="src"/>
+ <namespace uri="${project.uri}" manifest="${source.dir}/manifest.xml"/>
+ <source-path path-element="${source.dir}/src"/>
<library-path/>
- <include-file name="manifest.xml" path="${basedir}/manifest.xml"/>
+ <include-file name="manifest.xml" path="${source.dir}/manifest.xml"/>
<static-link-runtime-shared-libraries/>
<define name="CONFIG::debug" value="${dbg}"/>
<define name="CONFIG::release" value="${rel}"/>