Standardized property name WORKSPACE and fixed cleanall messages.

[mirror_edk2.git] / Tools / build.xml

diff --git a/Tools/build.xml b/Tools/build.xml
index 0f746c98e86f44ed3ad610328332f34f6dbc48d9..caef839b504b61d63667032a2a18e4f2b1d5d10a 100644 (file)
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -130,15 +130,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Java/Source/PcdTools/build.xml \r
           Java/Source/Common/build.xml \r
           Java/Source/SurfaceArea/build.xml \r
-          CCode/Source/build.xml\r
           Java/Source/MigrationTools/build.xml\r
           Java/Source/ContextTool/build.xml\r
           Java/Source/Merge/build.xml\r
+          CCode/Source/build.xml\r
         "/>\r
     </subant>\r
   </target>\r
 \r
   <target name="cleanall">\r
+    <echo message="Removing extra ${env.WORKSPACE} history.xml files!"/>\r
+    <if>\r
+      <available file="${env.WORKSPACE}/Tools/bin/history.xml"/>\r
+      <then>\r
+        <delete failonerror="false" quiet="true">\r
+          <fileset file="${env.WORKSPACE}/Tools/bin/history.xml"/>\r
+        </delete>\r
+      </then>\r
+    </if>\r
+    <if>\r
+      <available file="${env.WORKSPACE}/Tools/CCode/Source/Library/history.xml"/>\r
+      <then>\r
+        <delete failonerror="false" quiet="true">\r
+          <fileset file="${env.WORKSPACE}/Tools/CCode/Source/Library/history.xml"/>\r
+        </delete>\r
+      </then>\r
+    </if>\r
     <available classname="org.tianocore.frameworkwizard.FrameworkWizardUI" property="FrameworkWizardUI.available"/>\r
     <available classname="org.tianocore.build.GenBuildTask" property="GenBuildTask.available"/>\r
     <available classname="org.tianocore.framework.tasks.Tool" property="Tool.available"/>\r
@@ -164,10 +181,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Java/Source/PcdTools/build.xml \r
           Java/Source/Common/build.xml \r
           Java/Source/SurfaceArea/build.xml \r
-          CCode/Source/build.xml\r
           Java/Source/MigrationTools/build.xml\r
           Java/Source/ContextTool/build.xml\r
           Java/Source/Merge/build.xml\r
+          CCode/Source/build.xml\r
         "/>\r
     </subant>\r
   </target>\r