flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ftho...@apache.org
Subject [1/5] git commit: FLEX-33451: Fixed TLF
Date Fri, 05 Apr 2013 12:02:42 GMT
Updated Branches:
  refs/heads/develop 66325004f -> 92b4f3fff


FLEX-33451: Fixed TLF


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/bd52b305
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/bd52b305
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/bd52b305

Branch: refs/heads/develop
Commit: bd52b305226a326a514cc930ce79d89d6d940db0
Parents: 6282657
Author: Frédéric THOMAS <fthomas@apache.org>
Authored: Tue Mar 26 14:28:02 2013 +0100
Committer: Frédéric THOMAS <fthomas@apache.org>
Committed: Tue Mar 26 14:35:34 2013 +0100

----------------------------------------------------------------------
 frameworks/projects/textLayout/build.xml |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/bd52b305/frameworks/projects/textLayout/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/textLayout/build.xml b/frameworks/projects/textLayout/build.xml
index 7437408..adb75bb 100644
--- a/frameworks/projects/textLayout/build.xml
+++ b/frameworks/projects/textLayout/build.xml
@@ -30,15 +30,15 @@
 	<property name="flexTasks.location" value="${FLEX_HOME}/lib/flexTasks.jar"/>
 	<property name="project.uri" value="library://ns.adobe.com/flashx/textLayout"/>
 
-    <available file="${FLEX_HOME}/../flex-tlf" 
+    <available file="${FLEX_HOME}/../flex-tlf/textLayout" 
             type="dir" 
             property="tlf.branch"
-            value="${FLEX_HOME}/../flex-tlf" />
+            value="${FLEX_HOME}/../flex-tlf/textLayout" />
 
-    <available file="${FLEX_HOME}/../tlf" 
+    <available file="${FLEX_HOME}/../tlf/textLayout" 
             type="dir" 
             property="tlf.branch"
-            value="${FLEX_HOME}/../tlf" />
+            value="${FLEX_HOME}/../tlf/textLayout" />
 
     <available file="${source.dir}" 
             type="dir" 
@@ -76,9 +76,9 @@
 		<attribute name="locale"/>
 		<sequential>
 			<echo message="creating 'fat-swc' in textLayout_rb.swc for @{locale}"/>
-			<mkdir dir="${source.dir}/bundles/@{locale}/docs" />
+			<mkdir dir="${tlf.branch}/bundles/@{locale}/docs" />
 			<zip destfile="${FLEX_HOME}/frameworks/locale/@{locale}/textLayout_rb.swc" update="true">
-				<zipfileset dir="${source.dir}/bundles/@{locale}/docs" prefix="docs">
+				<zipfileset dir="${tlf.branch}/bundles/@{locale}/docs" prefix="docs">
 					<include name="*.*"/>
 					<exclude name="ASDoc_Config.xml"/>
 					<exclude name="overviews.xml"/>
@@ -195,20 +195,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=${source.dir}" />
+            <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.branch}/.." target="textLayout_flex"/>
+        <copy file="${tlf.branch}/../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"/>
+        <ant dir="${tlf.branch}/.." target="clean"/>
     </target>
 
     <target name="clean-temp-docs">
@@ -238,13 +238,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="${source.dir}/src"/>
+            <compiler.source-path path-element="${tlf.branch}/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="${source.dir}/manifest.xml"/>
+            <namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${tlf.branch}/manifest.xml"/>
             <jvmarg line="${asdoc.jvm.args}"/>
 			<static-link-runtime-shared-libraries/>
 			<define name="CONFIG::debug" value="${dbg}"/>


Mime
View raw message