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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1619 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/Merge/Merge.msa b/Tools/Source/Merge/Merge.msa
new file mode 100644 (file)
index 0000000..0920899
--- /dev/null
+++ b/Tools/Source/Merge/Merge.msa
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+  <MsaHeader>\r
+    <ModuleName>Merge Tool</ModuleName>\r
+    <ModuleType>BASE</ModuleType>\r
+    <GuidValue>fbb48848-4776-44a1-8458-1e84701fb62f</GuidValue>\r
+    <Version>0.1</Version>\r
+    <Abstract>The tool merges multiple MSA files (of the same ModuleType) into a single module</Abstract>\r
+    <Description>Merging multiple modules into a single module is useful for size reduction of the binary images.
+This tool will create an MSA file, based on the content of "leaf" MSA files.  It is written so that it can be executed from a command line, or later, incorporated into the Wizard.
+USAGE:
+merge [-v] -t target [-u UiName] [-p PackageFile] [-o OutputFileBasename] dir1\mod1.msa ... dirN\modN.msa</Description>\r
+    <Copyright>Copyright (c) 2006, Intel Corporation   All rights reserved.</Copyright>\r
+    <License URL="http://opensource.org/licenses/bsd-license.php">This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution.  The full text of the license may be found at  http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
+  </MsaHeader>\r
+  <ModuleDefinitions>\r
+    <SupportedArchitectures>EBC IA32 X64 IPF ARM PPC</SupportedArchitectures>\r
+    <BinaryModule>false</BinaryModule>\r
+    <OutputFileBasename>Merge</OutputFileBasename>\r
+  </ModuleDefinitions>\r
+  <SourceFiles>\r
+    <Filename>src/org/tianocore/Mege/CombineMsa.java</Filename>\r
+    <Filename>src/org/tianocore/Merge/Merge.java</Filename>\r
+    <Filename>src/org/tianocore/Merge/MergeCmd.java</Filename>\r
+    <Filename>build.xml</Filename>\r
+    <Filename>readme.txt</Filename>\r
+  </SourceFiles>\r
+</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/Tools/Tools.spd b/Tools/Tools.spd
index 6c03bf97d6ac96e5f01da59a646665e8766d7ed4..b58f304d7bf415928b1ee0d238445a7615475d4d 100644 (file)
--- a/Tools/Tools.spd
+++ b/Tools/Tools.spd
@@ -38,5 +38,6 @@
     <Filename>Source/SurfaceArea/SurfaceArea.msa</Filename>\r
     <Filename>Source/TianoTools/TianoTools.msa</Filename>\r
     <Filename>Source/MigrationTools/MigrationTools.msa</Filename>\r
+    <Filename>Source/Merge/Merge.msa</Filename>\r
   </MsaFiles>\r
-</PackageSurfaceArea>
+</PackageSurfaceArea>
\ No newline at end of file

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/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
@@ -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/Merge/build.xml\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/Merge/build.xml\r
         "/>\r
     </subant>\r
   </target>\r