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, 152 insertions, 109 deletions

diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa
index 73e74ebfa2..fe463ecc5b 100644
--- a/EdkNt32Pkg/Sec/SecMain.msa
+++ b/EdkNt32Pkg/Sec/SecMain.msa
@@ -1,44 +1,56 @@
-<?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">

+<?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 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>SecMain</BaseName>

-    <ModuleType>SEC</ModuleType>

-    <ComponentType>SEC</ComponentType>

-    <Guid>4b837b03-6587-4d19-b82b-edfad836c0a0</Guid>

-    <Version>0</Version>

+    <ModuleName>SecMain</ModuleName>

+    <ModuleType>USER_DEFINED</ModuleType>

+    <GuidValue>4b837b03-6587-4d19-b82b-edfad836c0a0</GuidValue>

+    <Version>1.0</Version>

     <Abstract>Component description file for NT32 Sec.Warning the [sources.*] does not work like you think!If you add a file you need to update the makefile in the NT32 build tipSEC_OBJECTS needs to get the OBJ of the new C file added in.We keep [sources.*] synced up with SEC_OBJECTS so dependencies workproperly.Libraries.Common does not work you must update SEC_OBJECTS in the platformmakefile</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>SecMain</OutputFileBasename>

+  </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PeCoffLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PrintLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">ReportStatusCodeLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PcdLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PeCoffLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseMemoryLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PrintLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>ReportStatusCodeLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PcdLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>SecMain.c</Filename>

@@ -46,40 +58,52 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>WinNtThunk.c</Filename>

     <Filename>SecMain.h</Filename>

   </SourceFiles>

-  <Includes>

-    <PackageName>MdePkg</PackageName>

-    <PackageName>EdkModulePkg</PackageName>

-    <PackageName>EdkNt32Pkg</PackageName>

-  </Includes>

+  <PackageDependencies>

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

+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>

+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>

+  </PackageDependencies>

   <PPIs>

-    <Ppi Usage="ALWAYS_PRODUCED">NtThunk</Ppi>

-    <Ppi Usage="ALWAYS_PRODUCED">NtAutoScan</Ppi>

-    <Ppi Usage="ALWAYS_PRODUCED">NtFwh</Ppi>

-    <Ppi Usage="ALWAYS_PRODUCED">StatusCode</Ppi>

-    <Ppi Usage="ALWAYS_PRODUCED">NtPeiLoadFile</Ppi>

+    <Ppi Usage="ALWAYS_PRODUCED">

+      <PpiCName>NtThunk</PpiCName>

+    </Ppi>

+    <Ppi Usage="ALWAYS_PRODUCED">

+      <PpiCName>NtAutoScan</PpiCName>

+    </Ppi>

+    <Ppi Usage="ALWAYS_PRODUCED">

+      <PpiCName>NtFwh</PpiCName>

+    </Ppi>

+    <Ppi Usage="ALWAYS_PRODUCED">

+      <PpiCName>StatusCode</PpiCName>

+    </Ppi>

+    <Ppi Usage="ALWAYS_PRODUCED">

+      <PpiCName>NtPeiLoadFile</PpiCName>

+    </Ppi>

   </PPIs>

   <Guids>

-    <GuidEntry Usage="ALWAYS_PRODUCED">

-      <C_Name>PeiPeCoffLoader</C_Name>

-    </GuidEntry>

+    <GuidCNames Usage="ALWAYS_PRODUCED">

+      <GuidCName>PeiPeCoffLoader</GuidCName>

+    </GuidCNames>

   </Guids>

   <Externs>

-    <Extern>

-      <ModuleEntryPoint></ModuleEntryPoint>

-    </Extern>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>

   </Externs>

   <PcdCoded>

     <PcdEntry PcdItemType="FIXED_AT_BUILD">

       <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>

+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtMemorySizeForSecMain</TokenSpaceGuidCName>

+      <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="FIXED_AT_BUILD">

       <C_Name>PcdWinNtFirmwareVolume</C_Name>

+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtFirmwareVolume</TokenSpaceGuidCName>

+      <HelpText/>

     </PcdEntry>

     <PcdEntry PcdItemType="FIXED_AT_BUILD">

       <C_Name>PcdWinNtBootMode</C_Name>

+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtBootMode</TokenSpaceGuidCName>

+      <HelpText/>

     </PcdEntry>

   </PcdCoded>

