You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/04/23 00:33:20 UTC
[1/5] git commit: [flex-falcon]
[refs/heads/feature/maven-migration-test] - remove swfutils now that it is
folded into oem and debugger
Repository: flex-falcon
Updated Branches:
refs/heads/feature/maven-migration-test 8a546a9d1 -> e629adf6a
remove swfutils now that it is folded into oem and debugger
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a6d95127
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a6d95127
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a6d95127
Branch: refs/heads/feature/maven-migration-test
Commit: a6d9512731a019b4ec56bf49a5423a8c17ff4bb7
Parents: 8a546a9
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 22 14:05:02 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 22 14:05:02 2016 -0700
----------------------------------------------------------------------
NOTICE.swfutils | 9 ----
build.xml | 120 ++-------------------------------------------------
2 files changed, 3 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a6d95127/NOTICE.swfutils
----------------------------------------------------------------------
diff --git a/NOTICE.swfutils b/NOTICE.swfutils
deleted file mode 100644
index 5b4c962..0000000
--- a/NOTICE.swfutils
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Flex (swfutils)
-Copyright 2012-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-The Initial Developer of the Original Code, known as Adobe Flex, is Adobe
-Systems Incorporated (http://www.adobe.com/).
- Copyright 2003 - 2012 Adobe Systems Incorporated. All Rights Reserved.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a6d95127/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 10e731b..74eb553 100644
--- a/build.xml
+++ b/build.xml
@@ -84,109 +84,13 @@
<ant dir="compiler" target="test"/>
</target>
- <target name="compiler.oem" depends="compiler.jx, swfutils" description="Builds FB Integration JAR">
+ <target name="compiler.oem" depends="compiler.jx" description="Builds FB Integration JAR">
<ant dir="flex-compiler-oem" target="main"/>
</target>
- <target name="debugger" depends="swfutils" description="Builds FDB JAR">
+ <target name="debugger" description="Builds FDB JAR">
<ant dir="debugger" target="jar"/>
</target>
-
- <target name="swfutils_copy" unless="swfutils.bundled"
- description="Copies a subset of files from swfutils.jar into the swfutils folder so flex-compiler-oem and the debugger can use them">
- <mkdir dir="swfutils" />
- <mkdir dir="swfutils/src" />
- <mkdir dir="swfutils/classes" />
- <copy todir="swfutils/src" >
- <fileset dir="${FLEX_SDK_HOME}/modules/swfutils/src">
- <include name="java/flash/localization/**"/>
- <include name="java/flash/swf/Movie.java"/>
- <include name="java/flash/swf/actions/**"/>
- <include name="java/flash/swf/Action.java"/>
- <include name="java/flash/swf/ActionConstants.java"/>
- <include name="java/flash/swf/ActionDecoder.java"/>
- <include name="java/flash/swf/ActionFactory.java"/>
- <include name="java/flash/swf/ActionHandler.java"/>
- <include name="java/flash/swf/CompressionLevel.java"/>
- <include name="java/flash/swf/debug/**"/>
- <include name="java/flash/swf/DebugDecoder.java"/>
- <include name="java/flash/swf/DebugHandler.java"/>
- <include name="java/flash/swf/DebugTags.java"/>
- <include name="java/flash/swf/Dictionary.java"/>
- <include name="java/flash/swf/Frame.java"/>
- <include name="java/flash/swf/Header.java"/>
- <include name="java/flash/swf/MovieMetaData.java"/>
- <include name="java/flash/swf/RandomAccessBuffer.java"/>
- <include name="java/flash/swf/SwfDecoder.java"/>
- <include name="java/flash/swf/SwfEncoder.java"/>
- <include name="java/flash/swf/SwfFormatException.java"/>
- <include name="java/flash/swf/Tag.java"/>
- <include name="java/flash/swf/TagDecoder.java"/>
- <include name="java/flash/swf/TagHandler.java"/>
- <include name="java/flash/swf/TagValues.java"/>
- <include name="java/flash/swf/tags/**"/>
- <include name="java/flash/swf/tools/Disassembler.java"/>
-<!-- <include name="java/flash/swf/tags/EnableDebugger.java"/>
- <include name="java/flash/swf/tags/DefineShape.java"/>
- <include name="java/flash/swf/tags/DefineTag.java"/>
- <include name="java/flash/swf/tags/GenericTag.java"/>
- <include name="java/flash/swf/tags/ScriptLimits.java"/>
- <include name="java/flash/swf/tags/SetBackgroundColor.java"/>
- <include name="java/flash/swf/tags/ShowFrame.java"/>
- <include name="java/flash/swf/tags/FileAttributes.java"/>
- <include name="java/flash/swf/tags/EnableTelemetry.java"/>
- <include name="java/flash/swf/tags/ProductInfo.java"/>
- <include name="java/flash/swf/tags/Metadata.java"/>
- <include name="java/flash/swf/tags/DefineSceneAndFrameLabelData.java"/>
- <include name="java/flash/swf/types/FlashUUID.java"/>
- <include name="java/flash/swf/types/Rect.java"/>
- -->
- <include name="java/flash/swf/types/**"/>
- <include name="java/flash/util/ExceptionUtil.java"/>
- <include name="java/flash/util/FieldFormat.java"/>
- <include name="java/flash/util/FileUtils.java"/>
- <include name="java/flash/util/IntMap.java"/>
- <include name="java/flash/util/Trace.java"/>
- </fileset>
- </copy>
- </target>
-
- <target name="swfutils" depends="swfutils_check,check-flex-home,swfutils_copy"
- description="Builds swfutils.jar">
- <mkdir dir="swfutils" />
- <mkdir dir="swfutils/src" />
- <mkdir dir="swfutils/classes" />
- <property name="javac.src" value="1.6"/>
- <javac includes="**/*.java" destdir="${basedir}/swfutils/classes"
- source="${javac.src}" target="${javac.src}">
- <src path="${basedir}/swfutils/src" />
- </javac>
- <mkdir dir="${basedir}/swfutils/classes/META-INF"/>
- <copy file="${basedir}/LICENSE.base" tofile="${basedir}/swfutils/classes/META-INF/LICENSE"/>
- <copy file="${basedir}/NOTICE.swfutils" tofile="${basedir}/swfutils/classes/META-INF/NOTICE"/>
- <jar destfile="${basedir}/compiler/generated/dist/sdk/lib/swfutils.jar" basedir="${basedir}/swfutils/classes" includes="**/*.class **/*.properties **/*.txt">
- <include name="META-INF/LICENSE"/>
- <include name="META-INF/NOTICE"/>
- <manifest>
- <attribute name="Sealed" value="${manifest.sealed}" />
- <attribute name="Implementation-Title" value="${manifest.Implementation-Title}" />
- <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}" />
- <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}" />
- </manifest>
- </jar>
- </target>
-
- <target name="swfutils_check" description="determine if we have bundled swfutils source">
- <available file="swfutils"
- type="dir"
- property="swfutils.bundled"
- value="true" />
- <!-- set this to skip FLEX_HOME check -->
- <available file="swfutils"
- type="dir"
- property="mxmlc.jar.exists"
- value="true" />
- </target>
<target name="compiler.jx" description="Builds FalconJX.">
<ant dir="compiler-jx" target="main"/>
@@ -227,7 +131,6 @@
<ant dir="compiler-jx/src/test" target="wipe"/>
<ant dir="flex-compiler-oem" target="wipe"/>
<ant dir="debugger" target="clean"/>
- <delete dir="${basedir}/swfutils" failonerror="false" includeEmptyDirs="true"/>
<delete dir="${basedir}/out" failonerror="false" includeEmptyDirs="true"/>
<delete dir="${basedir}/temp" failonerror="false" includeEmptyDirs="true"/>
<antcall target="extern.swcs.wipe"/>
@@ -272,7 +175,7 @@
description="Creates source and binary kits for Apache Falcon and FalconJX."/>
<target name="source-release"
- depends="wipe-all,check-flex-home,swfutils,source-package"
+ depends="wipe-all,check-flex-home,source-package"
description="Packages the source release kit which is the official Apache release."/>
<target name="binary-release"
@@ -337,7 +240,6 @@
<include name="NOTICE.base"/>
<include name="NOTICE.fdb"/>
<include name="NOTICE.oem"/>
- <include name="NOTICE.swfutils"/>
<include name="RELEASE_NOTES"/>
<include name="installer.xml"/>
<include name="installer.properties/**"/>
@@ -443,21 +345,6 @@
<exclude name="bin/**"/>
</fileset>
</copy>
- <mkdir dir="${basedir}/temp/swfutils" />
- <copy todir="${basedir}/temp/swfutils" includeEmptyDirs="false">
- <fileset dir="${basedir}/swfutils">
- <include name="**"/>
- <exclude name=".classpath" />
- <exclude name=".project" />
- <exclude name=".settings/**" />
- <exclude name="unittest.properties" />
- <exclude name="classes/**"/>
- <exclude name="lib/**"/>
- <exclude name="results/**"/>
- <exclude name="temp/**"/>
- <exclude name="test/classes/**"/>
- </fileset>
- </copy>
</target>
<target name="stage-externs">
@@ -826,7 +713,6 @@
<exclude name="NOTICE.base"/>
<exclude name="NOTICE.fdb"/>
<exclude name="NOTICE.oem"/>
- <exclude name="NOTICE.swfutils"/>
</fileset>
</rat:report>
</target>
[3/5] git commit: [flex-falcon]
[refs/heads/feature/maven-migration-test] - fuller wipe
Posted by ah...@apache.org.
fuller wipe
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/359bdf41
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/359bdf41
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/359bdf41
Branch: refs/heads/feature/maven-migration-test
Commit: 359bdf41aa7f4aa4ce4f1c944445314c08374597
Parents: 0a08c2d
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 22 14:28:19 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 22 14:28:19 2016 -0700
----------------------------------------------------------------------
externs/createjs/build.xml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/359bdf41/externs/createjs/build.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/build.xml b/externs/createjs/build.xml
index 54c1d14..fce06b8 100644
--- a/externs/createjs/build.xml
+++ b/externs/createjs/build.xml
@@ -277,11 +277,8 @@
</target>
<target name="wipe">
- <delete failonerror="false" includeEmptyDirs="true" >
- <fileset dir="${basedir}/target">
- <include name="**/**"/>
- </fileset>
- </delete>
+ <delete dir="${basedir}/target" />
+ <delete dir="${basedir}/in" />
</target>
</project>
[4/5] git commit: [flex-falcon]
[refs/heads/feature/maven-migration-test] - fix calls into downloads
Posted by ah...@apache.org.
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 <ah...@apache.org>
Authored: Fri Apr 22 15:04:58 2016 -0700
Committer: Alex Harui <ah...@apache.org>
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>
[5/5] git commit: [flex-falcon]
[refs/heads/feature/maven-migration-test] - move temp folder to target
Posted by ah...@apache.org.
move temp folder to target
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e629adf6
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e629adf6
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e629adf6
Branch: refs/heads/feature/maven-migration-test
Commit: e629adf6a2a03541fb867c21d0072b9269bb8001
Parents: 7f5ed50
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 22 15:33:00 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 22 15:33:00 2016 -0700
----------------------------------------------------------------------
.../compiler/internal/codegen/externals/ExternalsTestUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e629adf6/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java
index 427476c..7d7c9ad 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java
@@ -28,7 +28,7 @@ import org.apache.flex.utils.FilenameNormalization;
public class ExternalsTestUtils
{
public static File TEMP_DIR = new File(
- FilenameNormalization.normalize("temp"));
+ FilenameNormalization.normalize("../../target/junit-temp"));
// XXX missing.js is a temp location until we can figure out where it should placed in the build
public static File MISSING_JS_FILE = FilenameNormalization.normalize(new File(
[2/5] git commit: [flex-falcon]
[refs/heads/feature/maven-migration-test] - fix wipes
Posted by ah...@apache.org.
fix wipes
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/0a08c2dc
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/0a08c2dc
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/0a08c2dc
Branch: refs/heads/feature/maven-migration-test
Commit: 0a08c2dcbc720132179963a0a5e9654b87e9cc70
Parents: a6d9512
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 22 14:21:42 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 22 14:21:42 2016 -0700
----------------------------------------------------------------------
build.xml | 4 ++++
compiler-build-tools/build.xml | 3 +--
compiler-jburg-types/build.xml | 3 +--
compiler-jx/build.xml | 2 ++
externs/GCL/build.xml | 2 +-
flex-compiler-oem/build.xml | 8 +++++---
6 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0a08c2dc/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 74eb553..8510c18 100644
--- a/build.xml
+++ b/build.xml
@@ -120,11 +120,15 @@
</target>
<target name="wipe" description="Wipes out everything that didn't come from Git.">
+ <ant dir="compiler-build-tools" target="wipe"/>
+ <ant dir="compiler-jburg-types" target="wipe"/>
<ant dir="compiler" target="wipe"/>
<ant dir="compiler/src/tests" target="wipe"/>
</target>
<target name="wipe-all" description="Wipes out everything that didn't come from Git.">
+ <ant dir="compiler-build-tools" target="wipe"/>
+ <ant dir="compiler-jburg-types" target="wipe"/>
<ant dir="compiler" target="wipe"/>
<ant dir="compiler/src/test" target="wipe"/>
<ant dir="compiler-jx" target="super-clean"/>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0a08c2dc/compiler-build-tools/build.xml
----------------------------------------------------------------------
diff --git a/compiler-build-tools/build.xml b/compiler-build-tools/build.xml
index 72d7cf5..2366ecf 100644
--- a/compiler-build-tools/build.xml
+++ b/compiler-build-tools/build.xml
@@ -135,8 +135,7 @@
</target>
<target name="wipe" depends="clean" description="Wipes everything that didn't come from Git.">
- <delete dir="${compiler}/lib"/>
- <delete dir="${compiler}/utils"/>
+ <delete dir="${compiler}/target"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0a08c2dc/compiler-jburg-types/build.xml
----------------------------------------------------------------------
diff --git a/compiler-jburg-types/build.xml b/compiler-jburg-types/build.xml
index 6025603..5c98c8e 100644
--- a/compiler-jburg-types/build.xml
+++ b/compiler-jburg-types/build.xml
@@ -88,8 +88,7 @@
</target>
<target name="wipe" depends="clean" description="Wipes everything that didn't come from Git.">
- <delete dir="${compiler}/lib"/>
- <delete dir="${compiler}/utils"/>
+ <delete dir="${compiler}/target"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0a08c2dc/compiler-jx/build.xml
----------------------------------------------------------------------
diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml
index 68a691d..577c29d 100644
--- a/compiler-jx/build.xml
+++ b/compiler-jx/build.xml
@@ -141,12 +141,14 @@
<target name="thirdparty-clean">
<ant antfile="${basedir}/src/main/resources/downloads.xml" dir="${basedir}" target="clean" />
+ <delete dir="${basedir}/target" />
<delete failonerror="false" includeemptydirs="true">
<fileset dir="${lib}" />
</delete>
</target>
<target name="clean" >
+ <delete dir="${basedir}/target/classes" />
<delete failonerror="false" includeemptydirs="true">
<fileset dir="${lib}" >
<include name="compc.jar" />
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0a08c2dc/externs/GCL/build.xml
----------------------------------------------------------------------
diff --git a/externs/GCL/build.xml b/externs/GCL/build.xml
index bdf9429..3167b90 100644
--- a/externs/GCL/build.xml
+++ b/externs/GCL/build.xml
@@ -51,6 +51,6 @@
<delete dir="${basedir}/target" failonerror="false" includeEmptyDirs="true"/>
</target>
- <target name="wipe">
+ <target name="wipe" depends="clean">
</target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0a08c2dc/flex-compiler-oem/build.xml
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/build.xml b/flex-compiler-oem/build.xml
index 894b110..5e58d6a 100644
--- a/flex-compiler-oem/build.xml
+++ b/flex-compiler-oem/build.xml
@@ -235,9 +235,11 @@
-->
<target name="clean" description="clean">
- <delete dir="${oem}/bin"/>
+ <delete dir="${oem}/target/classes"/>
+ </target>
+
+ <target name="wipe" depends="clean" >
+ <delete dir="${oem}/target"/>
</target>
- <target name="wipe" depends="clean" />
-
</project>