tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove USER_DEFINED in IncludePkgHeader in spd files as it does not make sense to specify package include header file for a custom build type module. Package creator has no a priori knowledge about what header file will be needed by the USER_DEFINED module customers created in dependent package. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2316 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12 2007-01-25 10:25:16 +00:00
parent fb5a3ed8c7
commit febc643362
7 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EdkModulePkg/EdkModulePkg.spd
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SpdHeader>
<PackageName>EdkModulePkg</PackageName>
@ -446,7 +446,6 @@
<IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/EdkDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/EdkDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="UEFI_DRIVER">Include/EdkDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="USER_DEFINED">Include/EdkPeim.h</IncludePkgHeader>
</PackageHeaders>
<GuidDeclarations>
<Entry Name="GenericPlatformTokenSpace">

3
EdkNt32Pkg/EdkNt32Pkg.spd
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2006, Intel Corporation
All rights reserved. This program and the accompanying materials
@ -128,7 +128,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="UEFI_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="USER_DEFINED">Include/WinNtPeim.h</IncludePkgHeader>
</PackageHeaders>
<GuidDeclarations>
<Entry Name="EdkNt32PkgTokenSpace">

2
EdkNt32Pkg/Sec/SecMain.msa
View File

@ -2,7 +2,7 @@
<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
<MsaHeader>
<ModuleName>SecMain</ModuleName>
<ModuleType>USER_DEFINED</ModuleType>
<ModuleType>SEC</ModuleType>
<GuidValue>4b837b03-6587-4d19-b82b-edfad836c0a0</GuidValue>
<Version>1.0</Version>
<Abstract>Entry Point of NT32 Emulator</Abstract>

3
EdkUnixPkg/EdkUnixPkg.spd
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2006, Intel Corporation
All rights reserved. This program and the accompanying materials
@ -130,7 +130,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/UnixDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/UnixDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="UEFI_DRIVER">Include/UnixDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="USER_DEFINED">Include/UnixPeim.h</IncludePkgHeader>
</PackageHeaders>
<GuidDeclarations>
<Entry Name="EdkUnixPkgTokenSpace">

4
EdkUnixPkg/Sec/SecMain.msa
View File

@ -2,7 +2,7 @@
<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
<MsaHeader>
<ModuleName>SecMain</ModuleName>
<ModuleType>USER_DEFINED</ModuleType>
<ModuleType>SEC</ModuleType>
<GuidValue>f43be88c-8985-11db-8f78-0040d02b1835</GuidValue>
<Version>1.0</Version>
<Abstract>Entry Point of Unix Emulator</Abstract>
@ -110,4 +110,4 @@
0x20: Boot in reovery mode.</HelpText>
</PcdEntry>
</PcdCoded>
</ModuleSurfaceArea>
</ModuleSurfaceArea>

3
MdePkg/MdePkg.spd
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SpdHeader>
<PackageName>MdePkg</PackageName>
@ -1198,7 +1198,6 @@
<IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/Dxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="UEFI_DRIVER">Include/Uefi.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="UEFI_APPLICATION">Include/Uefi.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="USER_DEFINED">Include/Peim.h</IncludePkgHeader>
</PackageHeaders>
<GuidDeclarations>
<Entry Name="MdePkgTokenSpace">

34
Tools/Conf/BuildMacro.xml
View File

@ -930,7 +930,41 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</OnDependency>
</sequential>
</macrodef>
<!--
Build ACPI Bin File
-->
<macrodef name="Build_ACPIBIN">
<attribute name="FILEPATH"/>
<attribute name="FILENAME"/>
<attribute name="FILEEXT" default="bin"/>
<element name="EXTRA.INC" optional="yes"/>
<element name="EXTRA.ARG" optional="yes"/>
<sequential>
<mkdir dir="${DEST_DIR_OUTPUT}"/>
<OnDependency>
<sourcefiles>
<file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
</sourcefiles>
<targetfiles>
<file name="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"/>
</targetfiles>
<sequential>
<copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" tofile="${DEST_DIR_OUTPUT}/@{FILENAME}.acpi" />
<exec executable="attrib">
<arg line="-r ${DEST_DIR_OUTPUT}/@{FILENAME}.acpi"/>
</exec>
<EFI_SECTION_RAW FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="acpi"/>
</sequential>
</OnDependency>
</sequential>
</macrodef>
<!--
DUMMY - for skipping the source file which should not be built
-->