Return-Path: 
 <flex-commits-return-2518-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 39F41E3B3
	for <apmail-incubator-flex-commits-archive@minotaur.apache.org>;
 Tue, 20 Nov 2012 16:06:10 +0000 (UTC)
Received: (qmail 83095 invoked by uid 500); 20 Nov 2012 16:06:10 -0000
Delivered-To: apmail-incubator-flex-commits-archive@incubator.apache.org
Received: (qmail 82871 invoked by uid 500); 20 Nov 2012 16:06:08 -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 82847 invoked by uid 99); 20 Nov 2012 16:06:07 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2012 16:06:07 +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; Tue, 20 Nov 2012 16:06:04 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 621FA23888E4;
	Tue, 20 Nov 2012 16:05:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1411716 - in /incubator/flex/falcon/trunk: ./
 compiler.tests/
 compiler.tests/build.xml compiler/build.xml compiler/downloads.xml
Date: Tue, 20 Nov 2012 16:05:42 -0000
To: flex-commits@incubator.apache.org
From: cframpton@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121120160543.621FA23888E4@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cframpton
Date: Tue Nov 20 16:05:41 2012
New Revision: 1411716

URL: http://svn.apache.org/viewvc?rev=1411716&view=rev
Log:
Add includeAntRuntime="true" to javac tasks so that with Ant 1.8 they will work the same as they did with Ant 1.7.

Modified:
    incubator/flex/falcon/trunk/   (props changed)
    incubator/flex/falcon/trunk/compiler.tests/   (props changed)
    incubator/flex/falcon/trunk/compiler.tests/build.xml
    incubator/flex/falcon/trunk/compiler/build.xml
    incubator/flex/falcon/trunk/compiler/downloads.xml

Propchange: incubator/flex/falcon/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 20 16:05:41 2012
@@ -0,0 +1 @@
+sdk

Propchange: incubator/flex/falcon/trunk/compiler.tests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 20 16:05:41 2012
@@ -1 +1,4 @@
 temp
+classes
+lib
+results

Modified: incubator/flex/falcon/trunk/compiler.tests/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/falcon/trunk/compiler.tests/build.xml?rev=1411716&r1=1411715&r2=1411716&view=diff
==============================================================================
--- incubator/flex/falcon/trunk/compiler.tests/build.xml (original)
+++ incubator/flex/falcon/trunk/compiler.tests/build.xml Tue Nov 20 16:05:41 2012
@@ -54,7 +54,7 @@
 
     <target name="compile.unit.tests">
         <mkdir dir="${compiler.tests}/classes"/>
-        <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler.tests}/classes">
+        <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler.tests}/classes" includeAntRuntime="true">
             <src path="${compiler.tests}/unit-tests"/>
             <compilerarg value="-Xlint:all,-path"/>
             <classpath>

Modified: incubator/flex/falcon/trunk/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/falcon/trunk/compiler/build.xml?rev=1411716&r1=1411715&r2=1411716&view=diff
==============================================================================
--- incubator/flex/falcon/trunk/compiler/build.xml (original)
+++ incubator/flex/falcon/trunk/compiler/build.xml Tue Nov 20 16:05:41 2012
@@ -230,7 +230,7 @@
 	<target name="annotate.class"
 		    description="Compiles the AnnotateClass build tool" >
         <mkdir dir="${compiler}/generated/classes"/>
-        <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/generated/classes">
+        <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/generated/classes" includeAntRuntime="true">
             <compilerarg value="-Xlint:all,-path,-fallthrough"/>
             <src path="${compiler}/tools/AnnotateClass"/>
             <classpath>
@@ -243,7 +243,7 @@
     <target name="unknown.tree.pattern.input.output"
             description="Compiles the UnknownTreePatternInputOutput tool">
         <mkdir dir="${compiler}/generated/classes"/>
-        <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/generated/classes" classpathref="classpath">
+        <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/generated/classes" classpathref="classpath" includeAntRuntime="true">
             <src path="${compiler}/src"/>
             <include name="org/apache/flex/compiler/internal/as/codegen/UnknownTreePatternInputOutput.java"/>
             <compilerarg value="-Xlint:all,-path,-fallthrough"/>
@@ -255,7 +255,7 @@
 	<target name="problem.localizer"
 	        description="Compiles the ProblemLocalizer build tool">
 	    <mkdir dir="${compiler}/generated/classes"/>
-	    <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/generated/classes">
+	    <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/generated/classes" includeAntRuntime="true">
 	        <compilerarg value="-Xlint:all,-path,-fallthrough"/>
 	        <src path="${compiler}/tools/problemlocalizer"/>
 	        <classpath>
@@ -409,7 +409,7 @@
  
     <target name="node.adapter">
         <mkdir dir="${compiler}/generated/classes"/>
-        <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/generated/classes" classpathref="classpath">
+        <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/generated/classes" classpathref="classpath" includeAntRuntime="true">
             <src path="${compiler}/src"/>
         	<include name="org/apache/flex/compiler/internal/as/codegen/IASNodeAdapter.java"/>
             <compilerarg value="-Xlint:all,-path,-fallthrough"/>
@@ -532,7 +532,7 @@
 
     <target name="compile" depends="eclipse, src.depend" description="compile">
         <javac debug="${javac.debug}" deprecation="${javac.deprecation}"
-        	   includes="**/*.java" destdir="${compiler}/generated/classes" classpathref="classpath">
+        	   includes="**/*.java" destdir="${compiler}/generated/classes" classpathref="classpath" includeAntRuntime="true">
             <src path="${compiler}/src"/>
             <src path="${compiler}/generated/src"/>
             <compilerarg value="-Xlint:all,-path,-fallthrough,-cast"/>
@@ -802,8 +802,10 @@
 	        description="Builds support.swc">
         <echo message="Building support.swc"/>
         <taskdef name="compc" classname="flex.ant.CompcTask">
+            <!-- If using the development branch then in lib directory and if using a binary kit in ant/lib directory.  -->
             <classpath>
                 <pathelement location="${compiler}/generated/dist/sdk/lib/flexTasks.jar"/>
+                <pathelement location="${compiler}/generated/dist/sdk/ant/lib/flexTasks.jar"/>
             </classpath>
         </taskdef>
         <compc output="${sdk}/frameworks/libs/support.swc" include-classes="mx.managers.SystemManager mx.core.FlexModuleFactory StyleModuleBase EmptyModuleFactory">

Modified: incubator/flex/falcon/trunk/compiler/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/falcon/trunk/compiler/downloads.xml?rev=1411716&r1=1411715&r2=1411716&view=diff
==============================================================================
--- incubator/flex/falcon/trunk/compiler/downloads.xml (original)
+++ incubator/flex/falcon/trunk/compiler/downloads.xml Tue Nov 20 16:05:41 2012
@@ -367,7 +367,7 @@
 		<echo message="Building lib/lzma.jar"/>
         <mkdir dir="${download.dir}/temp/Java/classes" />
         <javac destdir="${download.dir}/temp/Java/classes" srcdir="${download.dir}/temp/Java/SevenZip"
-            includes="**/*.java" />
+            includes="**/*.java" includeAntRuntime="true"/>
         <copy todir="${download.dir}/temp/Java/classes/SevenZip">
             <fileset dir="${download.dir}/temp">
                 <include name="7zC.txt"/>