Fixed the build.xml files so that clean and cleanall actually removes the temporary...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1715 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Java/Source/Common/build.xml b/Tools/Java/Source/Common/build.xml
index 4fd7285f01b2812983bd1121868b9afcccf08c18..376948c46585aa4da983d06e5a667f81f80e3a41 100644 (file)
--- a/Tools/Java/Source/Common/build.xml
+++ b/Tools/Java/Source/Common/build.xml
@@ -16,18 +16,34 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>\r
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>\r

+\r
+  <path id="classpath">\r
+    <fileset dir="${WORKSPACE}/Tools/Jars">\r
+      <include name="SurfaceArea.jar"/>\r
+    </fileset>\r
+    <fileset dir="${env.XMLBEANS_HOME}/lib">\r
+      <include name="*.jar"/>\r
+    </fileset>\r
+    <pathelement path="${env.CLASSPATH}"/>\r
+  </path>\r
+\r

   <target name="Common_Jar" depends="install"/>\r
   <target name="Common_Jar" depends="install"/>\r

+\r

   <target name="source">\r
     <mkdir dir="${buildDir}"/>\r
     <javac srcdir="." destdir="${buildDir}">\r
   <target name="source">\r
     <mkdir dir="${buildDir}"/>\r
     <javac srcdir="." destdir="${buildDir}">\r

+      <classpath refid="classpath"/>\r

       <compilerarg value="-Xlint"/>\r
     </javac>\r
   </target>\r
       <compilerarg value="-Xlint"/>\r
     </javac>\r
   </target>\r

+\r

   <target name="clean">\r
   <target name="clean">\r

-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/Common" includes="${buildDir}"/>\r
+    </delete>\r

   </target>\r
   </target>\r

-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+\r
+  <target name="cleanall" depends="clean">\r

     <delete file="${installLocation}/Common.jar"/>\r
     <if>\r
       <available file="${installLocation}/Common.jar"/>\r
     <delete file="${installLocation}/Common.jar"/>\r
     <if>\r
       <available file="${installLocation}/Common.jar"/>\r


@@ -37,6 +53,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </then>\r
     </if>\r
   </target>\r
       </then>\r
     </if>\r
   </target>\r

+\r

   <target name="install" depends="source">\r
     <jar destfile="${installLocation}/Common.jar"\r
       basedir="${buildDir}"\r
   <target name="install" depends="source">\r
     <jar destfile="${installLocation}/Common.jar"\r
       basedir="${buildDir}"\r

diff --git a/Tools/Java/Source/ContextTool/build.xml b/Tools/Java/Source/ContextTool/build.xml
index 13567799b455e24de66c34d2291e3f60eba0786a..65f75456f7bf927112a3b5237dfdb02db58268e7 100644 (file)
--- a/Tools/Java/Source/ContextTool/build.xml
+++ b/Tools/Java/Source/ContextTool/build.xml
@@ -30,10 +30,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
     </javac>\r
   </target>\r
   <target name="clean">\r

-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/ContextTool" includes="${buildDir}"/>\r
+    </delete>\r

   </target>\r
   </target>\r

-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r

     <delete file="${installLocation}/ContextTool.jar"/>\r
     <if>\r
       <available file="${installLocation}/ContextTool.jar"/>\r
     <delete file="${installLocation}/ContextTool.jar"/>\r
     <if>\r
       <available file="${installLocation}/ContextTool.jar"/>\r

diff --git a/Tools/Java/Source/Cpptasks/build.xml b/Tools/Java/Source/Cpptasks/build.xml
index 15eb959820caedcd69bcacadcf569840528c3dd7..971e7e774cf804ca9ab343d5f5e226cea09e5677 100644 (file)
--- a/Tools/Java/Source/Cpptasks/build.xml
+++ b/Tools/Java/Source/Cpptasks/build.xml
@@ -32,10 +32,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
     </javac>\r
   </target>\r
   <target name="clean">\r

-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/Cpptasks" includes="${buildDir}"/>\r
+    </delete>\r

   </target>\r
   </target>\r

-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r

     <delete file="${installLocation}/cpptasks.jar"/>\r
     <if>\r
       <available file="${installLocation}/cpptasks.jar"/>\r
     <delete file="${installLocation}/cpptasks.jar"/>\r
     <if>\r
       <available file="${installLocation}/cpptasks.jar"/>\r

diff --git a/Tools/Java/Source/FrameworkTasks/build.xml b/Tools/Java/Source/FrameworkTasks/build.xml
index ac3639cb0c50638b818bfcd44d0bb01940845514..ad5d3f0ff9efa9a23fb6abfeee4a053f2fdbf19b 100644 (file)
--- a/Tools/Java/Source/FrameworkTasks/build.xml
+++ b/Tools/Java/Source/FrameworkTasks/build.xml
@@ -28,10 +28,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
     </javac>\r
   </target>\r
   <target name="clean">\r

-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/FrameworkTasks" includes="${buildDir}"/>\r
+    </delete>\r

   </target>\r
   </target>\r

-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r

     <delete file="${installLocation}/frameworktasks.jar"/>\r
     <if>\r
       <available file="${installLocation}/frameworktasks.jar"/>\r
     <delete file="${installLocation}/frameworktasks.jar"/>\r
     <if>\r
       <available file="${installLocation}/frameworktasks.jar"/>\r

diff --git a/Tools/Java/Source/FrameworkWizard/build.xml b/Tools/Java/Source/FrameworkWizard/build.xml
index b9fc0b495baf62047b4d72757084efe3487678a3..c93693025455f69af2f7f667af0033bb48167134 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/build.xml
+++ b/Tools/Java/Source/FrameworkWizard/build.xml
@@ -29,10 +29,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
     </javac>\r
   </target>\r
   <target name="clean">\r

