Change NT32 to new XML Schema.

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

2 files changed, 34 insertions, 40 deletions

diff --git a/EdkNt32Pkg/Logo/Logo.msa b/EdkNt32Pkg/Logo/Logo.msa
index aae557a..2257800 100644
--- a/EdkNt32Pkg/Logo/Logo.msa
+++ b/EdkNt32Pkg/Logo/Logo.msa
@@ -1,48 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--

-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.

--->

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">

+<!--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.-->

+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

-    <BaseName>Logo</BaseName>

-    <ModuleType>BASE</ModuleType>

-    <ComponentType>LOGO</ComponentType>

-    <Guid>7BB28B99-61BB-11D5-9A5D-0090273FC14D</Guid>

-    <Version>0</Version>

+    <ModuleName>Logo</ModuleName>

+    <ModuleType>USER_DEFINED</ModuleType>

+    <GuidValue>7BB28B99-61BB-11D5-9A5D-0090273FC14D</GuidValue>

+    <Version>1.0</Version>

     <Abstract>Component description file for creating a Logo file.</Abstract>

     <Description>FIX ME!</Description>

     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>

-    <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,

-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-    </License>

-    <Created>2006-03-14 17:04</Created>

-    <Updated>2006-03-19 15:17</Updated>

-    <Specification>0</Specification>

+    <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,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

+  <ModuleDefinitions>

+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <BinaryModule>false</BinaryModule>

+    <OutputFileBasename>Logo</OutputFileBasename>

+  </ModuleDefinitions>

   <SourceFiles>

-    <Filename FileType="Graphics">Logo.bmp</Filename>

+    <Filename>Logo.bmp</Filename>

   </SourceFiles>

-  <Includes>

-    <PackageName>MdePkg</PackageName>

-  </Includes>

+  <PackageDependencies>

+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+  </PackageDependencies>

   <Externs>

-    <Extern>

-      <ModuleEntryPoint></ModuleEntryPoint>

-    </Extern>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>

   </Externs>

-  <BuildOptions>

-    <Option>BUILD_TYPE=CUSTOM_BUILD</Option>

-  </BuildOptions>

-</ModuleSurfaceArea>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Logo/Logo_build.xml b/EdkNt32Pkg/Logo/Logo_build.xml
index bbc8b00..32e340d 100644
--- a/EdkNt32Pkg/Logo/Logo_build.xml
+++ b/EdkNt32Pkg/Logo/Logo_build.xml
@@ -55,12 +55,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <file name="${DEST_DIR_OUTPUT}\Logo.bin"/>

       </sourcefiles>

       <targetfiles>

-        <file name="${BIN_DIR}\7BB28B99-61BB-11D5-9A5D-0090273FC14D-Logo.FFS"/>

+        <file name="${BIN_DIR}\${FILE_GUID}-Logo.FFS"/>

       </targetfiles>

       

       <sequential>

         <genffsfile BaseName="Logo" ffsATTRIBCHECKSUM="TRUE"

-          ffsFILETYPE="EFI_FV_FILETYPE_FREEFORM" fileGuid="7BB28B99-61BB-11D5-9A5D-0090273FC14D"

+          ffsFILETYPE="EFI_FV_FILETYPE_FREEFORM" fileGuid="${FILE_GUID}"

           outputDir="${BIN_DIR}">

           <compress compressName="dummy">

             <tool outputPath="${DEST_DIR_OUTPUT}" toolName="${WORKSPACE_DIR}\Tools\Bin\GenCRC32Section">