Fixed ckt for cygwin, and verified this works on OS X as well

[mirror_edk2.git] / Tools / build.xml

diff --git a/Tools/build.xml b/Tools/build.xml
index 59f027a7155c53f2a847d839af61340ab1c678a6..19c8de2489ce802876383cdeb621efbbf741a32f 100644 (file)
--- 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">\r
       <filelist dir="."\r
         files="\r
-          CTools/Source/build.xml\r
+          CCode/Source/build.xml\r
           "/>\r
     </subant>\r
   </target>\r
@@ -41,6 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Java/Source/MigrationTools/build.xml\r
           Java/Source/ContextTool/build.xml\r
           Java/Source/Merge/build.xml\r
+          Java/Source/CheckTools/build.xml\r
           "/>\r
     </subant>\r
     <echo message="The EDK II Java Tools build has completed!"/>\r
@@ -75,8 +76,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>\r
 \r
   <target name="makeCatalog">\r
-    <echo file="XMLSchema/catalog.xml">\r
-      <![CDATA[<?xml version="1.0"?>\r
+    <if>\r
+      <not>\r
+        <available file="XMLSchema/catalog.xml"/>\r
+      </not>\r
+      <then>\r
+        <echo file="XMLSchema/catalog.xml"><![CDATA[<?xml version="1.0"?>\r
 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.xsd">\r
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">\r
   <rewriteSystem systemIdStartString="http://www.TianoCore.org/2006/Edk2.0/"\r
@@ -84,7 +89,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <rewriteURI uriStartString="http://www.TianoCore.org/2006/Edk2.0/"\r
     rewritePrefix="file:/]]>${env.WORKSPACE}<![CDATA[/Tools/XMLSchema/"/>\r
 </catalog>]]>\r
-    </echo>\r
+</echo>\r
+      </then>\r
+    </if>\r
     <if>\r
       <not>\r
         <available file="Conf/tools_def.txt"/>\r
@@ -113,6 +120,55 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </if>\r
   </target>\r
 \r
+  <target name="reconfig">\r
+    <!-- backup all config files -->\r
+    <if>\r
+      <available file="Conf/target.txt"/>\r
+      <then>\r
+        <echo message="Backup Conf/target.txt to Conf/target.txt.bak" />\r
+        <copy file="Conf/target.txt" tofile="Conf/target.txt.bak" overwrite="true" />\r
+      </then>\r
+    </if>\r
+    <if>\r
+      <available file="Conf/tools_def.txt"/>\r
+      <then>\r
+        <echo message="Backup Conf/tools_def.txt to Conf/tools_def.txt.bak" />\r
+        <copy file="Conf/tools_def.txt" tofile="Conf/tools_def.txt.bak"  overwrite="true" />\r
+      </then>\r
+    </if>\r
+    <if>\r
+      <available file="Conf/FrameworkDatabase.db"/>\r
+      <then>\r
+        <echo message="Backup Conf/FrameworkDatabase.db to Conf/FrameworkDatabase.db.bak" />\r
+        <copy file="Conf/FrameworkDatabase.db" tofile="Conf/FrameworkDatabase.db.bak"  overwrite="true" />\r
+      </then>\r
+    </if>\r
+    \r
+    <if>\r
+      <available file="Conf/tools_def.template"/>\r
+      <then>\r
+        <echo message="Copy file from Conf/tools_def.template to Conf/tools_def.txt" />\r
+        <copy file="Conf/tools_def.template" tofile="Conf/tools_def.txt" overwrite="true" />\r
+      </then>\r
+    </if>\r
+\r
+    <if>\r
+      <available file="Conf/target.template"/>\r
+      <then>\r
+        <echo message="Copy file from Conf/target.template to Conf/target.txt" />\r
+        <copy file="Conf/target.template" tofile="Conf/target.txt" overwrite="true" />\r
+      </then>\r
+    </if>\r
+\r
+    <if>\r
+      <available file="Conf/FrameworkDatabase.template"/>\r
+      <then>\r
+        <echo message="Copy file from Conf/FrameworkDatabase.template to Conf/FrameworkDatabase.db" />\r
+        <copy file="Conf/FrameworkDatabase.template" tofile="Conf/FrameworkDatabase.db" overwrite="true" />\r
+      </then>\r
+    </if>\r
+  </target>\r
+\r
   <target name="clean">\r
     <subant target="clean" inheritall="false">\r
       <filelist dir="."\r
@@ -124,15 +180,33 @@ 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
+          Java/Source/CheckTools/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
@@ -158,10 +232,11 @@ 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
+          Java/Source/CheckTools/build.xml\r
+          CCode/Source/build.xml\r
         "/>\r
     </subant>\r
   </target>\r