renamed target from "prebuild" to "thirdparty-downloads" and added a thirdparty-downloads target in main build.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/5dd2d851 Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/5dd2d851 Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/5dd2d851 Branch: refs/heads/master Commit: 5dd2d8511b2f91874c2c3266dfbd84056f7555ce Parents: 82eb1b9 Author: cyrillzadra <[email protected]> Authored: Tue Sep 3 23:03:50 2013 +0400 Committer: cyrillzadra <[email protected]> Committed: Tue Sep 3 23:03:50 2013 +0400 ---------------------------------------------------------------------- FlexUnit4/build.xml | 4 ++-- FlexUnit4AntTasks/build.xml | 4 ++-- FlexUnit4FlexCoverListener/build.xml | 4 ++-- FlexUnit4FluintExtensions/build.xml | 4 ++-- FlexUnit4Test/build.xml | 4 ++-- build.xml | 13 ++++++++++--- 6 files changed, 20 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/5dd2d851/FlexUnit4/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4/build.xml b/FlexUnit4/build.xml index ff580c9..35e005c 100644 --- a/FlexUnit4/build.xml +++ b/FlexUnit4/build.xml @@ -97,11 +97,11 @@ <xslt in="${basedir}/.flexLibProperties" out="${bin.loc}/flexLib.properties" style="${basedir}/flexLibProperties.xsl" /> </target> - <target name="prebuild"> + <target name="thirdparty-downloads"> <ant antfile="${basedir}/downloads.xml" dir="${basedir}" /> </target> - <target name="compile" depends="init, prebuild, compile-flex,compile-as3,as3-linker-check" /> + <target name="compile" depends="init, thirdparty-downloads, compile-flex,compile-as3,as3-linker-check" /> <target name="compile-flex"> <!-- Pull in class file list for compc --> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/5dd2d851/FlexUnit4AntTasks/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4AntTasks/build.xml b/FlexUnit4AntTasks/build.xml index 1a4773a..7efbda1 100644 --- a/FlexUnit4AntTasks/build.xml +++ b/FlexUnit4AntTasks/build.xml @@ -39,7 +39,7 @@ <delete dir="${dist.loc}" /> </target> - <target name="prebuild"> + <target name="thirdparty-downloads"> <ant antfile="${basedir}/downloads.xml" dir="${basedir}" /> </target> @@ -50,7 +50,7 @@ <mkdir dir="${doc.loc}" /> </target> - <target name="compile" depends="init, prebuild"> + <target name="compile" depends="init, thirdparty-downloads"> <javac target="1.5" source="1.5" fork="true" memoryMaximumSize="256m" srcdir="${src.loc}" failonerror="yes" verbose="false" nowarn="true" destdir="${bin.loc}"> <classpath> <fileset dir="${lib.loc}"> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/5dd2d851/FlexUnit4FlexCoverListener/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4FlexCoverListener/build.xml b/FlexUnit4FlexCoverListener/build.xml index ef23325..03572d6 100644 --- a/FlexUnit4FlexCoverListener/build.xml +++ b/FlexUnit4FlexCoverListener/build.xml @@ -71,11 +71,11 @@ </copy> </target> - <target name="prebuild"> + <target name="thirdparty-downloads"> <ant antfile="${basedir}/downloads.xml" dir="${basedir}" /> </target> - <target name="compile" depends="init, prebuild"> + <target name="compile" depends="init, thirdparty-downloads"> <compc output="${bin.loc}/${build.finalName}.${build.packaging}"> <include-sources dir="${src.loc}" includes="*" append="true" /> <source-path path-element="${src.loc}" /> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/5dd2d851/FlexUnit4FluintExtensions/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4FluintExtensions/build.xml b/FlexUnit4FluintExtensions/build.xml index a73d11e..26979fc 100644 --- a/FlexUnit4FluintExtensions/build.xml +++ b/FlexUnit4FluintExtensions/build.xml @@ -69,11 +69,11 @@ </copy> </target> - <target name="prebuild"> + <target name="thirdparty-downloads"> <ant antfile="${basedir}/downloads.xml" dir="${basedir}" /> </target> - <target name="compile" depends="init, prebuild"> + <target name="compile" depends="init, thirdparty-downloads"> <compc output="${bin.loc}/${build.finalName}.${build.packaging}"> <include-sources dir="${src.loc}" includes="*" append="true" /> <source-path path-element="${src.loc}" /> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/5dd2d851/FlexUnit4Test/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4Test/build.xml b/FlexUnit4Test/build.xml index d731580..9b46a17 100644 --- a/FlexUnit4Test/build.xml +++ b/FlexUnit4Test/build.xml @@ -191,11 +191,11 @@ </taskdef> </target> - <target name="prebuild"> + <target name="thirdparty-downloads"> <ant antfile="${basedir}/downloads.xml" dir="${basedir}" /> </target> - <target name="test" depends="init,prebuild,test-only,test-and-instrument" /> + <target name="test" depends="init,thirdparty-downloads,test-only,test-and-instrument" /> <target name="test-only" unless="build.instrument"> <echo message="Testing FlexUnit Flex build..." /> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/5dd2d851/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 0e1ac56..b117d4b 100644 --- a/build.xml +++ b/build.xml @@ -90,8 +90,15 @@ to contribute to our CI process. </delete> </target> - <target name="prebuild"> - <ant antfile="${basedir}/downloads.xml" dir="${basedir}" /> + <target name="thirdparty-downloads"> + <ant antfile="${basedir}/downloads.xml" dir="${basedir}" /> + + <ant dir="${anttasks.loc}" target="thirdparty-downloads" inheritall="false" /> + <ant dir="${core.loc}" target="thirdparty-downloads" inheritall="false" /> + <ant dir="${fluint.loc}" target="thirdparty-downloads" inheritall="false" /> + <ant dir="${tests.loc}" target="thirdparty-downloads" inheritall="false" /> + <ant dir="${flexcoverlistener.loc}" target="thirdparty-downloads" inheritall="false" /> + </target> <!-- Builds the FlexUnit4AntTasks project --> @@ -249,7 +256,7 @@ to contribute to our CI process. </zip> </target> - <target name="sonatype" depends="prebuild" description="Target used to generate bundles for deployment to Sonatype."> + <target name="sonatype" depends="thirdparty-downloads" description="Target used to generate bundles for deployment to Sonatype."> <ant dir="${anttasks.loc}" target="deploy" inheritall="false"> <propertyset> <propertyref prefix="build" />
