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