ApproveFalcon.xml: don't require ANT_HOME environment variable, and download Apache Rat JARs to basedir when they're not found
diff --git a/ApproveFalcon.xml b/ApproveFalcon.xml index 908dd56..d09ffe4 100644 --- a/ApproveFalcon.xml +++ b/ApproveFalcon.xml
@@ -71,9 +71,6 @@ <condition property="do.copy.downloads" > <isset property="download.cache.dir" /> </condition> - - <fail message="The ANT_HOME environment variable is not set." - unless="env.ANT_HOME"/> <available file="${env.AIR_HOME}" type="dir" @@ -99,7 +96,13 @@ <fail message="The FLASHPLAYER_DEBUGGER property is not set in environment or command-line." unless="FLASHPLAYER_DEBUGGER"/> - + + <available file="${basedir}/${apache.rat.jar}" + type="file" + property="apache.rat.found"/> + <available file="${basedir}/${apache.rat.tasks.jar}" + type="file" + property="apache.rat.tasks.found"/> <available file="${env.ANT_HOME}/lib/${apache.rat.jar}" type="file" property="apache.rat.found"/> @@ -162,16 +165,23 @@ <target name="install-rat" depends="install-rat.jar,install-rat.tasks.jar" /> <target name="install-rat.jar" unless="apache.rat.found"> - <get src="${apache.rat.url}/${apache.rat.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.jar}" /> + <get src="${apache.rat.url}/${apache.rat.jar}" dest="${basedir}/${apache.rat.jar}" /> </target> <target name="install-rat.tasks.jar" unless="apache.rat.tasks.found"> - <get src="${apache.rat.tasks.url}/${apache.rat.tasks.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.tasks.jar}" /> + <get src="${apache.rat.tasks.url}/${apache.rat.tasks.jar}" dest="${basedir}/${apache.rat.tasks.jar}" /> </target> <target name="rat-taskdef" description="Rat taskdef"> - <typedef resource="org/apache/rat/anttasks/antlib.xml" - uri="antlib:org.apache.rat.anttasks" - classpathref="anttask.classpath"/> + <taskdef + uri="antlib:org.apache.rat.anttasks" + resource="org/apache/rat/anttasks/antlib.xml"> + <classpath> + <pathelement location="${basedir}/${apache.rat.jar}"/> + <pathelement location="${basedir}/${apache.rat.tasks.jar}"/> + <pathelement location="${env.ANT_HOME}/lib/${apache.rat.jar}"/> + <pathelement location="${env.ANT_HOME}/lib/${apache.rat.tasks.jar}"/> + </classpath> + </taskdef> </target> <target name="main" depends="write-out-jars-list,install-rat,download,check-sigs,uncompress,rat-check,examine-jars,check-notices,build,approve" description="Perform required release approval steps"> @@ -283,7 +293,7 @@ dest="${basedir}/${bin.package.url.name}"/> </target> - <target name="rat-check" > + <target name="rat-check" depends="rat-taskdef"> <echo message="Checking files at ${basedir}/${src.package.url.name}, report is ${src.rat.report}"/> @@ -357,7 +367,7 @@ addproperty="rat.bin.binaries.ok"/> </target> - <target name="binary-rat" > + <target name="binary-rat" depends="rat-taskdef"> <echo>${jars-list}</echo> <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${bin.rat.report}">