fix calls into downloads
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7f5ed507 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7f5ed507 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7f5ed507 Branch: refs/heads/feature/maven-migration-test Commit: 7f5ed50734571f3f86ebc83629cf9b65bbf296fc Parents: 359bdf4 Author: Alex Harui <[email protected]> Authored: Fri Apr 22 15:04:58 2016 -0700 Committer: Alex Harui <[email protected]> Committed: Fri Apr 22 15:04:58 2016 -0700 ---------------------------------------------------------------------- compiler-build-tools/build.xml | 48 +++++++++++++++++++------------------ compiler-jburg-types/build.xml | 19 ++++++++------- 2 files changed, 35 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7f5ed507/compiler-build-tools/build.xml ---------------------------------------------------------------------- diff --git a/compiler-build-tools/build.xml b/compiler-build-tools/build.xml index 2366ecf..82f50b3 100644 --- a/compiler-build-tools/build.xml +++ b/compiler-build-tools/build.xml @@ -29,14 +29,16 @@ <!-- The 'compiler' property is the absolute path, with forward slashes, --> <!-- to the 'compiler-build-tools' directory that contains this file. --> - <!-- All input paths are expressed as absolute paths starting with ${compiler}. --> - <pathconvert property="compiler" dirsep="/"> + <!-- All input paths are expressed as absolute paths starting with ${compiler-build-tools}. --> + <pathconvert property="compiler-build-tools" dirsep="/"> <path location="${basedir}"/> </pathconvert> + <property name="FALCON_HOME" value="${basedir}/../compiler"/> + <!-- Properties can be overridden locally by loading a local.properties file --> <!-- Java 8 users probably need javadoc.params=-Xdoclint:none --> - <property file="${compiler}/local.properties"/> + <property file="${compiler-build-tools}/local.properties"/> <property name="src.depend" value="true"/> @@ -57,7 +59,7 @@ </condition> <target name="compiler.test.downloads"> - <ant antfile="${compiler}/../compiler/src/test/downloads.xml" inheritAll="false"/> + <ant antfile="${compiler-build-tools}/../compiler/src/test/downloads.xml" dir="${compiler-build-tools}/../compiler/src/test" inheritAll="false"/> </target> <!-- @@ -69,14 +71,14 @@ <!-- The AnnotateClass tool is used to add @SupressWarnings annotations to Java code produced by ANTLR and JBurg --> <target name="annotate.class" description="Compiles the AnnotateClass build tool" > - <mkdir dir="${compiler}/target/classes"/> - <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/target/classes" includeAntRuntime="true" + <mkdir dir="${compiler-build-tools}/target/classes"/> + <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler-build-tools}/target/classes" includeAntRuntime="true" source="${javac.src}" target="${javac.src}"> <compilerarg value="-Xlint:all,-path,-fallthrough"/> - <src path="${compiler}/src/main/java"/> + <src path="${compiler-build-tools}/src/main/java"/> <include name="org/apache/flex/compiler/tools/annotate/AnnotateClass.java"/> <classpath> - <pathelement location="${compiler}/target/classes"/> + <pathelement location="${compiler-build-tools}/target/classes"/> </classpath> </javac> </target> @@ -84,10 +86,10 @@ <!-- The UnknownTreePatternInputOutput tool is used to compile an XML file containing unknown AST patterns to a Java class --> <target name="unknown.tree.pattern.input.output" description="Compiles the UnknownTreePatternInputOutput tool"> - <mkdir dir="${compiler}/target/classes"/> - <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/target/classes" + <mkdir dir="${compiler-build-tools}/target/classes"/> + <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler-build-tools}/target/classes" includeAntRuntime="true" source="${javac.src}" target="${javac.src}"> - <src path="${compiler}/src/main/java"/> + <src path="${compiler-build-tools}/src/main/java"/> <include name="org/apache/flex/compiler/internal/as/codegen/UnknownTreePatternInputOutput.java"/> <compilerarg value="-Xlint:all,-path,-fallthrough"/> </javac> @@ -97,27 +99,27 @@ <!-- filled with localization strings from classes extending org.apache.flex.compiler.CompilerProblem --> <target name="problem.localizer" description="Compiles the ProblemLocalizer build tool"> - <mkdir dir="${compiler}/target/classes"/> - <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/target/classes" includeAntRuntime="true" + <mkdir dir="${compiler-build-tools}/target/classes"/> + <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler-build-tools}/target/classes" includeAntRuntime="true" source="${javac.src}" target="${javac.src}"> <compilerarg value="-Xlint:all,-path,-fallthrough"/> - <src path="${compiler}/tools/problemlocalizer"/> + <src path="${compiler-build-tools}/tools/problemlocalizer"/> <classpath> - <pathelement location="${compiler}/target/classes"/> + <pathelement location="${compiler-build-tools}/target/classes"/> </classpath> </javac> </target> - <target name="test.classes"> - <mkdir dir="${compiler}/target/classes"/> - <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/target/classes" includeAntRuntime="true" + <target name="test.classes" depends="compiler.test.downloads"> + <mkdir dir="${compiler-build-tools}/target/classes"/> + <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler-build-tools}/target/classes" includeAntRuntime="true" source="${javac.src}" target="${javac.src}"> <compilerarg value="-Xlint:all,-path,-fallthrough"/> - <src path="${compiler}/src/main/java"/> + <src path="${compiler-build-tools}/src/main/java"/> <include name="org/apache/flex/utils/*.java"/> <classpath> - <pathelement location="${compiler}/target/classes"/> - <fileset dir="${compiler}/../compiler/lib/external" includes="**/*.jar"/> + <pathelement location="${compiler-build-tools}/target/classes"/> + <fileset dir="${compiler-build-tools}/../compiler/lib/external" includes="**/*.jar"/> </classpath> </javac> </target> @@ -131,11 +133,11 @@ --> <target name="clean" description="clean"> - <delete dir="${compiler}/target/classes"/> + <delete dir="${compiler-build-tools}/target/classes"/> </target> <target name="wipe" depends="clean" description="Wipes everything that didn't come from Git."> - <delete dir="${compiler}/target"/> + <delete dir="${compiler-build-tools}/target"/> </target> </project> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7f5ed507/compiler-jburg-types/build.xml ---------------------------------------------------------------------- diff --git a/compiler-jburg-types/build.xml b/compiler-jburg-types/build.xml index 5c98c8e..7b2568c 100644 --- a/compiler-jburg-types/build.xml +++ b/compiler-jburg-types/build.xml @@ -30,13 +30,13 @@ <!-- The 'compiler' property is the absolute path, with forward slashes, --> <!-- to the 'compiler-build-tools' directory that contains this file. --> <!-- All input paths are expressed as absolute paths starting with ${compiler}. --> - <pathconvert property="compiler" dirsep="/"> + <pathconvert property="compiler-jburg-types" dirsep="/"> <path location="${basedir}"/> </pathconvert> <!-- Properties can be overridden locally by loading a local.properties file --> <!-- Java 8 users probably need javadoc.params=-Xdoclint:none --> - <property file="${compiler}/local.properties"/> + <property file="${compiler-jburg-types}/local.properties"/> <property name="src.depend" value="true"/> @@ -60,14 +60,14 @@ <!-- The IASNodeAdapter tool is used by JBurg --> <target name="IASNodeAdapter" depends="compiler.downloads" description="Compiles the IASNodeAdapter class" > - <mkdir dir="${compiler}/target/classes"/> - <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/target/classes" includeAntRuntime="true" + <mkdir dir="${compiler-jburg-types}/target/classes"/> + <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler-jburg-types}/target/classes" includeAntRuntime="true" source="${javac.src}" target="${javac.src}"> <compilerarg value="-Xlint:all,-path,-fallthrough"/> - <src path="${compiler}/src/main/java"/> + <src path="${compiler-jburg-types}/src/main/java"/> <include name="org/apache/flex/compiler/internal/as/codegen/IASNodeAdapter.java"/> <classpath> - <pathelement location="${compiler}/../compiler/lib/jburg.jar"/> + <pathelement location="${compiler-jburg-types}/../compiler/lib/external/jburg.jar"/> </classpath> </javac> </target> @@ -75,7 +75,8 @@ <target name="main" depends="IASNodeAdapter" /> <target name="compiler.downloads"> - <ant antfile="${compiler}/../compiler/src/main/resources/downloads.xml" inheritAll="false"/> + <ant antfile="${compiler-jburg-types}/../compiler/src/main/resources/downloads.xml" + dir="${compiler-jburg-types}/../compiler/src/main/resources" inheritAll="false"/> </target> <!-- @@ -84,11 +85,11 @@ --> <target name="clean" description="clean"> - <delete dir="${compiler}/target/classes"/> + <delete dir="${compiler-jburg-types}/target/classes"/> </target> <target name="wipe" depends="clean" description="Wipes everything that didn't come from Git."> - <delete dir="${compiler}/target"/> + <delete dir="${compiler-jburg-types}/target"/> </target> </project>