-  <BuildOptions>

-    <Option>BUILD_TYPE=CUSTOM_BUILD</Option>

-  </BuildOptions>

-</ModuleSurfaceArea>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkNt32Pkg/Sec/SecMain_build.xml b/EdkNt32Pkg/Sec/SecMain_build.xml
index b0436d385b..f318869785 100644
--- a/EdkNt32Pkg/Sec/SecMain_build.xml
+++ b/EdkNt32Pkg/Sec/SecMain_build.xml
@@ -24,53 +24,61 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <!-- Compile all dependency Library instances. --> 

 

   <target name="libraries">

-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BaseLib\build.xml" inheritAll="false" target="BaseLib">

-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 

-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 

-      <property name="ARCH" value="${ARCH}" /> 

-      <property name="TARGET" value="${TARGET}" /> 

-      <property name="PACKAGE" value="MdePkg" /> 

-    </ant>

-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BaseMemoryLib\build.xml" inheritAll="false" target="BaseMemoryLib">

-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 

-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 

-      <property name="ARCH" value="${ARCH}" /> 

-      <property name="TARGET" value="${TARGET}" /> 

-      <property name="PACKAGE" value="MdePkg" /> 

-    </ant>

-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BasePrintLib\build.xml" inheritAll="false" target="BasePrintLib">

-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 

-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 

-      <property name="ARCH" value="${ARCH}" /> 

-      <property name="TARGET" value="${TARGET}" /> 

-      <property name="PACKAGE" value="MdePkg" /> 

-    </ant>

-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BasePeCoffLib\build.xml" inheritAll="false" target="BasePeCoffLib">

-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 

-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 

-      <property name="ARCH" value="${ARCH}" /> 

-      <property name="TARGET" value="${TARGET}" /> 

-      <property name="PACKAGE" value="MdePkg" /> 

-    </ant>

-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BaseReportStatusCodeLibNull\build.xml" inheritAll="false" target="BaseReportStatusCodeLibNull">

-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 

-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 

-      <property name="ARCH" value="${ARCH}" /> 

-      <property name="TARGET" value="${TARGET}" /> 

-      <property name="PACKAGE" value="MdePkg" /> 

-    </ant>

-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BaseDebugLibNull\build.xml" inheritAll="false" target="BaseDebugLibNull">

-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 

-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 

-      <property name="ARCH" value="${ARCH}" /> 

-      <property name="TARGET" value="${TARGET}" /> 

-      <property name="PACKAGE" value="MdePkg" /> 

-    </ant>

-    <Expand />

+    <GenBuild type="build">

+      <property name="ARCH" value="${ARCH}"/>

+      <property name="MODULE_GUID" value="27d67720-ea68-48ae-93da-a3a074c90e30"/>

+      <property name="MODULE_VERSION" value=""/>

+      <property name="PLATFORM" value="${PLATFORM}"/>

+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+      <property name="PACKAGE_VERSION" value=""/>

+    </GenBuild>

+    <GenBuild type="build">

+      <property name="ARCH" value="${ARCH}"/>

+      <property name="MODULE_GUID" value="fd44e603-002a-4b29-9f5f-529e815b6165"/>

+      <property name="MODULE_VERSION" value=""/>

+      <property name="PLATFORM" value="${PLATFORM}"/>

+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+      <property name="PACKAGE_VERSION" value=""/>

+    </GenBuild>

+    <GenBuild type="build">

+      <property name="ARCH" value="${ARCH}"/>

+      <property name="MODULE_GUID" value="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3"/>

+      <property name="MODULE_VERSION" value=""/>

+      <property name="PLATFORM" value="${PLATFORM}"/>

+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+      <property name="PACKAGE_VERSION" value=""/>

+    </GenBuild>

+    <GenBuild type="build">

+      <property name="ARCH" value="${ARCH}"/>

+      <property name="MODULE_GUID" value="556f5d10-7309-4af4-b80a-8196bd60946f"/>

+      <property name="MODULE_VERSION" value=""/>

+      <property name="PLATFORM" value="${PLATFORM}"/>

+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+      <property name="PACKAGE_VERSION" value=""/>

+    </GenBuild>

+    <GenBuild type="build">

+      <property name="ARCH" value="${ARCH}"/>

+      <property name="MODULE_GUID" value="55c61087-7367-4546-bc32-4937c5e6aff3"/>

