X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2Fbuild.xml;h=e7f10311c44d3a36b99c0d4f613848a106874c48;hb=ee2db093289707e787eeea571c0180c2376fac95;hp=9e07a3d5e38d4b313b91b8895912d44bbc73d8df;hpb=a959daced9d28da4d372a9be5ebb0028d3f8ab05;p=mirror_edk2.git

diff --git a/Tools/build.xml b/Tools/build.xml
index 9e07a3d5e3..e7f10311c4 100644
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -39,6 +39,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/Cpptasks/build.xml
           Source/FrameworkWizard/build.xml
           Source/MigrationTools/build.xml
+          Source/ContextTool/build.xml
+          Source/Merge/build.xml
           "/>
     </subant>
     <echo message="The EDK II Java Tools build has completed!"/>
@@ -54,6 +56,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>
   </target>
 
+  <target name="Merge" depends="SurfaceArea">
+    <subant target="" verbose="true" inheritall="false">
+      <filelist dir="."
+        files="
+          Source/Merge/build.xml
+          "/>
+    </subant>
+  </target>
+
   <target name="SurfaceArea" depends="makeCatalog">
     <subant target="" verbose="true" inheritall="false">
       <filelist dir="."
@@ -74,8 +85,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     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"/>
+    <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"/>
@@ -99,6 +126,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/SurfaceArea/build.xml 
           Source/TianoTools/build.xml
           Source/MigrationTools/build.xml
+          Source/ContextTool/build.xml
+          Source/Merge/build.xml
         "/>
     </subant>
   </target>
@@ -131,6 +160,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/SurfaceArea/build.xml 
           Source/TianoTools/build.xml
           Source/MigrationTools/build.xml
+          Source/ContextTool/build.xml
+          Source/Merge/build.xml
         "/>
     </subant>
   </target>