You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/03/16 01:53:36 UTC
[58/67] [abbrv] git commit: [flex-flexunit] [refs/heads/master] -
added mock-as3 to downloads.xml, updated license information in README,
updated cleanup tasks in downloads.xml
added mock-as3 to downloads.xml, updated license information in README, updated cleanup tasks in downloads.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/7f8c639f
Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/7f8c639f
Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/7f8c639f
Branch: refs/heads/master
Commit: 7f8c639f25b3bcc1512a7b12e2acc6777a80b9f4
Parents: 53d2136
Author: cyrillzadra <cy...@gmail.com>
Authored: Fri Sep 13 15:40:24 2013 +0200
Committer: cyrillzadra <cy...@gmail.com>
Committed: Fri Sep 13 15:40:24 2013 +0200
----------------------------------------------------------------------
.gitignore | 5 ++--
FlexUnit4/downloads.xml | 9 +++---
FlexUnit4AntTasks/downloads.xml | 4 +--
FlexUnit4FlexCoverListener/downloads.xml | 4 +--
FlexUnit4FluintExtensions/downloads.xml | 2 +-
FlexUnit4Test/build.xml | 1 -
FlexUnit4Test/downloads.xml | 41 +++++++++++++++++++++------
README | 25 +++++++++-------
downloads.xml | 7 +----
9 files changed, 59 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/7f8c639f/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index b9f0d4d..18916aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,10 +16,8 @@ FlexUnit4AirCIListener/libs/*
FlexUnit4FlexCoverListener/bin/*
FlexUnit4FlexCoverListener/libs/*
FlexUnit4FlexCoverListener/target/*
-FlexUnit4CIListener/bin/*
FlexUnit4SampleCIProject/target/*
FlexUnit4AntTasks/target/*
-FlexUnit4AntTasks/bin/*
FlexUnit4Test/libs/*
FlexUnit4Test/target/*
FlexUnit4UIListener/libs/*
@@ -28,4 +26,5 @@ FlexUnit4UIListener/target/*
.actionScriptProperties
.idea
*.iml
-*/.settings
\ No newline at end of file
+*/.settings
+/lib/
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/7f8c639f/FlexUnit4/downloads.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4/downloads.xml b/FlexUnit4/downloads.xml
index 0779c88..679ff66 100644
--- a/FlexUnit4/downloads.xml
+++ b/FlexUnit4/downloads.xml
@@ -56,9 +56,7 @@
<target name="clean"
description="Removes thirdparty downloads.">
<delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${download.dir}">
- <include name="FlexUnit1Lib*/**"/>
- </fileset>
+ <fileset dir="${download.dir}" />
</delete>
</target>
@@ -176,7 +174,7 @@
<target name="flexunit1lib-download-swc" depends="flexunit1lib-swc-check" unless="flexunit1lib.swc.exists"
description="Downloads the flexunit1lib swc.">
<antcall target="download-swc">
- <param name="srcUrl" value="https://fluint.googlecode.com/svn-history/r268/branches/skunkworks/flexUnit4/FlexUnit4/libs"/>
+ <param name="srcUrl" value="https://github.com/flexunit/flexunit/raw/master/FlexUnit4Test/libs"/>
<param name="srcSwcFile" value="FlexUnit1Lib.swc"/>
<param name="destSwcFile" value="${lib.dir}/FlexUnit1Lib.swc"/>
</antcall>
@@ -199,6 +197,9 @@
<param name="destJarFile" value="${lib.dir}/hamcrest-as3-flex-1.1.3.swc"/>
</antcall>
<delete dir="${download.dir}/temp/hamcrest-as3-flex-1.1.3"/>
+
+ <!-- Get license file -->
+ <get src="https://raw.github.com/drewbourne/hamcrest-as3/master/hamcrest/LICENSE" dest="${lib.dir}/hamcrest-LICENSE"/>
</target>
<target name="hamcrest-swc-check" description="Checks if harmcrest swc exists.">
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/7f8c639f/FlexUnit4AntTasks/downloads.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4AntTasks/downloads.xml b/FlexUnit4AntTasks/downloads.xml
index 9efe4e4..62bd260 100644
--- a/FlexUnit4AntTasks/downloads.xml
+++ b/FlexUnit4AntTasks/downloads.xml
@@ -33,10 +33,10 @@
For Apache, the JARS must be removed from the repository.
Licenses:
- JUnit (3.8.1) - CPL 1.0
ant (1.7.1) - Apache 2.0
ant-launcher (1.7.1) - Apache 2.0
- ant-testutil (1.7.1) - Apache 2.0
+ ant-testutil (1.7.1) - Apache 2.0
+ JUnit (3.8.1) - CPL 1.0
dom4j (1.6.1) - ?
jaxen (1.1) - ?
-->
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/7f8c639f/FlexUnit4FlexCoverListener/downloads.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4FlexCoverListener/downloads.xml b/FlexUnit4FlexCoverListener/downloads.xml
index 2e80c61..4e6c86b 100644
--- a/FlexUnit4FlexCoverListener/downloads.xml
+++ b/FlexUnit4FlexCoverListener/downloads.xml
@@ -53,9 +53,7 @@
<target name="clean" description="Removes thirdparty downloads.">
<delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${download.dir}">
- <include name="flexcover*/**" />
- </fileset>
+ <fileset dir="${download.dir}" />
</delete>
</target>
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/7f8c639f/FlexUnit4FluintExtensions/downloads.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4FluintExtensions/downloads.xml b/FlexUnit4FluintExtensions/downloads.xml
index 4fc3d84..2739ead 100644
--- a/FlexUnit4FluintExtensions/downloads.xml
+++ b/FlexUnit4FluintExtensions/downloads.xml
@@ -111,7 +111,7 @@
<target name="fluint-download-swc" depends="fluint-swc-check" unless="fluint.swc.exists"
description="Downloads the fluint swc.">
<antcall target="download-swc">
- <param name="srcUrl" value="https://fluint.googlecode.com/svn-history/r268/branches/skunkworks/flexUnit4/FlexUnit4/libs"/>
+ <param name="srcUrl" value="https://github.com/flexunit/flexunit/raw/master/FlexUnit4Test/libs/"/>
<param name="srcSwcFile" value="fluint-1_2.swc"/>
<param name="destSwcFile" value="${lib.dir}/fluint-1_2.swc"/>
</antcall>
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/7f8c639f/FlexUnit4Test/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4Test/build.xml b/FlexUnit4Test/build.xml
index 9b46a17..6d909dd 100644
--- a/FlexUnit4Test/build.xml
+++ b/FlexUnit4Test/build.xml
@@ -141,7 +141,6 @@
<delete dir="${dist.loc}" />
<delete>
<fileset dir="${lib.loc}">
- <exclude name="mock-as3.swc" />
<exclude name="build/saxon*.jar" />
</fileset>
</delete>
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/7f8c639f/FlexUnit4Test/downloads.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4Test/downloads.xml b/FlexUnit4Test/downloads.xml
index 1d5ec4c..891454f 100644
--- a/FlexUnit4Test/downloads.xml
+++ b/FlexUnit4Test/downloads.xml
@@ -37,7 +37,7 @@
flexunit1lib () - TODO license???
hamcrest (1.1.3) - https://github.com/drewbourne/hamcrest-as3/blob/master/hamcrest/LICENSE
mockolate (0.9.5) - https://github.com/drewbourne/mockolate/blob/master/LICENSE
- mock-as - TODO
+ mock-as - BSD
-->
<!--
@@ -45,7 +45,7 @@
they are each downloaded only if they don't already exist.
-->
- <target name="main" depends="prepare, flexunit1lib-swc, hamcrest-swc, fluint-swc, mockolate-swc"
+ <target name="main" depends="prepare, flexunit1lib-swc, hamcrest-swc, fluint-swc, mockolate-swc, mock-as-swc"
description="Downloads all the required thirdparty SWCs"/>
<target name="prepare" >
@@ -59,10 +59,7 @@
<target name="clean"
description="Removes thirdparty downloads.">
<delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${download.dir}">
- <include name="hamcrest*/**"/>
- <include name="mockolate*/**"/>
- </fileset>
+ <fileset dir="${download.dir}" />
</delete>
</target>
@@ -180,13 +177,13 @@
<target name="flexunit1lib-download-swc" depends="flexunit1lib-swc-check" unless="flexunit1lib.swc.exists"
description="Downloads the flexunit1lib swc.">
<antcall target="download-swc">
- <param name="srcUrl" value="https://fluint.googlecode.com/svn-history/r268/branches/skunkworks/flexUnit4/FlexUnit4/libs"/>
+ <param name="srcUrl" value="https://github.com/flexunit/flexunit/raw/master/FlexUnit4Test/libs/"/>
<param name="srcSwcFile" value="FlexUnit1Lib.swc"/>
<param name="destSwcFile" value="${lib.dir}/FlexUnit1Lib.swc"/>
</antcall>
<!-- Get license file -->
- <!--get src="" dest="${lib.dir}/fluint-LICENSE"/-->
+ <!--get src="" dest="${lib.dir}/flexunit1lib-LICENSE"/-->
</target>
@@ -239,7 +236,7 @@
<target name="fluint-download-swc" depends="fluint-swc-check" unless="fluint.swc.exists"
description="Downloads the fluint swc.">
<antcall target="download-swc">
- <param name="srcUrl" value="https://fluint.googlecode.com/svn-history/r268/branches/skunkworks/flexUnit4/FlexUnit4/libs"/>
+ <param name="srcUrl" value="https://github.com/flexunit/flexunit/raw/master/FlexUnit4Test/libs/"/>
<param name="srcSwcFile" value="fluint-1_2.swc"/>
<param name="destSwcFile" value="${lib.dir}/fluint-1_2.swc"/>
</antcall>
@@ -275,5 +272,31 @@
<!-- Get license file -->
<get src="https://raw.github.com/drewbourne/mockolate/master/LICENSE" dest="${lib.dir}/mockolate-LICENSE"/>
</target>
+
+ <!--
+ mock-as
+ -->
+ <target name="mock-as-swc-check" description="Checks if mock-as swc exists.">
+ <condition property="mock-as.swc.exists">
+ <and>
+ <available file="${lib.dir}/mock-as3.swc"/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="mock-as-swc" depends="mock-as-swc-check"
+ unless="mock-as.swc.exists"
+ description="Downloads and copies mock-as to the lib directory.">
+ <echo message="Obtaining lib/mock-as3.swc"/>
+ <antcall target="download-swc">
+ <param name="srcUrl" value="https://github.com/flexunit/flexunit/raw/master/FlexUnit4Test/libs/"/>
+ <param name="srcSwcFile" value="mock-as3.swc"/>
+ <param name="destSwcFile" value="${lib.dir}/mock-as3.swc"/>
+ </antcall>
+
+ <!-- Get license file -->
+ <get src="https://raw.github.com/drewbourne/mock-as3/master/core/license.txt" dest="${lib.dir}/mock-as3-LICENSE"/>
+
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/7f8c639f/README
----------------------------------------------------------------------
diff --git a/README b/README
index 660602d..c8310ef 100644
--- a/README
+++ b/README
@@ -98,24 +98,29 @@ Software Dependencies
The following dependencies have licenses which Apache considers to be not compatible
with the Apache License Version 2.0. You will be prompted to read and agree to the
- license terms of the dependency before the software can be downloaded to your system.
+ license terms of the dependency before the software can be downloaded to your system.
+
+ ...
+ TODO
+
+ (swcs)
harmcrest - http://cloud.github.com/downloads/drewbourne/hamcrest-as3/mockolate-0.9.5.zip (License - https://github.com/drewbourne/hamcrest-as3/blob/master/hamcrest/LICENSE)
mockolate - http://cloud.github.com/downloads/drewbourne/hamcrest-as3/hamcrest-as3-flex-1.1.3.zip (License - https://github.com/drewbourne/mockolate/blob/master/LICENSE)
- fluint - https://fluint.googlecode.com/svn-history/r268/branches/skunkworks/flexUnit4/FlexUnit4/libs/fluint-1_2.swc (License - MIT)
- coverageagent - https://flexcover.googlecode.com/files/flexcover-0.90.zip (License - MIT)
+ mock-as - https://github.com/flexunit/flexunit/raw/master/FlexUnit4Test/libs/mock-as3.swc (License BSD License)
+ (jars)
junit - http://search.maven.org/remotecontent?filepath=junit/junit/3.8.1/junit-3.8.1.jar (License - CPL 1.0)
-
- TODO
+
(jars)
-
- dom4j - http://search.maven.org/remotecontent?filepath=dom4j/dom4j/1.6.1/dom4j-1.6.1.jar (License - ???)
- jaxen - http://search.maven.org/remotecontent?filepath=jaxen/jaxen/1.1-beta-6/jaxen-1.1-beta-6.jar (License - ???)
+ dom4j - http://search.maven.org/remotecontent?filepath=dom4j/dom4j/1.6.1/dom4j-1.6.1.jar (License - ???) License is in jar.
+ jaxen - http://search.maven.org/remotecontent?filepath=jaxen/jaxen/1.1-beta-6/jaxen-1.1-beta-6.jar (License - ???) License is in jar.
+
(swcs)
- flexunit1lib - https://fluint.googlecode.com/svn-history/r268/branches/skunkworks/flexUnit4/FlexUnit4/libs/FlexUnit1Lib.swc (License - ???)
-
+ flexunit1lib - https://github.com/flexunit/flexunit/raw/master/FlexUnit4Test/libs/FlexUnit1Lib.swc (License - ???)
+ fluint - https://github.com/flexunit/flexunit/raw/master/FlexUnit4Test/libs/fluint-1_2.swc (License - MIT) Can't locate license file.
+ coverageagent - https://flexcover.googlecode.com/files/flexcover-0.90.zip (License - MIT) Can't locate license file.
Building Apache Flex (FlexUnit)
-----------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/7f8c639f/downloads.xml
----------------------------------------------------------------------
diff --git a/downloads.xml b/downloads.xml
index dd0cab0..0423f35 100644
--- a/downloads.xml
+++ b/downloads.xml
@@ -56,12 +56,7 @@
<target name="clean"
description="Removes thirdparty downloads.">
<delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${download.dir}">
- <include name="junit*/**"/>
- <include name="ant*/**"/>
- <include name="dom4j*/**"/>
- <include name="jaxen*/**"/>
- </fileset>
+ <fileset dir="${download.dir}" />
</delete>
</target>