Fix VS 2005 compatibility issue

[mirror_edk2.git] / Tools / build.xml

diff --git a/Tools/build.xml b/Tools/build.xml
index 06cc9211d7ce516afec7e37432ee275ffe82d87a..e7f10311c44d3a36b99c0d4f613848a106874c48 100644 (file)
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -40,6 +40,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/FrameworkWizard/build.xml\r
           Source/MigrationTools/build.xml\r
           Source/ContextTool/build.xml\r
+          Source/Merge/build.xml\r
           "/>\r
     </subant>\r
     <echo message="The EDK II Java Tools build has completed!"/>\r
@@ -55,6 +56,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>\r
   </target>\r
 \r
+  <target name="Merge" depends="SurfaceArea">\r
+    <subant target="" verbose="true" inheritall="false">\r
+      <filelist dir="."\r
+        files="\r
+          Source/Merge/build.xml\r
+          "/>\r
+    </subant>\r
+  </target>\r
+\r
   <target name="SurfaceArea" depends="makeCatalog">\r
     <subant target="" verbose="true" inheritall="false">\r
       <filelist dir="."\r
@@ -75,8 +85,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     rewritePrefix="file:/]]>${env.WORKSPACE}<![CDATA[/Tools/XMLSchema/"/>\r
 </catalog>]]>\r
     </echo>\r
-    <copy file="Conf/tools_def.template" tofile="Conf/tools_def.txt" overwrite="false"/>\r
-    <copy file="Conf/target.template" tofile="Conf/target.txt" overwrite="false"/>\r
+    <if>\r
+      <not>\r
+        <available file="Conf/tools_def.txt"/>\r
+      </not>\r
+      <then>\r
+        <copy file="Conf/tools_def.template" tofile="Conf/tools_def.txt"/>\r
+      </then>\r
+    </if>\r
+\r
+    <if>\r
+      <not>\r
+        <available file="Conf/target.txt"/>\r
+      </not>\r
+      <then>\r
+        <copy file="Conf/target.template" tofile="Conf/target.txt"/>\r
+      </then>\r
+    </if>\r
+\r
     <if>\r
       <not>\r
         <available file="Conf/FrameworkDatabase.db"/>\r
@@ -101,6 +127,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/TianoTools/build.xml\r
           Source/MigrationTools/build.xml\r
           Source/ContextTool/build.xml\r
+          Source/Merge/build.xml\r
         "/>\r
     </subant>\r
   </target>\r
@@ -134,6 +161,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/TianoTools/build.xml\r
           Source/MigrationTools/build.xml\r
           Source/ContextTool/build.xml\r
+          Source/Merge/build.xml\r
         "/>\r
     </subant>\r
   </target>\r