X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2Fbuild.xml;h=0f746c98e86f44ed3ad610328332f34f6dbc48d9;hp=820bc2cef60273bba66ed54f1095d32de2c29fe5;hb=439656f15250c9fd2e1c778649df1d517143e80e;hpb=8a07290e64e4dcd64f5fbaf975d41d44b15b47d2

diff --git a/Tools/build.xml b/Tools/build.xml
index 820bc2cef6..0f746c98e8 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="
-          Source/TianoTools/build.xml
+          CCode/Source/build.xml
           "/>
     </subant>
   </target>
@@ -32,12 +32,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <!-- Note: this is an ordered list. The projects have dependencies between them. -->
       <filelist dir="."
         files="
-          Source/Common/build.xml
-          Source/PcdTools/build.xml
-          Source/GenBuild/build.xml
-          Source/FrameworkTasks/build.xml
-          Source/Cpptasks/build.xml
-          Source/FrameworkWizard/build.xml
+          Java/Source/Common/build.xml
+          Java/Source/PcdTools/build.xml
+          Java/Source/GenBuild/build.xml
+          Java/Source/FrameworkTasks/build.xml
+          Java/Source/Cpptasks/build.xml
+          Java/Source/FrameworkWizard/build.xml
+          Java/Source/MigrationTools/build.xml
+          Java/Source/ContextTool/build.xml
+          Java/Source/Merge/build.xml
           "/>
     </subant>
     <echo message="The EDK II Java Tools build has completed!"/>
@@ -48,7 +51,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <!-- Note: this is an ordered list. The projects have dependencies between them. -->
       <filelist dir="."
         files="
-          Source/FrameworkWizard/build.xml
+          Java/Source/FrameworkWizard/build.xml
+          "/>
+    </subant>
+  </target>
+
+  <target name="Merge" depends="SurfaceArea">
+    <subant target="" verbose="true" inheritall="false">
+      <filelist dir="."
+        files="
+          Java/Source/Merge/build.xml
           "/>
     </subant>
   </target>
@@ -57,14 +69,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="" verbose="true" inheritall="false">
       <filelist dir="."
         files="
-          Source/SurfaceArea/build.xml
+          Java/Source/SurfaceArea/build.xml
           "/>
     </subant>
   </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/"
@@ -72,9 +88,27 @@ 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>
-    <copy file="Conf/tools_def.template" tofile="Conf/tools_def.txt" overwrite="false"/>
-    <copy file="Conf/target.template" tofile="Conf/target.txt" overwrite="false"/>
+</echo>
+      </then>
+    </if>
+    <if>
+      <not>
+        <available file="Conf/tools_def.txt"/>
+      </not>
+      <then>
+        <copy file="Conf/tools_def.template" tofile="Conf/tools_def.txt"/>
+      </then>
+    </if>
+
+    <if>
+      <not>
+        <available file="Conf/target.txt"/>
+      </not>
+      <then>
+        <copy file="Conf/target.template" tofile="Conf/target.txt"/>
+      </then>
+    </if>
+
     <if>
       <not>
         <available file="Conf/FrameworkDatabase.db"/>
@@ -89,14 +123,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="clean" inheritall="false">
       <filelist dir="."
         files="
-          Source/FrameworkWizard/build.xml 
-          Source/Cpptasks/build.xml 
-          Source/FrameworkTasks/build.xml 
-          Source/GenBuild/build.xml 
-          Source/PcdTools/build.xml 
-          Source/Common/build.xml 
-          Source/SurfaceArea/build.xml 
-          Source/TianoTools/build.xml
+          Java/Source/FrameworkWizard/build.xml 
+          Java/Source/Cpptasks/build.xml 
+          Java/Source/FrameworkTasks/build.xml 
+          Java/Source/GenBuild/build.xml 
+          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
         "/>
     </subant>
   </target>
@@ -120,14 +157,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="cleanall" inheritall="true">
       <filelist dir="."
         files="
-          Source/FrameworkWizard/build.xml 
-          Source/Cpptasks/build.xml 
-          Source/FrameworkTasks/build.xml 
-          Source/GenBuild/build.xml 
-          Source/PcdTools/build.xml 
-          Source/Common/build.xml 
-          Source/SurfaceArea/build.xml 
-          Source/TianoTools/build.xml
+          Java/Source/FrameworkWizard/build.xml 
+          Java/Source/Cpptasks/build.xml 
+          Java/Source/FrameworkTasks/build.xml 
+          Java/Source/GenBuild/build.xml 
+          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
         "/>
     </subant>
   </target>