incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1374288 - in /incubator/flex/tlf/trunk: ./ build.xml
Date Fri, 17 Aug 2012 14:33:58 GMT
Author: cframpton
Date: Fri Aug 17 14:33:58 2012
New Revision: 1374288

URL: http://svn.apache.org/viewvc?rev=1374288&view=rev
Log:
Minor modifications so trunk will build.  By default FLEX_HOME is the relative path to sdk/trunk.
 Override on cmd line with -D=FLEX_HOME=path if you'd like to use a different Flex SDK.

Modified:
    incubator/flex/tlf/trunk/   (props changed)
    incubator/flex/tlf/trunk/build.xml

Propchange: incubator/flex/tlf/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 17 14:33:58 2012
@@ -0,0 +1 @@
+bin

Modified: incubator/flex/tlf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/tlf/trunk/build.xml?rev=1374288&r1=1374287&r2=1374288&view=diff
==============================================================================
--- incubator/flex/tlf/trunk/build.xml (original)
+++ incubator/flex/tlf/trunk/build.xml Fri Aug 17 14:33:58 2012
@@ -16,13 +16,16 @@
 -->
 
 <project name="tlf" default="main" basedir=".">
-	<property name="FLEX_HOME" value="D:\flex_sdk_4.5.0.19786"/>
+
+    <!-- Default Flex SDK is the trunk.  Override on cmd line with -D=FLEX_HOME=path.
-->
+	<property name="FLEX_HOME" value="${basedir}/../../sdk/trunk"/>
+	<echo>FLEX_HOME is ${FLEX_HOME}</echo>
+	
 	<property name="flex.sdk.frameworks" value="${FLEX_HOME}/frameworks"/>
 	<property name="flex.locale" value="en_US"/>
 
 	<property name="output.dir" value="bin"/>
 	<property name="output.docs" value="${FLEX_HOME}/tempDoc"/>
-	<property name="flexTasks.location" value="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
 	<property name="project.uri" value="library://ns.adobe.com/flashx/textLayout"/>
 	<property name="compc.jvm.args" value="-Xmx384m" />
 	<property name="textLayout.namespace" value="flashx.textLayout"/>
@@ -45,7 +48,14 @@
 		<istrue value="${debug}"/>
 	</condition>
 
-	<taskdef resource="flexTasks.tasks" classpath="${flexTasks.location}"/>
+    <!-- for Flex tags suchs as mxmlc and compc -->
+    <path id="flexTasks.path">
+        <fileset dir="${FLEX_HOME}">
+            <include name="lib/flexTasks.jar" />
+            <include name="ant/lib/flexTasks.jar" />
+        </fileset>
+    </path>
+	<taskdef resource="flexTasks.tasks" classpathref="flexTasks.path"/>
 
 	<target name="all" depends="clean,textLayout, asTestApps,textLayout_editBar, textLayout_ui,
testApps, automation_core, automation_tests, automation_apps" description="Clean build of
TLF component and associated applications"/>
 	<target name="main" depends="clean,textLayout" description="Clean build of textLayout.swc"/>



Mime
View raw message