Fixed the build.xml files so that clean and cleanall actually removes the temporary build directories, rather than leaving all of the intermediate files left lying around.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1715 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lhauch
2006-10-10 23:01:42 +00:00
parent 8973d1764f
commit 439656f152
10 changed files with 53 additions and 28 deletions

View File

@ -16,18 +16,34 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<property name="WORKSPACE" value="${env.WORKSPACE}"/> <property name="WORKSPACE" value="${env.WORKSPACE}"/>
<property name="buildDir" value="build"/> <property name="buildDir" value="build"/>
<property name="installLocation" value="${WORKSPACE}/Tools/Jars"/> <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>
<path id="classpath">
<fileset dir="${WORKSPACE}/Tools/Jars">
<include name="SurfaceArea.jar"/>
</fileset>
<fileset dir="${env.XMLBEANS_HOME}/lib">
<include name="*.jar"/>
</fileset>
<pathelement path="${env.CLASSPATH}"/>
</path>
<target name="Common_Jar" depends="install"/> <target name="Common_Jar" depends="install"/>
<target name="source"> <target name="source">
<mkdir dir="${buildDir}"/> <mkdir dir="${buildDir}"/>
<javac srcdir="." destdir="${buildDir}"> <javac srcdir="." destdir="${buildDir}">
<classpath refid="classpath"/>
<compilerarg value="-Xlint"/> <compilerarg value="-Xlint"/>
</javac> </javac>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${buildDir}"/> <delete includeemptydirs="true" failonerror="false">
<fileset dir="${WORKSPACE}/Tools/Java/Source/Common" includes="${buildDir}"/>
</delete>
</target> </target>
<target name="cleanall">
<delete dir="${buildDir}"/> <target name="cleanall" depends="clean">
<delete file="${installLocation}/Common.jar"/> <delete file="${installLocation}/Common.jar"/>
<if> <if>
<available file="${installLocation}/Common.jar"/> <available file="${installLocation}/Common.jar"/>
@ -37,6 +53,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</then> </then>
</if> </if>
</target> </target>
<target name="install" depends="source"> <target name="install" depends="source">
<jar destfile="${installLocation}/Common.jar" <jar destfile="${installLocation}/Common.jar"
basedir="${buildDir}" basedir="${buildDir}"

View File

@ -30,10 +30,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</javac> </javac>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${buildDir}"/> <delete includeemptydirs="true" failonerror="false" quiet="true">
<fileset dir="${WORKSPACE}/Tools/Java/Source/ContextTool" includes="${buildDir}"/>
</delete>
</target> </target>
<target name="cleanall"> <target name="cleanall" depends="clean">
<delete dir="${buildDir}"/>
<delete file="${installLocation}/ContextTool.jar"/> <delete file="${installLocation}/ContextTool.jar"/>
<if> <if>
<available file="${installLocation}/ContextTool.jar"/> <available file="${installLocation}/ContextTool.jar"/>

View File

@ -32,10 +32,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</javac> </javac>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${buildDir}"/> <delete includeemptydirs="true" failonerror="false">
<fileset dir="${WORKSPACE}/Tools/Java/Source/Cpptasks" includes="${buildDir}"/>
</delete>
</target> </target>
<target name="cleanall"> <target name="cleanall" depends="clean">
<delete dir="${buildDir}"/>
<delete file="${installLocation}/cpptasks.jar"/> <delete file="${installLocation}/cpptasks.jar"/>
<if> <if>
<available file="${installLocation}/cpptasks.jar"/> <available file="${installLocation}/cpptasks.jar"/>

View File

@ -28,10 +28,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</javac> </javac>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${buildDir}"/> <delete includeemptydirs="true" failonerror="false" quiet="true">
<fileset dir="${WORKSPACE}/Tools/Java/Source/FrameworkTasks" includes="${buildDir}"/>
</delete>
</target> </target>
<target name="cleanall"> <target name="cleanall" depends="clean">
<delete dir="${buildDir}"/>
<delete file="${installLocation}/frameworktasks.jar"/> <delete file="${installLocation}/frameworktasks.jar"/>
<if> <if>
<available file="${installLocation}/frameworktasks.jar"/> <available file="${installLocation}/frameworktasks.jar"/>

