X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2Fbuild.xml;h=caef839b504b61d63667032a2a18e4f2b1d5d10a;hb=db0e690675ba50c2463c47e4811227e56c4858d9;hp=59f027a7155c53f2a847d839af61340ab1c678a6;hpb=28305207ea586d0b5ceb530b0e2a436cad9fdd8f;p=mirror_edk2.git

diff --git a/Tools/build.xml b/Tools/build.xml
index 59f027a715..caef839b50 100644
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="" inheritall="false">
       <filelist dir="."
         files="
-          CTools/Source/build.xml
+          CCode/Source/build.xml
           "/>
     </subant>
   </target>
@@ -75,8 +75,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>
 
   <target name="makeCatalog">
-    <echo file="XMLSchema/catalog.xml">
-      <![CDATA[<?xml version="1.0"?>
+    <if>
+      <not>
+        <available file="XMLSchema/catalog.xml"/>
+      </not>
+      <then>
+        <echo file="XMLSchema/catalog.xml"><![CDATA[<?xml version="1.0"?>
 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.xsd">
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
   <rewriteSystem systemIdStartString="http://www.TianoCore.org/2006/Edk2.0/"
@@ -84,7 +88,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <rewriteURI uriStartString="http://www.TianoCore.org/2006/Edk2.0/"
     rewritePrefix="file:/]]>${env.WORKSPACE}<![CDATA[/Tools/XMLSchema/"/>
 </catalog>]]>
-    </echo>
+</echo>
+      </then>
+    </if>
     <if>
       <not>
         <available file="Conf/tools_def.txt"/>
@@ -124,15 +130,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Java/Source/PcdTools/build.xml 
           Java/Source/Common/build.xml 
           Java/Source/SurfaceArea/build.xml 
-          CCode/Source/build.xml
           Java/Source/MigrationTools/build.xml
           Java/Source/ContextTool/build.xml
           Java/Source/Merge/build.xml
+          CCode/Source/build.xml
         "/>
     </subant>
   </target>
 
   <target name="cleanall">
+    <echo message="Removing extra ${env.WORKSPACE} history.xml files!"/>
+    <if>
+      <available file="${env.WORKSPACE}/Tools/bin/history.xml"/>
+      <then>
+        <delete failonerror="false" quiet="true">
+          <fileset file="${env.WORKSPACE}/Tools/bin/history.xml"/>
+        </delete>
+      </then>
+    </if>
+    <if>
+      <available file="${env.WORKSPACE}/Tools/CCode/Source/Library/history.xml"/>
+      <then>
+        <delete failonerror="false" quiet="true">
+          <fileset file="${env.WORKSPACE}/Tools/CCode/Source/Library/history.xml"/>
+        </delete>
+      </then>
+    </if>
     <available classname="org.tianocore.frameworkwizard.FrameworkWizardUI" property="FrameworkWizardUI.available"/>
     <available classname="org.tianocore.build.GenBuildTask" property="GenBuildTask.available"/>
     <available classname="org.tianocore.framework.tasks.Tool" property="Tool.available"/>
@@ -158,10 +181,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Java/Source/PcdTools/build.xml 
           Java/Source/Common/build.xml 
           Java/Source/SurfaceArea/build.xml 
-          CCode/Source/build.xml
           Java/Source/MigrationTools/build.xml
           Java/Source/ContextTool/build.xml
           Java/Source/Merge/build.xml
+          CCode/Source/build.xml
         "/>
     </subant>
   </target>