Added the DbTools that will update the FrameworkDatabase.db file based on what is...

[mirror_edk2.git] / Tools / Java / Source / Merge / Merge.msa

diff --git a/Tools/Java/Source/Merge/Merge.msa b/Tools/Java/Source/Merge/Merge.msa
index 092089947637cbc726ffdb4f333107c5d20f64db..b394d7a90ab0bf9e36d32ba3e21a8fdc87a88212 100644 (file)
--- a/Tools/Java/Source/Merge/Merge.msa
+++ b/Tools/Java/Source/Merge/Merge.msa
@@ -2,18 +2,18 @@
 <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
 <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
+    <ModuleType>TOOL</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
     <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:
+    <Description>Merging multiple modules into a single module is useful for size reduction of the binary images.\r
+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.\r
+USAGE:\r

 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
 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,
+    <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\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r


@@ -23,10 +23,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</L
     <OutputFileBasename>Merge</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <SourceFiles>\r
     <OutputFileBasename>Merge</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <SourceFiles>\r

-    <Filename>src/org/tianocore/Mege/CombineMsa.java</Filename>\r
+    <Filename>src/org/tianocore/Merge/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
     <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
+</ModuleSurfaceArea>\r