updated ant cleanup target
Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/cd1333af Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/cd1333af Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/cd1333af Branch: refs/heads/develop Commit: cd1333af4e9faa1c0d818fbe5559d02843d6a113 Parents: 11685af Author: cyrillzadra <[email protected]> Authored: Sun Sep 15 21:30:52 2013 +0200 Committer: cyrillzadra <[email protected]> Committed: Sun Sep 15 21:30:52 2013 +0200 ---------------------------------------------------------------------- FlexUnit4/build.xml | 1 + FlexUnit4/downloads.xml | 1 + FlexUnit4AntTasks/build.xml | 1 + FlexUnit4AntTasks/downloads.xml | 5 +++-- FlexUnit4FlexCoverListener/downloads.xml | 1 + FlexUnit4FluintExtensions/downloads.xml | 6 ++---- FlexUnit4Test/build.xml | 5 ----- FlexUnit4Test/downloads.xml | 3 ++- build.xml | 17 ++++++++++++----- downloads.xml | 1 + 10 files changed, 24 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/cd1333af/FlexUnit4/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4/build.xml b/FlexUnit4/build.xml index 35e005c..d5d8d4d 100644 --- a/FlexUnit4/build.xml +++ b/FlexUnit4/build.xml @@ -83,6 +83,7 @@ <target name="clean"> <delete dir="${dist.loc}" /> + <ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}" /> </target> <target name="init"> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/cd1333af/FlexUnit4/downloads.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4/downloads.xml b/FlexUnit4/downloads.xml index 679ff66..206d225 100644 --- a/FlexUnit4/downloads.xml +++ b/FlexUnit4/downloads.xml @@ -57,6 +57,7 @@ description="Removes thirdparty downloads."> <delete includeEmptyDirs="true" failonerror="false"> <fileset dir="${download.dir}" /> + <fileset dir="${lib.dir}"/> </delete> </target> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/cd1333af/FlexUnit4AntTasks/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4AntTasks/build.xml b/FlexUnit4AntTasks/build.xml index 7efbda1..a929fdf 100644 --- a/FlexUnit4AntTasks/build.xml +++ b/FlexUnit4AntTasks/build.xml @@ -37,6 +37,7 @@ <target name="clean"> <delete dir="${dist.loc}" /> + <ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}" /> </target> <target name="thirdparty-downloads"> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/cd1333af/FlexUnit4AntTasks/downloads.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4AntTasks/downloads.xml b/FlexUnit4AntTasks/downloads.xml index ba35d77..3659eb4 100644 --- a/FlexUnit4AntTasks/downloads.xml +++ b/FlexUnit4AntTasks/downloads.xml @@ -37,8 +37,8 @@ ant-launcher (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) - ? + dom4j (1.6.1) - BSD + jaxen (1.1) - BSD --> <!-- @@ -61,6 +61,7 @@ description="Removes thirdparty downloads."> <delete includeEmptyDirs="true" failonerror="false"> <fileset dir="${download.dir}"/> + <fileset dir="${lib.dir}"/> </delete> </target> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/cd1333af/FlexUnit4FlexCoverListener/downloads.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4FlexCoverListener/downloads.xml b/FlexUnit4FlexCoverListener/downloads.xml index 4e6c86b..fba47d3 100644 --- a/FlexUnit4FlexCoverListener/downloads.xml +++ b/FlexUnit4FlexCoverListener/downloads.xml @@ -54,6 +54,7 @@ <target name="clean" description="Removes thirdparty downloads."> <delete includeEmptyDirs="true" failonerror="false"> <fileset dir="${download.dir}" /> + <fileset dir="${lib.dir}"/> </delete> </target> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/cd1333af/FlexUnit4FluintExtensions/downloads.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4FluintExtensions/downloads.xml b/FlexUnit4FluintExtensions/downloads.xml index 2739ead..f7353db 100644 --- a/FlexUnit4FluintExtensions/downloads.xml +++ b/FlexUnit4FluintExtensions/downloads.xml @@ -55,10 +55,8 @@ <target name="clean" description="Removes thirdparty downloads."> <delete includeEmptyDirs="true" failonerror="false"> - <fileset dir="${download.dir}"> - <include name="fluint*/**"/> - <include name="flexunit/*/**"/> - </fileset> + <fileset dir="${download.dir}"/> + <fileset dir="${lib.dir}"/> </delete> </target> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/cd1333af/FlexUnit4Test/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4Test/build.xml b/FlexUnit4Test/build.xml index 6d909dd..65d065d 100644 --- a/FlexUnit4Test/build.xml +++ b/FlexUnit4Test/build.xml @@ -139,11 +139,6 @@ <target name="clean"> <delete dir="${dist.loc}" /> - <delete> - <fileset dir="${lib.loc}"> - <exclude name="build/saxon*.jar" /> - </fileset> - </delete> <ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/cd1333af/FlexUnit4Test/downloads.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4Test/downloads.xml b/FlexUnit4Test/downloads.xml index df60599..ec73518 100644 --- a/FlexUnit4Test/downloads.xml +++ b/FlexUnit4Test/downloads.xml @@ -60,7 +60,8 @@ <target name="clean" description="Removes thirdparty downloads."> <delete includeEmptyDirs="true" failonerror="false"> - <fileset dir="${download.dir}" /> + <fileset dir="${download.dir}"/> + <fileset dir="${lib.dir}"/> </delete> </target> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/cd1333af/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index b117d4b..cf803f1 100644 --- a/build.xml +++ b/build.xml @@ -73,6 +73,8 @@ to contribute to our CI process. <!-- Cleans up all projects --> <target name="clean"> + <ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}" /> + <!-- Ask each project to clean up --> <ant dir="${anttasks.loc}" target="clean" inheritall="false" /> <ant dir="${core.loc}" target="clean" inheritall="false" /> @@ -82,11 +84,14 @@ to contribute to our CI process. <ant dir="${uilistener.loc}" target="clean" inheritall="false" /> <ant dir="${aircilistener.loc}" target="clean" inheritall="false" /> <ant dir="${flexcoverlistener.loc}" target="clean" inheritall="false" /> - + <delete failonerror="false"> - <fileset dir="${basedir}"> - <include name="*.zip" /> - </fileset> + <fileset dir="${basedir}"> + <include name="*.zip" /> + </fileset> + <fileset dir="FlexUnit4Turnkey/export"> + <include name="*.zip" /> + </fileset> </delete> </target> @@ -342,6 +347,8 @@ to contribute to our CI process. <exclude name="**/.settings/**"/> <exclude name="**/.idea/**"/> <exclude name="**/*.iml"/> + <!-- --> + <exclude name="**/LICENSE*"/> <!-- End of source files --> <!-- Start of binary files --> <!-- exclude media (png, ico) --> @@ -354,7 +361,7 @@ to contribute to our CI process. <!--Exclude generated/downloaded doc and files --> <exclude name="FlexUnit4/target/bin/" /> <exclude name="FlexUnit4/in/" /> - <exclude name="FlexUnit4UIListener/target/"/> + <exclude name="FlexUnit4UIListener/target/"/> <exclude name="FlexUnit4Test/target/"/> </fileset> </rat:report> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/cd1333af/downloads.xml ---------------------------------------------------------------------- diff --git a/downloads.xml b/downloads.xml index 0423f35..2b10cda 100644 --- a/downloads.xml +++ b/downloads.xml @@ -57,6 +57,7 @@ description="Removes thirdparty downloads."> <delete includeEmptyDirs="true" failonerror="false"> <fileset dir="${download.dir}" /> + <fileset dir="${lib.dir}" /> </delete> </target>
