Update the binary MSA to say they were binary, fixed an abstract, changed a module...

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

diff --git a/EdkFatBinPkg/Fat.msa b/EdkFatBinPkg/Fat.msa
index ef1d34fc2f92564d160fddc217e6200ae9a33170..4c20d45b9806d9cdbaeddfb9b759394456608a7b 100644 (file)
--- a/EdkFatBinPkg/Fat.msa
+++ b/EdkFatBinPkg/Fat.msa
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!--Copyright (c) 2006, Intel Corporation
-All rights reserved. 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,
+<!--Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+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.-->\r
 <ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
   <MsaHeader>\r
@@ -16,17 +16,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Abstract>Make a FFS section for an FV that contains the FAT driver.*.FFS files are compressed FFS sections.</Abstract>\r
     <Description>This is the FAT 32 EFI/Tiano Driver</Description>\r
     <Copyright>Copyright 2004, Intel Corporation</Copyright>\r
-    <License>All rights reserved. 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>All rights reserved. This program and the accompanying materials\r
+      are licensed and made available under the terms and conditions of the BSD License\r
+      which accompanies this distribution.  The full text of the license may be found at\r
+      http://opensource.org/licenses/bsd-license.php\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
   <ModuleDefinitions>\r
     <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
-    <BinaryModule>false</BinaryModule>\r
+    <BinaryModule>true</BinaryModule>\r
     <OutputFileBasename>Fat</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <SourceFiles>\r
@@ -38,4 +38,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   </Externs>\r
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>\r

diff --git a/EdkModulePkg/Application/HelloWorld/HelloWorld.msa b/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
index 904076155f90a7372f28837c73f8313d471fe0f5..be332c80f5d58a2c158797601bd8a970596cfc41 100644 (file)
--- a/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
+++ b/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!--Copyright (c) 2006, Intel Corporation
-All rights reserved. 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.-->\r
-<ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <MsaHeader>\r
-    <ModuleName>HelloWorld</ModuleName>\r
+    <ModuleName>Hello World UEFI Application</ModuleName>\r
     <ModuleType>UEFI_APPLICATION</ModuleType>\r
     <GuidValue>6987936E-ED34-44db-AE97-1FA5E4ED2116</GuidValue>\r
     <Version>1.0</Version>\r
-    <Abstract>Component description file for SecurityStub module</Abstract>\r
-    <Description>FIX ME!</Description>\r
+    <Abstract>Sample UEFI Application Reference Module</Abstract>\r
+    <Description>This is a shell application that will display Hello World.</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
     <License>All rights reserved. This program and the accompanying materials
       are licensed and made available under the terms and conditions of the BSD License

diff --git a/EdkShellBinPkg/bin/Shell.msa b/EdkShellBinPkg/bin/Shell.msa
index b82ead0cb1bda5a85be7ba7e10d1e2692e519cda..04f5926dfb14db8063eb22f49db509591d234a0b 100644 (file)
--- a/EdkShellBinPkg/bin/Shell.msa
+++ b/EdkShellBinPkg/bin/Shell.msa
@@ -1,33 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!--Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-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.-->\r
-<ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <MsaHeader>\r
     <ModuleName>Shell</ModuleName>\r
     <ModuleType>UEFI_APPLICATION</ModuleType>\r
     <GuidValue>c57ad6b7-0515-40a8-9d21-551652854e37</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for EFI Shell module.</Abstract>\r
-    <Description>This is a binary package containing multiple binary files, however there is\r
-                       only a single MSA and MBD file.</Description>\r
+    <Description>This is a binary package containing multiple binary files, however there is only a single MSA file.</Description>\r
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
-    <License>All rights reserved. This program and the accompanying materials\r
-      are licensed and made available under the terms and conditions of the BSD License\r
-      which accompanies this distribution.  The full text of the license may be found at\r
+    <License>All rights reserved. \r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License which accompanies this distribution.\r
+The full text of the license may be found at\r
       http://opensource.org/licenses/bsd-license.php\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
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT\r
+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>IA32 X64 IPF EBC</SupportedArchitectures>\r
-    <BinaryModule>false</BinaryModule>\r
+    <BinaryModule>true</BinaryModule>\r
     <OutputFileBasename>Shell</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <SourceFiles>\r
@@ -39,4 +32,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   </Externs>\r
-</ModuleSurfaceArea>\r
+</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/Tools/Source/Common/build.xml b/Tools/Source/Common/build.xml
index 39d2baf5694b9b607af884d81fff6c7b2cfba798..4fd7285f01b2812983bd1121868b9afcccf08c18 100644 (file)
--- a/Tools/Source/Common/build.xml
+++ b/Tools/Source/Common/build.xml
@@ -9,14 +9,14 @@ http://opensource.org/licenses/bsd-license.php
 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.\r
 -->\r
-<project name="Common" default="all" basedir=".">\r
+<project name="Common" default="Common_Jar" basedir=".">\r
 \r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
   <property environment="env"/>\r
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>\r
-  <target name="all" depends="install"/>\r
+  <target name="Common_Jar" depends="install"/>\r
   <target name="source">\r
     <mkdir dir="${buildDir}"/>\r
     <javac srcdir="." destdir="${buildDir}">\r

diff --git a/Tools/Source/Cpptasks/build.xml b/Tools/Source/Cpptasks/build.xml
index adbef6d98ccdbd9d7a87822401d17e643a972cb7..33300f89cf986d4745b6ff156175308591c54592 100644 (file)
--- a/Tools/Source/Cpptasks/build.xml
+++ b/Tools/Source/Cpptasks/build.xml
@@ -9,13 +9,13 @@ http://opensource.org/licenses/bsd-license.php
 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.\r
 -->\r