+      <property name="MODULE_VERSION" value=""/>

+      <property name="PLATFORM" value="${PLATFORM}"/>

+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+      <property name="PACKAGE_VERSION" value=""/>

+    </GenBuild>

+    <GenBuild type="build">

+      <property name="ARCH" value="${ARCH}"/>

+      <property name="MODULE_GUID" value="9ba1d976-0624-41a3-8650-28165e8d9ae8"/>

+      <property name="MODULE_VERSION" value=""/>

+      <property name="PLATFORM" value="${PLATFORM}"/>

+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+      <property name="PACKAGE_VERSION" value=""/>

+    </GenBuild>

   </target>

   <target name="sourcefiles">

-      <Build_AUTOGEN FILENAME="AutoGen" FILEPATH=".">

+      <Build_AUTOGEN FILEEXT="c" FILENAME="AutoGen" FILEPATH=".">

          <EXTRA.INC>

+            <includepath path="${WORKSPACE_DIR}"/>

+            <includepath path="${MODULE_DIR}"/>

+            <includepath path="${MODULE_DIR}\${ARCH}"/>

             <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>

             <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>

             <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>

@@ -80,8 +88,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${DEST_DIR_DEBUG}"/>

          </EXTRA.INC>

        </Build_AUTOGEN>

-      <Build_C_Code FILENAME="FwVol" FILEPATH=".">

+       <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/AutoGen.obj" />

+      <Build_CCode FILEEXT="c" FILENAME="FwVol" FILEPATH=".">

          <EXTRA.INC>

+            <includepath path="${WORKSPACE_DIR}"/>

+            <includepath path="${MODULE_DIR}"/>

+            <includepath path="${MODULE_DIR}\${ARCH}"/>

             <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>

             <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>

             <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>

@@ -90,9 +102,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>

             <includepath path="${DEST_DIR_DEBUG}"/>

          </EXTRA.INC>

-      </Build_C_Code>

-      <Build_C_Code FILENAME="WinNtThunk" FILEPATH=".">

+      </Build_CCode>

+      <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/FwVol.obj" />

+      <Build_CCode FILEEXT="c" FILENAME="WinNtThunk" FILEPATH=".">

          <EXTRA.INC>

+            <includepath path="${WORKSPACE_DIR}"/>

+            <includepath path="${MODULE_DIR}"/>

+            <includepath path="${MODULE_DIR}\${ARCH}"/>

             <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>

             <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>

             <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>

@@ -101,9 +117,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>

             <includepath path="${DEST_DIR_DEBUG}"/>

          </EXTRA.INC>

-      </Build_C_Code>

-      <Build_C_Code FILENAME="SecMain" FILEPATH=".">

+      </Build_CCode>

+      <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/WinNtThunk.obj" />

+      <Build_CCode FILEEXT="c" FILENAME="SecMain" FILEPATH=".">

          <EXTRA.INC>

+            <includepath path="${WORKSPACE_DIR}"/>

+            <includepath path="${MODULE_DIR}"/>

+            <includepath path="${MODULE_DIR}\${ARCH}"/>

             <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>

             <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>

             <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>

@@ -112,12 +132,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>

             <includepath path="${DEST_DIR_DEBUG}"/>

          </EXTRA.INC>

-      </Build_C_Code>

+      </Build_CCode>

+      <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/SecMain.obj" />

     </target>

     <target name="sections" />

     <target name="output" >

-      <echo message="##Entering Output!" />

-      

       <OnDependency>

         <sourcefiles>

           <file list="${OBJECTS}"/>

@@ -128,10 +147,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>

         

         <sequential>

-          <shellscript shell="cmd.exe" tmpsuffix=".cmd">

+          <shellscript shell="cmd.exe" tmpsuffix=".cmd" >

             <arg line="/c"/>

             <arg line="call"/>

-            "${LINK}" /LIBPATH:"${env.MSVCDir}\Lib" /LIBPATH:"${env.MSVCDir}\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MsvcRt.lib Gdi32.lib User32.lib Winmm.lib ${OBJECTS} ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb

+            "${DLINK}" /LIBPATH:"${env.MSVCDir}\Lib" /LIBPATH:"${env.MSVCDir}\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MsvcRt.lib Gdi32.lib User32.lib Winmm.lib ${OBJECTS} ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb

           </shellscript>

         </sequential>

       </OnDependency>