Added the Merge tool information to build.xml and created the MSA file for the merge...

[mirror_edk2.git] / Tools / build.xml

diff --git a/Tools/build.xml b/Tools/build.xml
index ea6a2501d3b341b3485e4764895b3af8bf9a2eb1..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/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
           "/>\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
     </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
   <target name="SurfaceArea" depends="makeCatalog">\r
     <subant target="" verbose="true" inheritall="false">\r
       <filelist dir="."\r


@@ -117,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/TianoTools/build.xml\r
           Source/MigrationTools/build.xml\r
           Source/ContextTool/build.xml\r

+          Source/Merge/build.xml\r

         "/>\r
     </subant>\r
   </target>\r
         "/>\r
     </subant>\r
   </target>\r


@@ -150,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/TianoTools/build.xml\r
           Source/MigrationTools/build.xml\r
           Source/ContextTool/build.xml\r

+          Source/Merge/build.xml\r

         "/>\r
     </subant>\r
   </target>\r
         "/>\r
     </subant>\r
   </target>\r