You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cz...@apache.org on 2013/05/25 08:57:14 UTC
[1/2] git commit: updated exclude list of rat-report ant task
Updated Branches:
refs/heads/makeFlexUnitApacheReady dab610e7c -> e5adb7a72
updated exclude list of rat-report ant task
Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/b56bfe40
Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/b56bfe40
Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/b56bfe40
Branch: refs/heads/makeFlexUnitApacheReady
Commit: b56bfe4071bef065e1319c5630f5b678f8a0fa0d
Parents: dab610e
Author: cyrillzadra <cy...@gmail.com>
Authored: Sat May 25 14:45:03 2013 +0800
Committer: cyrillzadra <cy...@gmail.com>
Committed: Sat May 25 14:45:03 2013 +0800
----------------------------------------------------------------------
build.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/b56bfe40/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6069e52..26d41ca 100644
--- a/build.xml
+++ b/build.xml
@@ -337,8 +337,8 @@ to contribute to our CI process.
<exclude name="FlexUnit4/docs/"/>
<exclude name="FlexUnit4/target/bin/" />
<exclude name="FlexUnit4/in/" />
- <exclude name="FlexUnit4UIListener/target/docs/"/>
-
+ <exclude name="FlexUnit4UIListener/target/"/>
+ <exclude name="FlexUnit4Test/target/"/>
</fileset>
</rat:report>
[2/2] git commit: updated flexTask classpath so it can be also used
with builded sdk
Posted by cz...@apache.org.
updated flexTask classpath so it can be also used with builded sdk
Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/e5adb7a7
Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/e5adb7a7
Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/e5adb7a7
Branch: refs/heads/makeFlexUnitApacheReady
Commit: e5adb7a723009b1a9b1a51cc2284310d52a54c61
Parents: b56bfe4
Author: cyrillzadra <cy...@gmail.com>
Authored: Sat May 25 14:54:04 2013 +0800
Committer: cyrillzadra <cy...@gmail.com>
Committed: Sat May 25 14:54:04 2013 +0800
----------------------------------------------------------------------
FlexUnit4/build.xml | 41 ++++++++++++++++------------
FlexUnit4AirCIListener/build.xml | 9 +++++-
FlexUnit4CIListener/build.xml | 8 ++++-
FlexUnit4FlexCoverListener/build.xml | 9 +++++-
FlexUnit4FluintExtensions/build.xml | 9 +++++-
FlexUnit4SampleCIProject/build.xml | 7 ++++-
FlexUnit4Test/build.xml | 9 +++++-
FlexUnit4UIListener/build.xml | 9 +++++-
8 files changed, 70 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e5adb7a7/FlexUnit4/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4/build.xml b/FlexUnit4/build.xml
index 3d382c8..de4b462 100644
--- a/FlexUnit4/build.xml
+++ b/FlexUnit4/build.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
+<!--
+ 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.
+-->
<project name="FlexUnit4Core" basedir="." default="package">
<import file="${basedir}/../utils.xml" />
<property environment="env" />
@@ -43,8 +43,13 @@
<!-- Setup Flex Ant Resources -->
<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
<property name="FLEX_COVER_HOME" location="${env.FLEX_COVER_HOME}" />
- <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
-
+ <taskdef resource="flexTasks.tasks" >
+ <classpath>
+ <pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+ <pathelement location="${FLEX_HOME}/lib/flexTasks.jar"/>
+ </classpath>
+ </taskdef>
+
<!-- Reusable macro for compile SWC variations -->
<macrodef name="compile-swc">
<attribute name="sdk" />
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e5adb7a7/FlexUnit4AirCIListener/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4AirCIListener/build.xml b/FlexUnit4AirCIListener/build.xml
index 1168c67..345bf5d 100644
--- a/FlexUnit4AirCIListener/build.xml
+++ b/FlexUnit4AirCIListener/build.xml
@@ -38,8 +38,13 @@
<!-- Setup Flex Ant Resources -->
<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
- <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
-
+ <taskdef resource="flexTasks.tasks" >
+ <classpath>
+ <pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+ <pathelement location="${FLEX_HOME}/lib/flexTasks.jar"/>
+ </classpath>
+ </taskdef>
+
<target name="clean">
<delete dir="${dist.loc}" failonerror="false" />
<delete failonerror="false">
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e5adb7a7/FlexUnit4CIListener/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4CIListener/build.xml b/FlexUnit4CIListener/build.xml
index 33d1651..73b8ad0 100644
--- a/FlexUnit4CIListener/build.xml
+++ b/FlexUnit4CIListener/build.xml
@@ -38,8 +38,12 @@
<!-- Setup Flex Ant Resources -->
<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
- <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
-
+ <taskdef resource="flexTasks.tasks" >
+ <classpath>
+ <pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+ <pathelement location="${FLEX_HOME}/lib/flexTasks.jar"/>
+ </classpath>
+ </taskdef>
<target name="clean">
<delete dir="${dist.loc}" failonerror="false" />
<delete failonerror="false">
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e5adb7a7/FlexUnit4FlexCoverListener/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4FlexCoverListener/build.xml b/FlexUnit4FlexCoverListener/build.xml
index c0c7e86..daee11b 100644
--- a/FlexUnit4FlexCoverListener/build.xml
+++ b/FlexUnit4FlexCoverListener/build.xml
@@ -38,8 +38,13 @@
<!-- Setup Flex Ant Resources -->
<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
- <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
-
+ <taskdef resource="flexTasks.tasks" >
+ <classpath>
+ <pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+ <pathelement location="${FLEX_HOME}/lib/flexTasks.jar"/>
+ </classpath>
+ </taskdef>
+
<target name="clean">
<delete dir="${dist.loc}" failonerror="false" />
<delete failonerror="false">
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e5adb7a7/FlexUnit4FluintExtensions/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4FluintExtensions/build.xml b/FlexUnit4FluintExtensions/build.xml
index b3b752b..d1aeba9 100644
--- a/FlexUnit4FluintExtensions/build.xml
+++ b/FlexUnit4FluintExtensions/build.xml
@@ -38,8 +38,13 @@
<!-- Setup Flex Ant Resources -->
<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
- <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
-
+ <taskdef resource="flexTasks.tasks" >
+ <classpath>
+ <pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+ <pathelement location="${FLEX_HOME}/lib/flexTasks.jar"/>
+ </classpath>
+ </taskdef>
+
<target name="clean">
<delete dir="${dist.loc}" failonerror="false" />
<delete failonerror="false">
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e5adb7a7/FlexUnit4SampleCIProject/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4SampleCIProject/build.xml b/FlexUnit4SampleCIProject/build.xml
index 339e537..c586844 100644
--- a/FlexUnit4SampleCIProject/build.xml
+++ b/FlexUnit4SampleCIProject/build.xml
@@ -40,7 +40,12 @@
<!-- Setup Flex and FlexUnit ant tasks -->
<!-- You can set this directly so mxmlc will work correctly, or set FLEX_HOME as an environment variable and use as below -->
<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
- <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
+ <taskdef resource="flexTasks.tasks" >
+ <classpath>
+ <pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+ <pathelement location="${FLEX_HOME}/lib/flexTasks.jar"/>
+ </classpath>
+ </taskdef>
<taskdef resource="flexUnitTasks.tasks">
<classpath>
<fileset dir="${lib.loc}">
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e5adb7a7/FlexUnit4Test/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4Test/build.xml b/FlexUnit4Test/build.xml
index 21be420..d731580 100644
--- a/FlexUnit4Test/build.xml
+++ b/FlexUnit4Test/build.xml
@@ -44,8 +44,13 @@
<!-- Setup Flex Ant Resources -->
<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
<property name="FLEX_COVER_VIEWER" location="${env.FLEX_COVER_VIEWER}" />
- <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
-
+ <taskdef resource="flexTasks.tasks" >
+ <classpath>
+ <pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+ <pathelement location="${FLEX_HOME}/lib/flexTasks.jar"/>
+ </classpath>
+ </taskdef>
+
<macrodef name="compile-runner">
<attribute name="runner" />
<attribute name="swf" />
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/e5adb7a7/FlexUnit4UIListener/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4UIListener/build.xml b/FlexUnit4UIListener/build.xml
index a2afc6a..e24c618 100644
--- a/FlexUnit4UIListener/build.xml
+++ b/FlexUnit4UIListener/build.xml
@@ -39,8 +39,13 @@
<!-- Setup Flex Ant Resources -->
<property name="FLEX_HOME" location="${env.FLEX_HOME}" />
- <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
-
+ <taskdef resource="flexTasks.tasks" >
+ <classpath>
+ <pathelement location="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+ <pathelement location="${FLEX_HOME}/lib/flexTasks.jar"/>
+ </classpath>
+ </taskdef>
+
<target name="clean">
<delete dir="${dist.loc}" failonerror="false" />
<delete failonerror="false">