Added the Merge tool information to build.xml and created the MSA file for the merge...
authorlhauch <lhauch@de2fecce-e211-0410-80a6-f3fac2684e05>
Mon, 25 Sep 2006 23:31:31 +0000 (23:31 +0000)
committerlhauch <lhauch@de2fecce-e211-0410-80a6-f3fac2684e05>
Mon, 25 Sep 2006 23:31:31 +0000 (23:31 +0000)
git-svn-id: de2fecce-e211-0410-80a6-f3fac2684e05

edk2/Tools/Source/Merge/Merge.msa [new file with mode: 0644]

diff --git a/edk2/Tools/Source/Merge/Merge.msa b/edk2/Tools/Source/Merge/Merge.msa
new file mode 100644 (file)
index 0000000..0920899
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ModuleSurfaceArea xmlns="" xmlns:xsi="">\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.
+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="">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
+    <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/</Filename>\r
+    <Filename>src/org/tianocore/Merge/</Filename>\r
+    <Filename>src/org/tianocore/Merge/</Filename>\r
+    <Filename>build.xml</Filename>\r
+    <Filename>readme.txt</Filename>\r
+  </SourceFiles>\r
\ No newline at end of file
index 6c03bf9..b58f304 100644 (file)
@@ -38,5 +38,6 @@
+    <Filename>Source/Merge/Merge.msa</Filename>\r
\ No newline at end of file
index ea6a250..e7f1031 100644 (file)
+          Source/Merge/build.xml\r
     <echo message="The EDK II Java Tools build has completed!"/>\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
   <target name="SurfaceArea" depends="makeCatalog">\r
     <subant target="" verbose="true" inheritall="false">\r
       <filelist dir="."\r
+          Source/Merge/build.xml\r
+          Source/Merge/build.xml\r