Sync EDKII BaseTools to BaseTools project r1903.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10123 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
## @file
|
||||
# Trim files preprocessed by compiler
|
||||
#
|
||||
# Copyright (c) 2007, Intel Corporation
|
||||
# Copyright (c) 2007 - 2010, 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
|
||||
@ -28,7 +28,7 @@ import Common.EdkLogger as EdkLogger
|
||||
# Version and Copyright
|
||||
__version_number__ = "0.10"
|
||||
__version__ = "%prog Version " + __version_number__
|
||||
__copyright__ = "Copyright (c) 2007-2008, Intel Corporation. All rights reserved."
|
||||
__copyright__ = "Copyright (c) 2007-2010, Intel Corporation. All rights reserved."
|
||||
|
||||
## Regular expression for matching Line Control directive like "#line xxx"
|
||||
gLineControlDirective = re.compile('^\s*#(?:line)?\s+([0-9]+)\s+"*([^"]*)"')
|
||||
@ -81,6 +81,21 @@ gImportCodePatterns = [
|
||||
'#include <FvLoadFile.h>'
|
||||
],
|
||||
|
||||
[
|
||||
re.compile('#include\s+EFI_GUID_DEFINITION\s*\(FirmwareFileSystem\)', re.MULTILINE),
|
||||
'#include EFI_GUID_DEFINITION (FirmwareFileSystem)\n#include EFI_GUID_DEFINITION (FirmwareFileSystem2)'
|
||||
],
|
||||
|
||||
[
|
||||
re.compile('gEfiFirmwareFileSystemGuid', re.MULTILINE),
|
||||
'gEfiFirmwareFileSystem2Guid'
|
||||
],
|
||||
|
||||
[
|
||||
re.compile('EFI_FVH_REVISION', re.MULTILINE),
|
||||
'EFI_FVH_PI_REVISION'
|
||||
],
|
||||
|
||||
[
|
||||
re.compile("(\s*)\S*CreateEvent\s*\([\s\n]*EFI_EVENT_SIGNAL_READY_TO_BOOT[^,]*,((?:[^;]+\n)+)(\s*\));", re.MULTILINE),
|
||||
'\\1EfiCreateEventReadyToBoot (\\2\\3;'
|
||||
@ -504,7 +519,7 @@ def Main():
|
||||
"\nTrim",
|
||||
CODE_ERROR,
|
||||
"Unknown fatal error when trimming [%s]" % InputFile,
|
||||
ExtraData="\n(Please send email to dev@buildtools.tianocore.org for help, attaching following call stack trace!)\n",
|
||||
ExtraData="\n(Please send email to edk2-buildtools-devel@lists.sourceforge.net for help, attaching following call stack trace!)\n",
|
||||
RaiseError=False
|
||||
)
|
||||
EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())
|
||||
|
Reference in New Issue
Block a user