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/27 18:27:34 UTC
git commit: [flex-falcon] [refs/heads/develop] - try to fix ant tests
Repository: flex-falcon
Updated Branches:
refs/heads/develop 6322ab361 -> 28097ec5d
try to fix ant tests
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/28097ec5
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/28097ec5
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/28097ec5
Branch: refs/heads/develop
Commit: 28097ec5db95df81e68024040768d4b5e0968d57
Parents: 6322ab3
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 27 09:27:04 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 27 09:27:20 2016 -0700
----------------------------------------------------------------------
compiler/build.xml | 2 +-
compiler/src/main/resources/flexTasks.tasks | 21 +++++++++++++++++++++
compiler/src/test/build.xml | 8 +++++++-
3 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/28097ec5/compiler/build.xml
----------------------------------------------------------------------
diff --git a/compiler/build.xml b/compiler/build.xml
index b0f0455..6b18cad 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -711,7 +711,7 @@
<attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
<attribute name="Class-Path" value="compiler.jar"/>
</manifest>
- <fileset dir="${compiler}" includes="flexTasks.tasks"/>
+ <fileset dir="${compiler}/src/main/resources" includes="flexTasks.tasks"/>
<fileset dir="${compiler}/target/classes" includes="${compiler.ant.binaries}"/>
</jar>
</target>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/28097ec5/compiler/src/main/resources/flexTasks.tasks
----------------------------------------------------------------------
diff --git a/compiler/src/main/resources/flexTasks.tasks b/compiler/src/main/resources/flexTasks.tasks
new file mode 100644
index 0000000..089d1f5
--- /dev/null
+++ b/compiler/src/main/resources/flexTasks.tasks
@@ -0,0 +1,21 @@
+################################################################################
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+################################################################################
+
+mxmlc=org.apache.flex.compiler.ant.MXMLCTask
+compc=org.apache.flex.compiler.ant.COMPCTask
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/28097ec5/compiler/src/test/build.xml
----------------------------------------------------------------------
diff --git a/compiler/src/test/build.xml b/compiler/src/test/build.xml
index 0893bac..8698577 100644
--- a/compiler/src/test/build.xml
+++ b/compiler/src/test/build.xml
@@ -47,6 +47,10 @@
<property name="compiler" value="${compiler.tests}/../.."/>
<property name="falcon" value="${compiler}"/>
+ <path id="lib.path">
+ <fileset dir="${falcon}/lib" includes="falcon-flexTasks.jar"/>
+ </path>
+
<target name="download" description="Downloads third-party JARs">
<ant antfile="${compiler.tests}/downloads.xml" dir="${compiler.tests}"/>
<delete dir="${compiler.tests}/in"/>
@@ -67,7 +71,9 @@
<target name="ant.tests">
<property name="FLEX_HOME" value="${sdk}"/>
<property name="FALCON_HOME" value="${falcon}"/>
- <taskdef resource="flexTasks.tasks" classpath="${falcon}/lib/falcon-flexTasks.jar"/>
+ <echo>FLEX_HOME=${sdk}</echo>
+ <echo>FALCON_HOME=${falcon}</echo>
+ <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
<mxmlc file="${compiler.tests}/as/Hello.as"
output="${compiler}/target/junit/Hello.swf"
target-player="${playerglobal.version}">