-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/FrameworkWizard" includes="${buildDir}"/>\r
+    </delete>\r

   </target>\r
   </target>\r

-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r

     <delete file="${installLocation}/FrameworkWizard.jar"/>\r
   </target>\r
   <target name="install" depends="source">\r
     <delete file="${installLocation}/FrameworkWizard.jar"/>\r
   </target>\r
   <target name="install" depends="source">\r

diff --git a/Tools/Java/Source/GenBuild/build.xml b/Tools/Java/Source/GenBuild/build.xml
index b61e2519c3e1ce682cf6aecf607509c52213d16a..d33cbebde03a75e404e221a6058d5f2e918a1659 100644 (file)
--- a/Tools/Java/Source/GenBuild/build.xml
+++ b/Tools/Java/Source/GenBuild/build.xml
@@ -31,10 +31,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
     </javac>\r
   </target>\r
   <target name="clean">\r

-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/GenBuild" includes="${buildDir}"/>\r
+    </delete>\r

   </target>\r
   </target>\r

-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r

     <delete file="${installLocation}/GenBuild.jar"/>\r
     <if>\r
       <available file="${installLocation}/GenBuild.jar"/>\r
     <delete file="${installLocation}/GenBuild.jar"/>\r
     <if>\r
       <available file="${installLocation}/GenBuild.jar"/>\r

diff --git a/Tools/Java/Source/Merge/build.xml b/Tools/Java/Source/Merge/build.xml
index e6e8aa6fce8e3aca39382fced3340d3372e1a163..8b91fad7cd918867bc08bf831ee0f372f47c1dc9 100644 (file)
--- a/Tools/Java/Source/Merge/build.xml
+++ b/Tools/Java/Source/Merge/build.xml
@@ -28,10 +28,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
     </javac>\r
   </target>\r
   <target name="clean">\r

-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/Merge" includes="${buildDir}"/>\r
+    </delete>\r

   </target>\r
   </target>\r

-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r

     <delete file="${installLocation}/Merge.jar"/>\r
   </target>\r
   <target name="install" depends="source">\r
     <delete file="${installLocation}/Merge.jar"/>\r
   </target>\r
   <target name="install" depends="source">\r

diff --git a/Tools/Java/Source/MigrationTools/build.xml b/Tools/Java/Source/MigrationTools/build.xml
index 2406c0350fb5824730abc49276a70943dac17e22..10ca9215c8fa2791fe63ec1e2feeb5e5bb4a7100 100644 (file)
--- a/Tools/Java/Source/MigrationTools/build.xml
+++ b/Tools/Java/Source/MigrationTools/build.xml
@@ -29,10 +29,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
     </javac>\r
   </target>\r
   <target name="clean">\r

-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/MigrationTools" includes="${buildDir}"/>\r
+    </delete>\r

   </target>\r
   </target>\r

-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r

     <delete file="${installLocation}/MigrationTools.jar"/>\r
     <if>\r
       <available file="${installLocation}/MigrationTools.jar"/>\r
     <delete file="${installLocation}/MigrationTools.jar"/>\r
     <if>\r
       <available file="${installLocation}/MigrationTools.jar"/>\r

diff --git a/Tools/Java/Source/PcdTools/build.xml b/Tools/Java/Source/PcdTools/build.xml
index c47032e9f5a872bd3b11ea6bcdb4736c37e68eeb..a8c7aa959f704b6fe969660214388aa3076f14d9 100644 (file)
--- a/Tools/Java/Source/PcdTools/build.xml
+++ b/Tools/Java/Source/PcdTools/build.xml
@@ -30,10 +30,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </javac>\r
   </target>\r
   <target name="clean">\r
     </javac>\r
   </target>\r
   <target name="clean">\r

-    <delete dir="${buildDir}"/>\r
+    <delete includeemptydirs="true" failonerror="false" quiet="true">\r
+    <fileset dir="${WORKSPACE}/Tools/Java/Source/PcdTools" includes="${buildDir}"/>\r
+    </delete>\r

   </target>\r
   </target>\r

-  <target name="cleanall">\r
-    <delete dir="${buildDir}"/>\r
+  <target name="cleanall" depends="clean">\r

     <delete file="${installLocation}/PcdTools.jar"/>\r
     <if>\r
       <available file="${installLocation}/PcdTools.jar"/>\r
     <delete file="${installLocation}/PcdTools.jar"/>\r
     <if>\r
       <available file="${installLocation}/PcdTools.jar"/>\r

diff --git a/Tools/Java/Source/SurfaceArea/build.xml b/Tools/Java/Source/SurfaceArea/build.xml
index 5b0efdb6250ffba557c9a307c645c5ec2c452abc..6931d8170656b8a89b1b0dab00d769d24fd18ff5 100644 (file)
--- a/Tools/Java/Source/SurfaceArea/build.xml
+++ b/Tools/Java/Source/SurfaceArea/build.xml
@@ -83,7 +83,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   \r
   <target name="SurfaceArea.java.clean">\r
     <delete includeemptydirs="true" failonerror="false">\r
   \r
   <target name="SurfaceArea.java.clean">\r
     <delete includeemptydirs="true" failonerror="false">\r

-      <fileset dir="${WORKSPACE}/Tools/Java/Source/SurfaceArea/org" includes="**/*"/>\r
+      <fileset dir="${WORKSPACE}/Tools/Java/Source/SurfaceArea" includes="org"/>\r

     </delete>\r
   </target>\r
 \r
     </delete>\r
   </target>\r
 \r