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

diff --git a/Tools/build.xml b/Tools/build.xml
index 06cc9211d7..59f027a715 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
+          CTools/Source/build.xml
           "/>
     </subant>
   </target>
@@ -32,14 +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
-          Source/MigrationTools/build.xml
-          Source/ContextTool/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!"/>
@@ -50,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>
@@ -59,7 +69,7 @@ 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>
@@ -75,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"/>
@@ -91,16 +117,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
-          Source/MigrationTools/build.xml
-          Source/ContextTool/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>
@@ -124,16 +151,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
-          Source/MigrationTools/build.xml
-          Source/ContextTool/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>