From 4de927647804b8ae7bc214dd7f9fd5eaf45853d1 Mon Sep 17 00:00:00 2001
From: lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 25 Oct 2006 16:17:28 +0000
Subject: Added the DbTools that will update the FrameworkDatabase.db file
 based on what is found after scanning the WORKSPACE environment - entries for
 new SPD and FPD files that are found during the scan are added, and the
 entries for SPD and FPD files that are listed in the database, but are not in
 the current workspace are deleted. Modified AllResource to include only files
 that are not compiled. Added the MSA entries to the SPD file for all modules
 that are compiled, both Java and C.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1839 6f19259b-4bc3-4df7-8a09-765794883524
---
 Tools/Java/Source/Merge/Merge.msa | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'Tools/Java/Source/Merge/Merge.msa')

diff --git a/Tools/Java/Source/Merge/Merge.msa b/Tools/Java/Source/Merge/Merge.msa
index 0920899476..b394d7a90a 100644
--- 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">
   <MsaHeader>
     <ModuleName>Merge Tool</ModuleName>
-    <ModuleType>BASE</ModuleType>
+    <ModuleType>TOOL</ModuleType>
     <GuidValue>fbb48848-4776-44a1-8458-1e84701fb62f</GuidValue>
     <Version>0.1</Version>
     <Abstract>The tool merges multiple MSA files (of the same ModuleType) into a single module</Abstract>
-    <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.
+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>
     <Copyright>Copyright (c) 2006, Intel Corporation	All rights reserved.</Copyright>
-    <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
+
+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>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
@@ -23,10 +23,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</L
     <OutputFileBasename>Merge</OutputFileBasename>
   </ModuleDefinitions>
   <SourceFiles>
-    <Filename>src/org/tianocore/Mege/CombineMsa.java</Filename>
+    <Filename>src/org/tianocore/Merge/CombineMsa.java</Filename>
     <Filename>src/org/tianocore/Merge/Merge.java</Filename>
     <Filename>src/org/tianocore/Merge/MergeCmd.java</Filename>
     <Filename>build.xml</Filename>
     <Filename>readme.txt</Filename>
   </SourceFiles>
-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>
-- 
cgit v1.2.3