Return-Path: 
 <flex-commits-return-1376-apmail-incubator-flex-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-flex-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-flex-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 25917DA8C
	for <apmail-incubator-flex-commits-archive@minotaur.apache.org>;
 Fri, 17 Aug 2012 14:34:46 +0000 (UTC)
Received: (qmail 20344 invoked by uid 500); 17 Aug 2012 14:34:45 -0000
Delivered-To: apmail-incubator-flex-commits-archive@incubator.apache.org
Received: (qmail 20307 invoked by uid 500); 17 Aug 2012 14:34:45 -0000
Mailing-List: contact flex-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:flex-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:flex-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:flex-commits@incubator.apache.org>
List-Id: <flex-commits.incubator.apache.org>
Reply-To: flex-dev@incubator.apache.org
Delivered-To: mailing list flex-commits@incubator.apache.org
Received: (qmail 20300 invoked by uid 99); 17 Aug 2012 14:34:45 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Aug 2012 14:34:45 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Aug 2012 14:34:42 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id F0C01238890D;
	Fri, 17 Aug 2012 14:33:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1374288 - in /incubator/flex/tlf/trunk: ./ build.xml
Date: Fri, 17 Aug 2012 14:33:58 -0000
To: flex-commits@incubator.apache.org
From: cframpton@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120817143358.F0C01238890D@eris.apache.org>

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"/>