View File

@ -29,10 +29,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</javac> </javac>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${buildDir}"/> <delete includeemptydirs="true" failonerror="false" quiet="true">
<fileset dir="${WORKSPACE}/Tools/Java/Source/FrameworkWizard" includes="${buildDir}"/>
</delete>
</target> </target>
<target name="cleanall"> <target name="cleanall" depends="clean">
<delete dir="${buildDir}"/>
<delete file="${installLocation}/FrameworkWizard.jar"/> <delete file="${installLocation}/FrameworkWizard.jar"/>
</target> </target>
<target name="install" depends="source"> <target name="install" depends="source">

View File

@ -31,10 +31,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</javac> </javac>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${buildDir}"/> <delete includeemptydirs="true" failonerror="false" quiet="true">
<fileset dir="${WORKSPACE}/Tools/Java/Source/GenBuild" includes="${buildDir}"/>
</delete>
</target> </target>
<target name="cleanall"> <target name="cleanall" depends="clean">
<delete dir="${buildDir}"/>
<delete file="${installLocation}/GenBuild.jar"/> <delete file="${installLocation}/GenBuild.jar"/>
<if> <if>
<available file="${installLocation}/GenBuild.jar"/> <available file="${installLocation}/GenBuild.jar"/>

View File

@ -28,10 +28,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</javac> </javac>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${buildDir}"/> <delete includeemptydirs="true" failonerror="false" quiet="true">
<fileset dir="${WORKSPACE}/Tools/Java/Source/Merge" includes="${buildDir}"/>
</delete>
</target> </target>
<target name="cleanall"> <target name="cleanall" depends="clean">
<delete dir="${buildDir}"/>
<delete file="${installLocation}/Merge.jar"/> <delete file="${installLocation}/Merge.jar"/>
</target> </target>
<target name="install" depends="source"> <target name="install" depends="source">

View File

@ -29,10 +29,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</javac> </javac>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${buildDir}"/> <delete includeemptydirs="true" failonerror="false" quiet="true">
<fileset dir="${WORKSPACE}/Tools/Java/Source/MigrationTools" includes="${buildDir}"/>
</delete>
</target> </target>
<target name="cleanall"> <target name="cleanall" depends="clean">
<delete dir="${buildDir}"/>
<delete file="${installLocation}/MigrationTools.jar"/> <delete file="${installLocation}/MigrationTools.jar"/>
<if> <if>
<available file="${installLocation}/MigrationTools.jar"/> <available file="${installLocation}/MigrationTools.jar"/>

View File

@ -30,10 +30,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</javac> </javac>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${buildDir}"/> <delete includeemptydirs="true" failonerror="false" quiet="true">
<fileset dir="${WORKSPACE}/Tools/Java/Source/PcdTools" includes="${buildDir}"/>
</delete>
</target> </target>
<target name="cleanall"> <target name="cleanall" depends="clean">
<delete dir="${buildDir}"/>
<delete file="${installLocation}/PcdTools.jar"/> <delete file="${installLocation}/PcdTools.jar"/>
<if> <if>
<available file="${installLocation}/PcdTools.jar"/> <available file="${installLocation}/PcdTools.jar"/>

View File

@ -83,7 +83,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<target name="SurfaceArea.java.clean"> <target name="SurfaceArea.java.clean">
<delete includeemptydirs="true" failonerror="false"> <delete includeemptydirs="true" failonerror="false">
<fileset dir="${WORKSPACE}/Tools/Java/Source/SurfaceArea/org" includes="**/*"/> <fileset dir="${WORKSPACE}/Tools/Java/Source/SurfaceArea" includes="org"/>
</delete> </delete>
</target> </target>