You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2013/04/17 19:15:25 UTC
[5/5] git commit: [flex-sdk] - fix ant release target
fix ant release target
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/6bb05798
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/6bb05798
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/6bb05798
Branch: refs/heads/develop
Commit: 6bb057985e346db0e77e50341084f897de489a8b
Parents: dc20c96
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 17 10:12:10 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 17 10:13:57 2013 -0700
----------------------------------------------------------------------
README | 16 +++++++
build.xml | 31 +++++++++++---
frameworks/build_framework.xml | 2 +-
frameworks/projects/textLayout/build.xml | 35 +++++++++-------
frameworks/projects/textLayout/compile-config.xml | 6 +-
5 files changed, 64 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6bb05798/README
----------------------------------------------------------------------
diff --git a/README b/README
index 7d652f3..fa68eaa 100644
--- a/README
+++ b/README
@@ -44,6 +44,22 @@ Getting the latest sources via git
cd sdk
git checkout develop
+ An Apache Flex SDK also includes source code from other Apache Flex git
+ repositories. To get the latest source via git for the Text Layout Framework
+ use the following command:
+
+ git clone https://git-wip-us.apache.org/repos/asf/flex-tlf.git tlf
+
+ In an Apache Flex source code package hosted on the distribution server or
+ one of its mirrors, the Text Layout Framework code is already included in
+ the package. THis is also true for the convenience package.
+
+ The build scripts assume that the tlf folder is a sibling of the sdk folder. If
+ this is not true, then set the TLF_HOME environment variable to point to the
+ tlf folder. Instead of setting an environment variable you may also set it in
+ env.properties. See the "Install Prerequisites" section for more information
+ on environment variables and env.properties.
+
For further information visit http://flex.apache.org/download-source.html
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6bb05798/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ad435a5..a96af41 100644
--- a/build.xml
+++ b/build.xml
@@ -47,6 +47,16 @@
<property name="source.kit" value="${kit.prefix}-src"/>
<property name="binary.kit" value="${kit.prefix}-bin"/>
+ <available file="${FLEX_HOME}/../flex-tlf/textLayout"
+ type="dir"
+ property="TLF_HOME"
+ value="${FLEX_HOME}/../flex-tlf" />
+
+ <available file="${FLEX_HOME}/../tlf/textLayout"
+ type="dir"
+ property="TLF_HOME"
+ value="${FLEX_HOME}/../tlf" />
+
<!--
Optional jars but should be in place for a real release build.
@@ -120,7 +130,7 @@
<property name="build.noprompt" value="set" />
</target>
- <target name="prebuild" depends="check-compile-env,thirdparty-downloads,create-description,build-properties"
+ <target name="prebuild" depends="check-compile-env,thirdparty-downloads,create-description"
description="Stuff that needs to be done before any builds." />
<target name="check-compile-env" depends="check-playerglobal-home,check-air-home,check-pixelbender-home"
@@ -253,12 +263,6 @@
<ant dir="${basedir}/frameworks" target="flex-config" />
</target>
- <target name="build-properties">
- <copy overwrite="false" failonerror="true" verbose="true"
- file="${basedir}/build.properties.template"
- tofile="${basedir}/build.properties" />
- </target>
-
<target name="setup-binary-release" depends="thirdparty-clean"
description="Set properties needed to turn on features for release sdk">
<!--
@@ -545,6 +549,9 @@
<!-- frameworks -->
<antcall target="stage-frameworks"/>
+ <!-- tlf -->
+ <antcall target="stage-tlf"/>
+
<!-- modules -->
<antcall target="stage-modules"/>
@@ -666,6 +673,16 @@
</copy>
</target>
+ <!-- tlf -->
+ <target name="stage-tlf">
+ <copy todir="${basedir}/temp/frameworks/projects/textLayout" includeEmptyDirs="false">
+ <fileset dir="${TLF_HOME}/textLayout">
+ <include name="src/**"/>
+ <include name="manifest.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="stage-bin">
<copy todir="${basedir}/temp/bin" includeEmptyDirs="false">
<fileset dir="${basedir}/bin">
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6bb05798/frameworks/build_framework.xml
----------------------------------------------------------------------
diff --git a/frameworks/build_framework.xml b/frameworks/build_framework.xml
index 6189557..41b8229 100644
--- a/frameworks/build_framework.xml
+++ b/frameworks/build_framework.xml
@@ -58,7 +58,7 @@
<property name="spark_dmv.dir" value="${projects.dir}/spark_dmv"/>
<property name="apache.dir" value="${projects.dir}/apache"/>
<property name="experimental.dir" value="${projects.dir}/experimental"/>
- <property name="textLayout.dir" value="${tlf.branch}"/>
+ <property name="textLayout.dir" value="${projects.dir}/textLayout"/>
<property name="experimental.dir" value="${projects.dir}/experimental"/>
<!-- automation -->
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6bb05798/frameworks/projects/textLayout/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/build.xml b/frameworks/projects/textLayout/build.xml
index d4d1f2c..ff5b790 100644
--- a/frameworks/projects/textLayout/build.xml
+++ b/frameworks/projects/textLayout/build.xml
@@ -22,9 +22,9 @@
<property file="${FLEX_HOME}/env.properties"/>
<property environment="env"/>
+ <property file="${FLEX_HOME}/local.properties"/>
<property file="${FLEX_HOME}/build.properties"/>
- <property name="source.dir" value="${tlf.branch}"/>
<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"/>
@@ -32,18 +32,23 @@
<available file="${FLEX_HOME}/../flex-tlf/textLayout"
type="dir"
- property="tlf.branch"
- value="${FLEX_HOME}/../flex-tlf/textLayout" />
+ property="TLF_HOME"
+ value="${FLEX_HOME}/../flex-tlf" />
<available file="${FLEX_HOME}/../tlf/textLayout"
type="dir"
- property="tlf.branch"
- value="${FLEX_HOME}/../tlf/textLayout" />
+ property="TLF_HOME"
+ value="${FLEX_HOME}/../tlf" />
- <available file="${source.dir}"
+ <available file="src"
type="dir"
property="src.folder.exists"/>
+ <available file="src"
+ type="dir"
+ property="TLF_HOME"
+ value="${FLEX_HOME}/frameworks/projects" />
+
<!-- We use abbreviated token names here as, the 'release'
and 'debug' tokens conflict with those specified in
build.properties
@@ -76,9 +81,9 @@
<attribute name="locale"/>
<sequential>
<echo message="creating 'fat-swc' in textLayout_rb.swc for @{locale}"/>
- <mkdir dir="${tlf.branch}/bundles/@{locale}/docs" />
+ <mkdir dir="bundles/@{locale}/docs" />
<zip destfile="${FLEX_HOME}/frameworks/locale/@{locale}/textLayout_rb.swc" update="true">
- <zipfileset dir="${tlf.branch}/bundles/@{locale}/docs" prefix="docs">
+ <zipfileset dir="bundles/@{locale}/docs" prefix="docs">
<include name="*.*"/>
<exclude name="ASDoc_Config.xml"/>
<exclude name="overviews.xml"/>
@@ -195,20 +200,20 @@
<load-config filename="compile-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="+source.dir=${tlf.branch}" />
+ <!--<arg value="+source.dir=${tlf.branch}" />-->
<define name="CONFIG::debug" value="${dbg}"/>
<define name="CONFIG::release" value="${rel}"/>
</compc>
</target>
<target name="compile.external" description="Compile textLayout.swc in flex-tlf repo" unless="src.folder.exists">
- <ant dir="${tlf.branch}/.." target="textLayout_flex"/>
- <copy file="${tlf.branch}/../bin/textLayout.swc" toDir="${FLEX_HOME}/frameworks/libs" />
+ <ant dir="${TLF_HOME}" target="textLayout_flex"/>
+ <copy file="${TLF_HOME}/bin/textLayout.swc" toDir="${FLEX_HOME}/frameworks/libs" />
</target>
<target name="clean-external" description="clean in flex-tlf repo" unless="src.folder.exists">
- <echo message="cleaning ${tlf.branch}" />
- <ant dir="${tlf.branch}/.." target="clean"/>
+ <echo message="cleaning ${TLF_HOME}" />
+ <ant dir="${TLF_HOME}" target="clean"/>
</target>
<target name="clean-temp-docs">
@@ -238,13 +243,13 @@
<!-- Call asdoc to generate dita xml files -->
<asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" fork="true">
- <compiler.source-path path-element="${tlf.branch}/src"/>
+ <compiler.source-path path-element="${TLF_HOME}/textLayout/src"/>
<compiler.show-actionscript-warnings>false</compiler.show-actionscript-warnings>
<doc-classes class="flashx.textLayout.CoreClasses"/>
<doc-classes class="flashx.textLayout.EditClasses"/>
<doc-classes class="flashx.textLayout.ConversionClasses"/>
<doc-namespaces uri="library://ns.adobe.com/flashx/textLayout"/>
- <namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${tlf.branch}/manifest.xml"/>
+ <namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${TLF_HOME}/textLayout/manifest.xml"/>
<jvmarg line="${asdoc.jvm.args}"/>
<static-link-runtime-shared-libraries/>
<define name="CONFIG::debug" value="${dbg}"/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/6bb05798/frameworks/projects/textLayout/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/compile-config.xml b/frameworks/projects/textLayout/compile-config.xml
index edd670f..80dae64 100644
--- a/frameworks/projects/textLayout/compile-config.xml
+++ b/frameworks/projects/textLayout/compile-config.xml
@@ -33,12 +33,12 @@
<namespaces>
<namespace>
<uri>library://ns.adobe.com/flashx/textLayout</uri>
- <manifest>${source.dir}/manifest.xml</manifest>
+ <manifest>manifest.xml</manifest>
</namespace>
</namespaces>
<source-path>
- <path-element>${source.dir}/src</path-element>
+ <path-element>src</path-element>
</source-path>
<show-actionscript-warnings>false</show-actionscript-warnings>
@@ -54,7 +54,7 @@
<include-file>
<name>manifest.xml</name>
- <path>${source.dir}/manifest.xml</path>
+ <path>manifest.xml</path>
</include-file>
<include-namespaces>