-<project name="CppTasks" default="all" basedir=".">\r
+<project name="CppTasks" default="CppTasks" basedir=".">\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
   <property environment="env"/>\r
   <property name="workspace" value="${env.WORKSPACE}"/>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${workspace}/Tools/Jars"/>\r
-  <target name="all" depends="install"/>\r
+  <target name="CppTasks" depends="install"/>\r
   <target name="init">\r
     <uptodate property="jar.newer" targetfile="${installLocation}/cpptasks.jar">\r
       <srcfiles dir="net" includes="**"/>\r

diff --git a/Tools/Source/FrameworkTasks/build.xml b/Tools/Source/FrameworkTasks/build.xml
index 664a8da78c824468282f41c62a8a4ad40a174bb2..ac3639cb0c50638b818bfcd44d0bb01940845514 100644 (file)
--- a/Tools/Source/FrameworkTasks/build.xml
+++ b/Tools/Source/FrameworkTasks/build.xml
@@ -9,13 +9,13 @@ http://opensource.org/licenses/bsd-license.php
 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.\r
 -->\r
-<project name="FrameworkTasks" default="all">\r
+<project name="FrameworkTasks" default="FrameworkTasks">\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
   <property environment="env"/>\r
   <property name="workspace" value="${env.WORKSPACE}"/>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${workspace}/Tools/Jars"/>\r
-  <target name="all" depends="install"/>\r
+  <target name="FrameworkTasks" depends="install"/>\r
   <target name="source">\r
     <mkdir dir="${buildDir}"/>\r
     <javac srcdir="." destdir="${buildDir}">\r

diff --git a/Tools/Source/FrameworkWizard/build.xml b/Tools/Source/FrameworkWizard/build.xml
index e49824b3c228b7283cca895a1bb156ece61c9f2f..b9fc0b495baf62047b4d72757084efe3487678a3 100644 (file)
--- a/Tools/Source/FrameworkWizard/build.xml
+++ b/Tools/Source/FrameworkWizard/build.xml
@@ -9,7 +9,7 @@ http://opensource.org/licenses/bsd-license.php
 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.\r
 -->\r
-<project name="FrameworkWizard" default="all" basedir=".">\r
+<project name="FrameworkWizard" default="FrameworkWizard" basedir=".">\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
   <property environment="env"/>\r
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="buildDir" value="build"/>\r
   <property name="resourceDir" value="rsc"/>\r
   <property name="installLocation" value="${WORKSPACE}/Tools/bin"/>\r
-  <target name="all" depends="install"/>\r
+  <target name="FrameworkWizard" depends="install"/>\r
   <target name="source">\r
     <mkdir dir="${buildDir}"/>\r
     <javac srcdir="src" destdir="${buildDir}">\r

diff --git a/Tools/Source/GenBuild/build.xml b/Tools/Source/GenBuild/build.xml
index 73a114b96f608f1cde7dd2c67c57888cd4b646bf..e40e756aadff65b950ee87fe576cd4d4994d1522 100644 (file)
--- a/Tools/Source/GenBuild/build.xml
+++ b/Tools/Source/GenBuild/build.xml
@@ -9,7 +9,7 @@ http://opensource.org/licenses/bsd-license.php
 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.\r
 -->\r
-<project name="GenBuild" default="all" basedir=".">\r
+<project name="GenBuild" default="GenBuild" basedir=".">\r
 \r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
   <property environment="env"/>\r
@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </path>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>\r
-  <target name="all" depends="install"/>\r
+  <target name="GenBuild" depends="install"/>\r
   <target name="source">\r
     <mkdir dir="${buildDir}"/>\r
     <javac srcdir="." destdir="${buildDir}">\r

diff --git a/Tools/build.xml b/Tools/build.xml
index 54d39200f18466ea478a222bea56f50f8df63967..cc2368521b6871b35466560d756c899ec5246470 100644 (file)
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -13,6 +13,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   <property environment="env"/>\r
 \r
+  <target name="all" depends="C_Code"/>\r
+\r
+  <target name="C_Code" depends="JavaCode">\r
+    <subant target="" inheritall="false">\r
+      <filelist dir="."\r
+        files="\r
+          Source/TianoTools/build.xml\r
+          "/>\r
+    </subant>\r
+  </target>\r
+\r
   <target name="JavaCode" depends="SurfaceArea">\r
     <subant target="" verbose="true" inheritall="false">\r
       <!-- Note: this is an ordered list. The projects have dependencies between them. -->\r
@@ -27,8 +38,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>\r
   </target>\r
 \r
-  <target name="all" depends="C_Code"/>\r
-\r
   <target name="SurfaceArea" depends="makeCatalog">\r
     <subant target="" verbose="true" inheritall="false">\r
       <filelist dir="."\r
@@ -38,15 +47,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>\r
   </target>\r
 \r
-  <target name="C_Code" depends="JavaCode">\r
-    <subant target="" inheritall="false">\r
-      <filelist dir="."\r
-        files="\r
-          Source/TianoTools/build.xml\r
-          "/>\r
-    </subant>\r
-  </target>\r
-\r
   <target name="makeCatalog">\r
     <echo file="XMLSchema/catalog.xml">\r
       <![CDATA[<?xml version="1.0"?>\r