Menu
▾
▴
edk2-buildtools-commits — EDK II Build Tools Source changes
You can subscribe to this list here.
| 2010 |
Jan
(18) |
Feb
(75) |
Mar
(40) |
Apr
(18) |
May
(12) |
Jun
(13) |
Jul
(17) |
Aug
(25) |
Sep
(31) |
Oct
(16) |
Nov
(20) |
Dec
(13) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2011 |
Jan
(5) |
Feb
(7) |
Mar
(6) |
Apr
(21) |
May
(12) |
Jun
(35) |
Jul
(29) |
Aug
(56) |
Sep
(64) |
Oct
(43) |
Nov
(60) |
Dec
(26) |
| 2012 |
Jan
(6) |
Feb
(12) |
Mar
(17) |
Apr
(10) |
May
(11) |
Jun
(13) |
Jul
(6) |
Aug
(2) |
Sep
(3) |
Oct
(9) |
Nov
(1) |
Dec
(2) |
| 2013 |
Jan
(5) |
Feb
(5) |
Mar
(1) |
Apr
(3) |
May
(3) |
Jun
(3) |
Jul
(8) |
Aug
(7) |
Sep
(2) |
Oct
(4) |
Nov
(14) |
Dec
(10) |
| 2014 |
Jan
(22) |
Feb
(7) |
Mar
(3) |
Apr
(4) |
May
(1) |
Jun
(6) |
Jul
(4) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: <xf...@us...> - 2012-05-29 08:21:40
|
Revision: 2528
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2528&view=rev
Author: xfzyr
Date: 2012-05-29 08:21:34 +0000 (Tue, 29 May 2012)
Log Message:
-----------
Add the check of not allow Dynamic or DynamicEx PCD used in FDF file.
Signed-off-by: Yurui Zeng <yur...@in...>
Reviewed-by: Liu, Yingke D <yin...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
Modified: trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2012-05-28 02:56:13 UTC (rev 2527)
+++ trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2012-05-29 08:21:34 UTC (rev 2528)
@@ -293,11 +293,13 @@
Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
DecPcds = {}
+ DecPcdsKey = set()
PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)
Pkgs = PGen.PackageList
for Pkg in Pkgs:
for Pcd in Pkg.Pcds:
DecPcds[Pcd[0], Pcd[1]] = Pkg.Pcds[Pcd]
+ DecPcdsKey.add((Pcd[0], Pcd[1], Pcd[2]))
Platform.IsPlatformPcdDeclared(DecPcds)
Platform.SkuName = self.SkuId
@@ -310,6 +312,20 @@
File = self.FdfProfile.PcdFileLineDict[Name, Guid][0],
Line = self.FdfProfile.PcdFileLineDict[Name, Guid][1]
)
+ else:
+ # Check whether Dynamic or DynamicEx PCD used in FDF file. If used, build break and give a error message.
+ if (Name, Guid, TAB_PCDS_FIXED_AT_BUILD) in DecPcdsKey \
+ or (Name, Guid, TAB_PCDS_PATCHABLE_IN_MODULE) in DecPcdsKey \
+ or (Name, Guid, TAB_PCDS_FEATURE_FLAG) in DecPcdsKey:
+ continue
+ elif (Name, Guid, TAB_PCDS_DYNAMIC) in DecPcdsKey or (Name, Guid, TAB_PCDS_DYNAMIC_EX) in DecPcdsKey:
+ EdkLogger.error(
+ 'build',
+ PARSER_ERROR,
+ "Using Dynamic or DynamicEx type of PCD [%s.%s] in FDF file is not allowed." % (Guid, Name),
+ File = self.FdfProfile.PcdFileLineDict[Name, Guid][0],
+ Line = self.FdfProfile.PcdFileLineDict[Name, Guid][1]
+ )
Platform.AddPcd(Name, Guid, PcdSet[Name, Guid])
Pa = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2012-05-28 02:56:20
|
Revision: 2527
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2527&view=rev
Author: xfzyr
Date: 2012-05-28 02:56:13 +0000 (Mon, 28 May 2012)
Log Message:
-----------
Corrected the error message when encounterd invalid PCD type and ReadMe file.
Signed-off-by: Yurui Zeng <yur...@in...>
Reviewed-by: Jikui, Su <jik...@in...>
Modified Paths:
--------------
trunk/BaseTools/ReadMe.txt
trunk/BaseTools/Source/Python/Common/DataType.py
trunk/BaseTools/Source/Python/Common/Misc.py
Modified: trunk/BaseTools/ReadMe.txt
===================================================================
--- trunk/BaseTools/ReadMe.txt 2012-05-28 02:36:13 UTC (rev 2526)
+++ trunk/BaseTools/ReadMe.txt 2012-05-28 02:56:13 UTC (rev 2527)
@@ -33,7 +33,7 @@
On Ubuntu, the following command should install all the necessary build
packages to build all the C BaseTools:
- sudo apt-get install build-essentials uuid-dev
+ sudo apt-get install build-essential uuid-dev
=== Python sqlite3 module ===
On Windows, the cx_freeze will not copy the sqlite3.dll to the frozen
Modified: trunk/BaseTools/Source/Python/Common/DataType.py
===================================================================
--- trunk/BaseTools/Source/Python/Common/DataType.py 2012-05-28 02:36:13 UTC (rev 2526)
+++ trunk/BaseTools/Source/Python/Common/DataType.py 2012-05-28 02:56:13 UTC (rev 2527)
@@ -18,6 +18,7 @@
TAB_COMMENT_EDK_END = '*/'
TAB_COMMENT_EDK_SPLIT = '//'
TAB_COMMENT_SPLIT = '#'
+TAB_SPECIAL_COMMENT = '##'
TAB_EQUAL_SPLIT = '='
TAB_VALUE_SPLIT = '|'
TAB_COMMA_SPLIT = ','
@@ -30,6 +31,10 @@
TAB_SLASH = '\\'
TAB_BACK_SLASH = '/'
TAB_LINE_BREAK = '\n'
+TAB_UINT8 = 'UINT8'
+TAB_UINT16 = 'UINT16'
+TAB_UINT32 = 'UINT32'
+TAB_UINT64 = 'UINT64'
TAB_EDK_SOURCE = '$(EDK_SOURCE)'
TAB_EFI_SOURCE = '$(EFI_SOURCE)'
@@ -328,6 +333,25 @@
TAB_INF_PATCH_PCD = 'PatchPcd'
TAB_INF_PCD = 'Pcd'
TAB_INF_PCD_EX = 'PcdEx'
+TAB_INF_USAGE_PRO = 'PRODUCES'
+TAB_INF_USAGE_SOME_PRO = 'SOMETIMES_PRODUCES'
+TAB_INF_USAGE_CON = 'CONSUMES'
+TAB_INF_USAGE_SOME_CON = 'SOMETIMES_CONSUMES'
+TAB_INF_USAGE_NOTIFY = 'NOTIFY'
+TAB_INF_USAGE_TO_START = 'TO_START'
+TAB_INF_USAGE_BY_START = 'BY_START'
+TAB_INF_GUIDTYPE_EVENT = 'Event'
+TAB_INF_GUIDTYPE_FILE = 'File'
+TAB_INF_GUIDTYPE_FV = 'FV'
+TAB_INF_GUIDTYPE_GUID = 'GUID'
+TAB_INF_GUIDTYPE_HII = 'HII'
+TAB_INF_GUIDTYPE_HOB = 'HOB'
+TAB_INF_GUIDTYPE_ST = 'SystemTable'
+TAB_INF_GUIDTYPE_TSG = 'TokenSpaceGuid'
+TAB_INF_GUIDTYPE_VAR = 'Variable'
+TAB_INF_GUIDTYPE_PROTOCOL = 'PROTOCOL'
+TAB_INF_GUIDTYPE_PPI = 'PPI'
+TAB_INF_GUIDTYPE_UNDEFINED = 'UNDEFINED'
#
# Dec Definitions
Modified: trunk/BaseTools/Source/Python/Common/Misc.py
===================================================================
--- trunk/BaseTools/Source/Python/Common/Misc.py 2012-05-28 02:36:13 UTC (rev 2526)
+++ trunk/BaseTools/Source/Python/Common/Misc.py 2012-05-28 02:56:13 UTC (rev 2527)
@@ -1278,13 +1278,14 @@
if Value not in ['TRUE', 'True', 'true', '0x1', '0x01', '1', 'FALSE', 'False', 'false', '0x0', '0x00', '0']:
return False, "Invalid value [%s] of type [%s]; must be one of TRUE, True, true, 0x1, 0x01, 1"\
", FALSE, False, false, 0x0, 0x00, 0" % (Value, Type)
- elif type(Value) == type(""):
+ elif Type in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64]:
try:
Value = long(Value, 0)
except:
return False, "Invalid value [%s] of type [%s];"\
- " must be a hexadecimal, decimal or octal in C language format."\
- % (Value, Type)
+ " must be a hexadecimal, decimal or octal in C language format." % (Value, Type)
+ else:
+ return False, "Invalid type [%s]; must be one of VOID*, BOOLEAN, UINT8, UINT16, UINT32, UINT64." % (Type)
return True, ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2012-05-28 02:36:19
|
Revision: 2526
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2526&view=rev
Author: xfzyr
Date: 2012-05-28 02:36:13 +0000 (Mon, 28 May 2012)
Log Message:
-----------
Add the format check for Pcd token space guid and Pcd CName.
Signed-off-by: Yurui Zeng <yur...@in...>
Reviewed-by: Boyer, Donna J <don...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/Python/Workspace/MetaFileParser.py
Modified: trunk/BaseTools/Source/Python/Workspace/MetaFileParser.py
===================================================================
--- trunk/BaseTools/Source/Python/Workspace/MetaFileParser.py 2012-05-25 06:20:53 UTC (rev 2525)
+++ trunk/BaseTools/Source/Python/Workspace/MetaFileParser.py 2012-05-28 02:36:13 UTC (rev 2526)
@@ -1709,12 +1709,25 @@
def _PcdParser(self):
TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT, 1)
self._ValueList[0:1] = GetSplitValueList(TokenList[0], TAB_SPLIT)
+ ValueRe = re.compile(r'^[a-zA-Z_][a-zA-Z0-9_]*')
# check PCD information
if self._ValueList[0] == '' or self._ValueList[1] == '':
EdkLogger.error('Parser', FORMAT_INVALID, "No token space GUID or PCD name specified",
ExtraData=self._CurrentLine + \
" (<TokenSpaceGuidCName>.<PcdCName>|<DefaultValue>|<DatumType>|<Token>)",
File=self.MetaFile, Line=self._LineIndex+1)
+ # check format of token space GUID CName
+ if not ValueRe.match(self._ValueList[0]):
+ EdkLogger.error('Parser', FORMAT_INVALID, "The format of the token space GUID CName is invalid. The correct format is '(a-zA-Z_)[a-zA-Z0-9_]*'",
+ ExtraData=self._CurrentLine + \
+ " (<TokenSpaceGuidCName>.<PcdCName>|<DefaultValue>|<DatumType>|<Token>)",
+ File=self.MetaFile, Line=self._LineIndex+1)
+ # check format of PCD CName
+ if not ValueRe.match(self._ValueList[1]):
+ EdkLogger.error('Parser', FORMAT_INVALID, "The format of the PCD CName is invalid. The correct format is '(a-zA-Z_)[a-zA-Z0-9_]*'",
+ ExtraData=self._CurrentLine + \
+ " (<TokenSpaceGuidCName>.<PcdCName>|<DefaultValue>|<DatumType>|<Token>)",
+ File=self.MetaFile, Line=self._LineIndex+1)
# check PCD datum information
if len(TokenList) < 2 or TokenList[1] == '':
EdkLogger.error('Parser', FORMAT_INVALID, "No PCD Datum information given",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2012-05-25 06:20:59
|
Revision: 2525
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2525&view=rev
Author: xfzyr
Date: 2012-05-25 06:20:53 +0000 (Fri, 25 May 2012)
Log Message:
-----------
Support to use "#" in the string content as PCD value.
Signed-off-by: Yurui Zeng <yur...@in...>
Reviewed-by: Liu, Yingke D <yin...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/Python/Common/String.py
Modified: trunk/BaseTools/Source/Python/Common/String.py
===================================================================
--- trunk/BaseTools/Source/Python/Common/String.py 2012-05-23 01:49:31 UTC (rev 2524)
+++ trunk/BaseTools/Source/Python/Common/String.py 2012-05-25 06:20:53 UTC (rev 2525)
@@ -368,7 +368,7 @@
## CleanString2
#
-# Split comments in a string
+# Split statement with comments in a string
# Remove spaces
#
# @param Line: The string to be cleaned
@@ -387,15 +387,21 @@
if AllowCppStyleComment:
Line = Line.replace(DataType.TAB_COMMENT_EDK_SPLIT, CommentCharacter)
#
- # separate comments and statements
+ # separate comments and statements, but we should escape comment character in string
#
- LineParts = Line.split(CommentCharacter, 1);
- #
- # remove whitespace again
- #
- Line = LineParts[0].strip();
- if len(LineParts) > 1:
- Comment = LineParts[1].strip()
+ InString = False
+ CommentInString = False
+ Comment = ''
+ for Index in range(0, len(Line)):
+ if Line[Index] == '"':
+ InString = not InString
+ elif Line[Index] == CommentCharacter and InString:
+ CommentInString = True
+ elif Line[Index] == CommentCharacter and not InString:
+ Comment = Line[Index:].strip()
+ Line = Line[0:Index].strip()
+ break
+ if Comment:
# Remove prefixed and trailing comment characters
Start = 0
End = len(Comment)
@@ -405,8 +411,6 @@
End -= 1
Comment = Comment[Start:End]
Comment = Comment.strip()
- else:
- Comment = ''
return Line, Comment
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-05-23 01:49:37
|
Revision: 2524
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2524&view=rev
Author: andrewfish
Date: 2012-05-23 01:49:31 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Fix EmulatorPkg and UnixPkg Mac OS X app build with Xcode 4.3.2.
Signed-off-by: andrewfish
Modified Paths:
--------------
trunk/BaseTools/Conf/tools_def.template
Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template 2012-05-22 02:27:58 UTC (rev 2523)
+++ trunk/BaseTools/Conf/tools_def.template 2012-05-23 01:49:31 UTC (rev 2524)
@@ -4506,12 +4506,12 @@
# X64 definitions - still a work in progress. This tool chain does not produce
# the correct ABI, it is just used to compile the code....
##################
-*_XCODE32_X64_CC_PATH = gcc-4.2
+*_XCODE32_X64_CC_PATH = gcc
*_XCODE32_X64_SLINK_PATH = libtool
*_XCODE32_X64_DLINK_PATH = ld
*_XCODE32_X64_ASM_PATH = as
-*_XCODE32_X64_PP_PATH = gcc-4.2
-*_XCODE32_X64_VFRPP_PATH = gcc-4.2
+*_XCODE32_X64_PP_PATH = gcc
+*_XCODE32_X64_VFRPP_PATH = gcc
*_XCODE32_X64_ASL_PATH = iasl
*_XCODE32_X64_ASLCC_PATH = gcc
*_XCODE32_X64_ASLPP_PATH = gcc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2012-05-22 02:28:04
|
Revision: 2523
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2523&view=rev
Author: yingke
Date: 2012-05-22 02:27:58 +0000 (Tue, 22 May 2012)
Log Message:
-----------
1. Support EXTRA_HEADER_SIZE keyword in FDF file.
2. For GUID section type, if -g is not specified, handle it as CRC32 section, otherwise handle it as general GUID section even if the specified GUID is same as CRC32 GUID.
Reviewed-by: Gao Liming <lim...@in...>
Signed-off-by: Liu Yingke <yin...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/C/GenSec/GenSec.c
trunk/BaseTools/Source/Python/CommonDataClass/FdfClass.py
trunk/BaseTools/Source/Python/GenFds/FdfParser.py
trunk/BaseTools/Source/Python/GenFds/GuidSection.py
Modified: trunk/BaseTools/Source/C/GenSec/GenSec.c
===================================================================
--- trunk/BaseTools/Source/C/GenSec/GenSec.c 2012-05-22 01:27:10 UTC (rev 2522)
+++ trunk/BaseTools/Source/C/GenSec/GenSec.c 2012-05-22 02:27:58 UTC (rev 2523)
@@ -785,7 +785,7 @@
Offset = 0;
FileBuffer = NULL;
- if (CompareGuid (VendorGuid, &mEfiCrc32SectionGuid) == 0) {
+ if (CompareGuid (VendorGuid, &mZeroGuid) == 0) {
Offset = sizeof (CRC32_SECTION_HEADER);
} else {
Offset = sizeof (EFI_GUID_DEFINED_SECTION);
@@ -837,7 +837,7 @@
//
// Now data is in FileBuffer + Offset
//
- if (CompareGuid (VendorGuid, &mEfiCrc32SectionGuid) == 0) {
+ if (CompareGuid (VendorGuid, &mZeroGuid) == 0) {
//
// Default Guid section is CRC32.
//
@@ -1222,10 +1222,6 @@
VerboseMsg ("Compress method is %s", mCompressionTypeName [SectCompSubType]);
} else if (stricmp (SectionName, mSectionTypeName[EFI_SECTION_GUID_DEFINED]) == 0) {
SectType = EFI_SECTION_GUID_DEFINED;
-
- if (CompareGuid (&VendorGuid, &mZeroGuid) == 0) {
- memcpy (&VendorGuid, &mEfiCrc32SectionGuid, sizeof (EFI_GUID));
- }
if ((SectGuidAttribute & EFI_GUIDED_SECTION_NONE) != 0) {
//
@@ -1349,7 +1345,7 @@
break;
case EFI_SECTION_GUID_DEFINED:
- if (InputFileAlign != NULL && (CompareGuid (&VendorGuid, &mEfiCrc32SectionGuid) != 0)) {
+ if (InputFileAlign != NULL && (CompareGuid (&VendorGuid, &mZeroGuid) != 0)) {
//
// Only process alignment for the default known CRC32 guided section.
// For the unknown guided section, the alignment is processed when the dummy all section (EFI_SECTION_ALL) is generated.
Modified: trunk/BaseTools/Source/Python/CommonDataClass/FdfClass.py
===================================================================
--- trunk/BaseTools/Source/Python/CommonDataClass/FdfClass.py 2012-05-22 01:27:10 UTC (rev 2522)
+++ trunk/BaseTools/Source/Python/CommonDataClass/FdfClass.py 2012-05-22 02:27:58 UTC (rev 2523)
@@ -249,6 +249,7 @@
self.SectionType = None
self.ProcessRequired = False
self.AuthStatusValid = False
+ self.ExtraHeaderSize = -1
self.FvAddr = []
self.FvParentAddr = None
self.IncludeFvSection = False
Modified: trunk/BaseTools/Source/Python/GenFds/FdfParser.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/FdfParser.py 2012-05-22 01:27:10 UTC (rev 2522)
+++ trunk/BaseTools/Source/Python/GenFds/FdfParser.py 2012-05-22 02:27:58 UTC (rev 2523)
@@ -2867,6 +2867,7 @@
GuidSectionObj.SectionType = "GUIDED"
GuidSectionObj.ProcessRequired = AttribDict["PROCESSING_REQUIRED"]
GuidSectionObj.AuthStatusValid = AttribDict["AUTH_STATUS_VALID"]
+ GuidSectionObj.ExtraHeaderSize = AttribDict["EXTRA_HEADER_SIZE"]
# Recursive sections...
while True:
IsLeafSection = self.__GetLeafSection(GuidSectionObj)
@@ -2894,26 +2895,29 @@
AttribDict = {}
AttribDict["PROCESSING_REQUIRED"] = "NONE"
AttribDict["AUTH_STATUS_VALID"] = "NONE"
- if self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID"):
+ AttribDict["EXTRA_HEADER_SIZE"] = -1
+ while self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID") \
+ or self.__IsKeyword("EXTRA_HEADER_SIZE"):
AttribKey = self.__Token
if not self.__IsToken("="):
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)
- if not self.__GetNextToken() or self.__Token.upper() not in ("TRUE", "FALSE", "1", "0"):
+ if not self.__GetNextToken():
+ raise Warning("expected TRUE(1)/FALSE(0)/Number", self.FileName, self.CurrentLineNumber)
+ elif AttribKey == "EXTRA_HEADER_SIZE":
+ Base = 10
+ if self.__Token[0:2].upper() == "0X":
+ Base = 16
+ try:
+ AttribDict[AttribKey] = int(self.__Token, Base)
+ continue
+ except ValueError:
+ raise Warning("expected Number", self.FileName, self.CurrentLineNumber)
+ elif self.__Token.upper() not in ("TRUE", "FALSE", "1", "0"):
raise Warning("expected TRUE/FALSE (1/0)", self.FileName, self.CurrentLineNumber)
AttribDict[AttribKey] = self.__Token
- if self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID"):
- AttribKey = self.__Token
-
- if not self.__IsToken("="):
- raise Warning("expected '='")
-
- if not self.__GetNextToken() or self.__Token.upper() not in ("TRUE", "FALSE", "1", "0"):
- raise Warning("expected TRUE/FALSE (1/0)", self.FileName, self.CurrentLineNumber)
- AttribDict[AttribKey] = self.__Token
-
return AttribDict
## __GetEncapsulationSec() method
@@ -3712,6 +3716,7 @@
GuidSectionObj.SectionType = "GUIDED"
GuidSectionObj.ProcessRequired = AttribDict["PROCESSING_REQUIRED"]
GuidSectionObj.AuthStatusValid = AttribDict["AUTH_STATUS_VALID"]
+ GuidSectionObj.ExtraHeaderSize = AttribDict["EXTRA_HEADER_SIZE"]
# Efi sections...
while True:
Modified: trunk/BaseTools/Source/Python/GenFds/GuidSection.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/GuidSection.py 2012-05-22 01:27:10 UTC (rev 2522)
+++ trunk/BaseTools/Source/Python/GenFds/GuidSection.py 2012-05-22 02:27:58 UTC (rev 2523)
@@ -193,7 +193,10 @@
Attribute = []
HeaderLength = None
- if self.ProcessRequired == "NONE":
+ if self.ExtraHeaderSize != -1:
+ HeaderLength = str(self.ExtraHeaderSize)
+
+ if self.ProcessRequired == "NONE" and HeaderLength == None:
if TempFileSize > InputFileSize and TempFileSize % 4 == 0:
FileHandleIn.seek(0)
BufferIn = FileHandleIn.read()
@@ -218,7 +221,7 @@
if self.ProcessRequired in ("TRUE", "1"):
if 'PROCESSING_REQUIRED' not in Attribute:
Attribute.append('PROCESSING_REQUIRED')
- HeaderLength = None
+
if self.AuthStatusValid in ("TRUE", "1"):
Attribute.append('AUTH_STATUS_VALID')
GenFdsGlobalVariable.GenerateSection(OutputFile, [TempFile], Section.Section.SectionType['GUIDED'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2012-05-22 01:27:17
|
Revision: 2522
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2522&view=rev
Author: xfzyr
Date: 2012-05-22 01:27:10 +0000 (Tue, 22 May 2012)
Log Message:
-----------
Fix a issue of build report Hang in Linux reported from EDKII Community.
Signed-off-by: Liming Gao <lim...@in...>
Reviewed-by: Yurui Zeng <yur...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/Python/build/BuildReport.py
Modified: trunk/BaseTools/Source/Python/build/BuildReport.py
===================================================================
--- trunk/BaseTools/Source/Python/build/BuildReport.py 2012-05-21 08:26:22 UTC (rev 2521)
+++ trunk/BaseTools/Source/Python/build/BuildReport.py 2012-05-22 01:27:10 UTC (rev 2522)
@@ -39,6 +39,7 @@
from Common.DataType import TAB_SPACE_SPLIT
from Common.DataType import TAB_BRG_PCD
from Common.DataType import TAB_BRG_LIBRARY
+from Common.DataType import TAB_BACK_SLASH
## Pattern to extract contents in EDK DXS files
gDxsDependencyPattern = re.compile(r"DEPENDENCY_START(.+)DEPENDENCY_END", re.DOTALL)
@@ -191,11 +192,11 @@
while len(Line.rstrip()) > MaxLength:
LineSpaceIndex = Line.rfind(TAB_SPACE_SPLIT, 0, MaxLength)
LineSlashIndex = Line.rfind(TAB_SLASH, 0, MaxLength)
- LineBreakIndex = MaxLength
- if LineSpaceIndex > LineSlashIndex:
- LineBreakIndex = LineSpaceIndex
- elif LineSlashIndex > LineSpaceIndex:
- LineBreakIndex = LineSlashIndex
+ LineBackSlashIndex = Line.rfind(TAB_BACK_SLASH, 0, MaxLength)
+ if max(LineSpaceIndex, LineSlashIndex, LineBackSlashIndex) > 0:
+ LineBreakIndex = max(LineSpaceIndex, LineSlashIndex, LineBackSlashIndex)
+ else:
+ LineBreakIndex = MaxLength
NewContentList.append(Line[:LineBreakIndex])
Line = Line[LineBreakIndex:]
if Line:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2012-05-21 08:26:31
|
Revision: 2521
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2521&view=rev
Author: yingke
Date: 2012-05-21 08:26:22 +0000 (Mon, 21 May 2012)
Log Message:
-----------
Fix bug to support ?\226?\128?\156!?\226?\128?\157 prefix used as part of an expression in PCD value.
Reviewed-by: Su Jikui <jik...@in...>
Signed-off-by: Liu Yingke <yin...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/Python/Common/Expression.py
Modified: trunk/BaseTools/Source/Python/Common/Expression.py
===================================================================
--- trunk/BaseTools/Source/Python/Common/Expression.py 2012-05-21 08:21:47 UTC (rev 2520)
+++ trunk/BaseTools/Source/Python/Common/Expression.py 2012-05-21 08:26:22 UTC (rev 2521)
@@ -256,9 +256,12 @@
if self.__IsNumberToken():
return self._Expr
- Token = self._GetToken()
- if type(Token) == type('') and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:
- return self._Expr
+ try:
+ Token = self._GetToken()
+ if type(Token) == type('') and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:
+ return self._Expr
+ except BadExpression:
+ pass
self._Idx = 0
self._Token = ''
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2012-05-21 08:21:56
|
Revision: 2520
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2520&view=rev
Author: yingke
Date: 2012-05-21 08:21:47 +0000 (Mon, 21 May 2012)
Log Message:
-----------
Support CARRAY value of VPD PCD starting with upper case ?\226?\128?\1560X?\226?\128?\157.
Reviewed-by: Su Jikui <jik...@in...>
Signed-off-by: Liu Yingke <yin...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/Python/BPDG/GenVpd.py
Modified: trunk/BaseTools/Source/Python/BPDG/GenVpd.py
===================================================================
--- trunk/BaseTools/Source/Python/BPDG/GenVpd.py 2012-05-21 06:07:38 UTC (rev 2519)
+++ trunk/BaseTools/Source/Python/BPDG/GenVpd.py 2012-05-21 08:21:47 UTC (rev 2520)
@@ -226,7 +226,7 @@
for Index in xrange(len(ValueList)):
Value = None
- if ValueList[Index].startswith('0x'):
+ if ValueList[Index].lower().startswith('0x'):
# translate hex value
try:
Value = int(ValueList[Index], 16)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2012-05-21 06:07:44
|
Revision: 2519
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2519&view=rev
Author: yingke
Date: 2012-05-21 06:07:38 +0000 (Mon, 21 May 2012)
Log Message:
-----------
Check the type of same PCD declared in DEC and defined in DSC.
Reviewed-by: Su Jikui <jik...@in...>
Signed-off-by: Liu Yingke <yin...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
Modified: trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2012-04-06 05:39:12 UTC (rev 2518)
+++ trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2012-05-21 06:07:38 UTC (rev 2519)
@@ -292,12 +292,12 @@
for Arch in self.ArchList:
Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
- DecPcds = set()
+ DecPcds = {}
PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)
Pkgs = PGen.PackageList
for Pkg in Pkgs:
- for Pcd in Pkg.Pcds.keys():
- DecPcds.add((Pcd[0], Pcd[1]))
+ for Pcd in Pkg.Pcds:
+ DecPcds[Pcd[0], Pcd[1]] = Pkg.Pcds[Pcd]
Platform.IsPlatformPcdDeclared(DecPcds)
Platform.SkuName = self.SkuId
Modified: trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
===================================================================
--- trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py 2012-04-06 05:39:12 UTC (rev 2518)
+++ trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py 2012-05-21 06:07:38 UTC (rev 2519)
@@ -852,6 +852,21 @@
EdkLogger.error('build', PARSER_ERROR,
"Pcd (%s.%s) defined in DSC is not declared in DEC files." % (TokenSpaceGuid, PcdCName),
File=self.MetaFile, Line=Dummy4)
+ PcdValue = ''
+ if PcdType in (MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_VPD):
+ if DecPcds[PcdCName, TokenSpaceGuid].DatumType == "VOID*":
+ PcdValue = AnalyzeVpdPcdData(Setting)[2]
+ else:
+ PcdValue = AnalyzeVpdPcdData(Setting)[1]
+ elif PcdType in (MODEL_PCD_DYNAMIC_HII, MODEL_PCD_DYNAMIC_EX_HII):
+ PcdValue = AnalyzeHiiPcdData(Setting)[3]
+ else:
+ PcdValue = AnalyzePcdData(Setting)[0]
+ if PcdValue:
+ Valid, ErrStr = CheckPcdDatum(DecPcds[PcdCName, TokenSpaceGuid].DatumType, PcdValue)
+ if not Valid:
+ EdkLogger.error('build', FORMAT_INVALID, ErrStr, File=self.MetaFile, Line=Dummy4,
+ ExtraData="%s.%s" % (TokenSpaceGuid, PcdCName))
_Macros = property(_GetMacros)
Arch = property(_GetArch, _SetArch)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lg...@us...> - 2012-04-06 05:39:18
|
Revision: 2518
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2518&view=rev
Author: lgao4
Date: 2012-04-06 05:39:12 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
Add LzmaF86Compress.bat into LzmaCompress source directory. It will be copied to $(SYS_BIN_PATH) in make phase.
Signed-off-by: Liming Gao <lim...@in...>
Reviewed-by: Larry Hauch <lar...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/C/LzmaCompress/Makefile
trunk/BaseTools/Source/C/Makefile
Added Paths:
-----------
trunk/BaseTools/Source/C/LzmaCompress/LzmaF86Compress.bat
Added: trunk/BaseTools/Source/C/LzmaCompress/LzmaF86Compress.bat
===================================================================
--- trunk/BaseTools/Source/C/LzmaCompress/LzmaF86Compress.bat (rev 0)
+++ trunk/BaseTools/Source/C/LzmaCompress/LzmaF86Compress.bat 2012-04-06 05:39:12 UTC (rev 2518)
@@ -0,0 +1,31 @@
+@REM
+@REM This script will exec LzmaCompress tool with --f86 option that enables converter for x86 code.
+@REM
+@REM Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
+@REM This program and the accompanying materials
+@REM are licensed and made available under the terms and conditions of the BSD License
+@REM which accompanies this distribution. The full text of the license may be found at
+@REM http://opensource.org/licenses/bsd-license.php
+@REM
+@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM
+
+@echo off
+@setlocal
+
+:Begin
+if "%1"=="" goto End
+if "%1"=="-e" (
+ set FLAG=--f86
+)
+if "%1"=="-d" (
+ set FLAG=--f86
+)
+set ARGS=%ARGS% %1
+shift
+goto Begin
+
+:End
+LzmaCompress %ARGS% %FLAG%
+@echo on
Modified: trunk/BaseTools/Source/C/LzmaCompress/Makefile
===================================================================
--- trunk/BaseTools/Source/C/LzmaCompress/Makefile 2012-04-05 08:22:02 UTC (rev 2517)
+++ trunk/BaseTools/Source/C/LzmaCompress/Makefile 2012-04-06 05:39:12 UTC (rev 2518)
@@ -30,3 +30,12 @@
!INCLUDE ..\Makefiles\ms.app
+all: $(BIN_PATH)\LzmaF86Compress.bat
+
+$(BIN_PATH)\LzmaF86Compress.bat: LzmaF86Compress.bat
+ copy LzmaF86Compress.bat $(BIN_PATH)\LzmaF86Compress.bat /Y
+
+cleanall: localCleanall
+
+localCleanall:
+ del /f /q $(BIN_PATH)\LzmaF86Compress.bat > nul
Modified: trunk/BaseTools/Source/C/Makefile
===================================================================
--- trunk/BaseTools/Source/C/Makefile 2012-04-05 08:22:02 UTC (rev 2517)
+++ trunk/BaseTools/Source/C/Makefile 2012-04-06 05:39:12 UTC (rev 2518)
@@ -1,7 +1,7 @@
## @file
# Windows makefile for C tools build.
#
-# Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
# 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
@@ -59,6 +59,7 @@
@echo ######################
@-xcopy $(LIB_PATH)\*.lib $(SYS_LIB_PATH) /I /D /E /F /Y > NUL 2>&1
@-xcopy $(BIN_PATH)\*.exe $(SYS_BIN_PATH) /I /D /E /F /Y > NUL 2>&1
+ @-xcopy $(BIN_PATH)\*.bat $(SYS_BIN_PATH) /I /D /E /F /Y > NUL 2>&1
.PHONY: clean
clean:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2012-04-05 08:22:10
|
Revision: 2517
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2517&view=rev
Author: jsu1
Date: 2012-04-05 08:22:02 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
Added VS2010 support.
Reviewed-by: Liming Gao <lim...@in...>
Signed-off-by: Jikui Su <jik...@in...>
Modified Paths:
--------------
trunk/BaseTools/Conf/tools_def.template
trunk/BaseTools/toolsetup.bat
Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template 2012-04-05 06:57:23 UTC (rev 2516)
+++ trunk/BaseTools/Conf/tools_def.template 2012-04-05 08:22:02 UTC (rev 2517)
@@ -37,6 +37,16 @@
DEFINE VS2008x86_BINX64 = DEF(VS2008x86_BIN)\x86_amd64
DEFINE VS2008x86_BIN64 = DEF(VS2008x86_BIN)\x86_ia64
+DEFINE VS2010_BIN = C:\Program Files\Microsoft Visual Studio 10.0\Vc\bin
+DEFINE VS2010_DLL = C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE;DEF(VS2010_BIN)
+DEFINE VS2010_BINX64 = DEF(VS2010_BIN)\x86_amd64
+DEFINE VS2010_BIN64 = DEF(VS2010_BIN)\x86_ia64
+
+DEFINE VS2010x86_BIN = C:\Program Files (x86)\Microsoft Visual Studio 10.0\Vc\bin
+DEFINE VS2010x86_DLL = C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;DEF(VS2010x86_BIN)
+DEFINE VS2010x86_BINX64 = DEF(VS2010x86_BIN)\x86_amd64
+DEFINE VS2010x86_BIN64 = DEF(VS2010x86_BIN)\x86_ia64
+
DEFINE WINSDK_VERSION = v6.0A
DEFINE WINSDK_BIN = c:\Program Files\Microsoft SDKs\Windows\DEF(WINSDK_VERSION)\bin
DEFINE WINSDKx86_BIN = c:\Program Files (x86)\Microsoft SDKs\Windows\DEF(WINSDK_VERSION)\bin
@@ -225,6 +235,15 @@
# Required to build platforms or ACPI tables:
# Intel(r) ACPI Compiler (iasl.exe) v20101013 from
# http://www.acpica.org/downloads/previous_releases.php
+# VS2010 -win32- Requires:
+# Microsoft Visual Studio 2010 Premium Edition
+# Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
+# Optional:
+# Required to build EBC drivers:
+# Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
+# Required to build platforms or ACPI tables:
+# Intel(r) ACPI Compiler (iasl.exe) v20101013 from
+# http://www.acpica.org/downloads/previous_releases.php
# DDK3790 -win32- Requires:
# Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
# Optional:
@@ -333,6 +352,15 @@
# Required to build platforms or ACPI tables:
# Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
# http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
+# VS2010xASL -win32- Requires:
+# Microsoft Visual Studio 2010 Premium Edition
+# Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
+# Optional:
+# Required to build EBC drivers:
+# Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
+# Required to build platforms or ACPI tables:
+# Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
+# http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
# DDK3790xASL -win32- Requires:
# Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
# Optional:
@@ -390,6 +418,13 @@
# Required to build platforms or ACPI tables:
# Intel(r) ACPI Compiler (iasl.exe) v20101013 from
# http://www.acpica.org/downloads/previous_releases.php
+# VS2010x86 -win64- Requires:
+# Microsoft Visual Studio 2010 (x86) Premium Edition
+# Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
+# Optional:
+# Required to build platforms or ACPI tables:
+# Intel(r) ACPI Compiler (iasl.exe) v20101013 from
+# http://www.acpica.org/downloads/previous_releases.php
# ICCx86 -win64- Requires:
# Intel C Compiler V9.1(x86)
# Dependencies:
@@ -430,6 +465,13 @@
# Required to build platforms or ACPI tables:
# Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
# http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
+# VS2010x86xASL -win64- Requires:
+# Microsoft Visual Studio 2010 (x86) Premium Edition
+# Microsoft Windows Server 2003 Driver Development Kit(Microsoft WINDDK) version 3790.1830
+# Optional:
+# Required to build platforms or ACPI tables:
+# Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from
+# http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
# ICCx86xASL -win64- Requires:
# Intel C Compiler V9.1 (x86)
# Dependencies:
@@ -1728,6 +1770,513 @@
####################################################################################
#
+# Microsoft Visual Studio 2010
+#
+# VS2010 - Microsoft Visual Studio 2010 Premium Edition
+# ASL - Intel ACPI Source Language Compiler
+####################################################################################
+# VS2010 - Microsoft Visual Studio 2010 Premium Edition
+*_VS2010_*_*_FAMILY = MSFT
+
+*_VS2010_*_MAKE_PATH = DEF(VS2010_BIN)\nmake.exe
+*_VS2010_*_MAKE_FLAGS = /nologo
+*_VS2010_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+
+*_VS2010_*_SLINK_FLAGS = /NOLOGO /LTCG
+*_VS2010_*_APP_FLAGS = /nologo /E /TC
+*_VS2010_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
+*_VS2010_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+
+*_VS2010_*_ASM16_PATH = DEF(VS2010_BIN)\ml.exe
+
+##################
+# ASL definitions
+##################
+*_VS2010_*_ASL_PATH = DEF(DEFAULT_WIN_ASL_BIN)
+*_VS2010_*_ASL_FLAGS = DEF(DEFAULT_WIN_ASL_FLAGS)
+*_VS2010_*_ASL_OUTFLAGS = DEF(DEFAULT_WIN_ASL_OUTFLAGS)
+*_VS2010_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)
+*_VS2010_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)
+*_VS2010_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)
+
+##################
+# IA32 definitions
+##################
+*_VS2010_IA32_*_DLL = DEF(VS2010_DLL)
+
+*_VS2010_IA32_MAKE_PATH = DEF(VS2010_BIN)\nmake.exe
+*_VS2010_IA32_CC_PATH = DEF(VS2010_BIN)\cl.exe
+*_VS2010_IA32_VFRPP_PATH = DEF(VS2010_BIN)\cl.exe
+*_VS2010_IA32_SLINK_PATH = DEF(VS2010_BIN)\lib.exe
+*_VS2010_IA32_DLINK_PATH = DEF(VS2010_BIN)\link.exe
+*_VS2010_IA32_APP_PATH = DEF(VS2010_BIN)\cl.exe
+*_VS2010_IA32_PP_PATH = DEF(VS2010_BIN)\cl.exe
+*_VS2010_IA32_ASM_PATH = DEF(VS2010_BIN)\ml.exe
+*_VS2010_IA32_ASLCC_PATH = DEF(VS2010_BIN)\cl.exe
+*_VS2010_IA32_ASLPP_PATH = DEF(VS2010_BIN)\cl.exe
+*_VS2010_IA32_ASLDLINK_PATH = DEF(VS2010_BIN)\link.exe
+
+ *_VS2010_IA32_MAKE_FLAGS = /nologo
+ DEBUG_VS2010_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm
+RELEASE_VS2010_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
+NOOPT_VS2010_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od
+
+ DEBUG_VS2010_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+RELEASE_VS2010_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd
+NOOPT_VS2010_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+
+ DEBUG_VS2010_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2010_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
+NOOPT_VS2010_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+
+##################
+# X64 definitions
+##################
+*_VS2010_X64_*_DLL = DEF(VS2010_DLL)
+
+*_VS2010_X64_CC_PATH = DEF(VS2010_BINX64)\cl.exe
+*_VS2010_X64_PP_PATH = DEF(VS2010_BINX64)\cl.exe
+*_VS2010_X64_APP_PATH = DEF(VS2010_BINX64)\cl.exe
+*_VS2010_X64_VFRPP_PATH = DEF(VS2010_BINX64)\cl.exe
+*_VS2010_X64_ASM_PATH = DEF(VS2010_BINX64)\ml64.exe
+*_VS2010_X64_SLINK_PATH = DEF(VS2010_BINX64)\lib.exe
+*_VS2010_X64_DLINK_PATH = DEF(VS2010_BINX64)\link.exe
+*_VS2010_X64_ASLCC_PATH = DEF(VS2010_BINX64)\cl.exe
+*_VS2010_X64_ASLPP_PATH = DEF(VS2010_BINX64)\cl.exe
+*_VS2010_X64_ASLDLINK_PATH = DEF(VS2010_BINX64)\link.exe
+
+
+ DEBUG_VS2010_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
+RELEASE_VS2010_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
+NOOPT_VS2010_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
+
+ DEBUG_VS2010_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi
+RELEASE_VS2010_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd
+NOOPT_VS2010_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi
+
+ DEBUG_VS2010_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2010_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
+NOOPT_VS2010_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+
+##################
+# IPF definitions
+##################
+*_VS2010_IPF_*_DLL = DEF(VS2010_DLL)
+
+*_VS2010_IPF_PP_PATH = DEF(VS2010_BIN64)\cl.exe
+*_VS2010_IPF_APP_PATH = DEF(VS2010_BIN64)\cl.exe
+*_VS2010_IPF_VFRPP_PATH = DEF(VS2010_BIN64)\cl.exe
+*_VS2010_IPF_CC_PATH = DEF(VS2010_BIN64)\cl.exe
+*_VS2010_IPF_ASM_PATH = DEF(VS2010_BIN64)\ias.exe
+*_VS2010_IPF_SLINK_PATH = DEF(VS2010_BIN64)\lib.exe
+*_VS2010_IPF_DLINK_PATH = DEF(VS2010_BIN64)\link.exe
+*_VS2010_IPF_ASLCC_PATH = DEF(VS2010_BIN64)\cl.exe
+*_VS2010_IPF_ASLPP_PATH = DEF(VS2010_BIN64)\cl.exe
+*_VS2010_IPF_ASLDLINK_PATH = DEF(VS2010_BIN64)\link.exe
+
+ DEBUG_VS2010_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi
+RELEASE_VS2010_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32
+NOOPT_VS2010_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /FIAutoGen.h /QIPF_fr32 /Zi /Od
+
+ DEBUG_VS2010_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug
+RELEASE_VS2010_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4
+NOOPT_VS2010_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug
+
+ DEBUG_VS2010_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
+RELEASE_VS2010_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
+NOOPT_VS2010_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
+
+##################
+# EBC definitions
+##################
+*_VS2010_EBC_*_FAMILY = INTEL
+
+*_VS2010_EBC_MAKE_PATH = DEF(VS2010_BIN)\nmake.exe
+*_VS2010_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
+*_VS2010_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
+*_VS2010_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
+*_VS2010_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe
+*_VS2010_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe
+
+*_VS2010_EBC_MAKE_FLAGS = /nologo
+*_VS2010_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
+*_VS2010_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
+*_VS2010_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2010_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC
+*_VS2010_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
+
+####################################################################################
+#
+# Microsoft Visual Studio 2010
+#
+# VS2010 - Microsoft Visual Studio 2010 Premium Edition
+# ASL - Microsoft ACPI Source Language Compiler (asl.exe)
+####################################################################################
+# VS2010xASL - Microsoft Visual Studio 2010 Premium Edition
+*_VS2010xASL_*_*_FAMILY = MSFT
+
+*_VS2010xASL_*_MAKE_PATH = DEF(VS2010_BIN)\nmake.exe
+*_VS2010xASL_*_MAKE_FLAG = /nologo
+*_VS2010xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+
+*_VS2010xASL_*_SLINK_FLAGS = /NOLOGO /LTCG
+*_VS2010xASL_*_APP_FLAGS = /nologo /E /TC
+*_VS2010xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
+*_VS2010xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+
+*_VS2010xASL_*_ASM16_PATH = DEF(VS2010_BIN)\ml.exe
+
+##################
+# ASL definitions
+##################
+*_VS2010xASL_*_ASL_PATH = DEF(WIN_ASL_BIN)
+*_VS2010xASL_*_ASL_FLAGS =
+*_VS2010xASL_*_ASL_OUTFLAGS = DEF(MS_ASL_OUTFLAGS)
+*_VS2010xASL_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)
+*_VS2010xASL_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)
+*_VS2010xASL_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)
+
+##################
+# IA32 definitions
+##################
+*_VS2010xASL_IA32_*_DLL = DEF(VS2010_DLL)
+
+*_VS2010xASL_IA32_MAKE_PATH = DEF(VS2010_BIN)\nmake.exe
+*_VS2010xASL_IA32_CC_PATH = DEF(VS2010_BIN)\cl.exe
+*_VS2010xASL_IA32_VFRPP_PATH = DEF(VS2010_BIN)\cl.exe
+*_VS2010xASL_IA32_SLINK_PATH = DEF(VS2010_BIN)\lib.exe
+*_VS2010xASL_IA32_DLINK_PATH = DEF(VS2010_BIN)\link.exe
+*_VS2010xASL_IA32_APP_PATH = DEF(VS2010_BIN)\cl.exe
+*_VS2010xASL_IA32_PP_PATH = DEF(VS2010_BIN)\cl.exe
+*_VS2010xASL_IA32_ASM_PATH = DEF(VS2010_BIN)\ml.exe
+*_VS2010xASL_IA32_ASLCC_PATH = DEF(VS2010_BIN)\cl.exe
+*_VS2010xASL_IA32_ASLPP_PATH = DEF(VS2010_BIN)\cl.exe
+*_VS2010xASL_IA32_ASLDLINK_PATH = DEF(VS2010_BIN)\link.exe
+
+ *_VS2010xASL_IA32_MAKE_FLAGS = /nologo
+ DEBUG_VS2010xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm
+RELEASE_VS2010xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
+NOOPT_VS2010xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od
+
+ DEBUG_VS2010xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+RELEASE_VS2010xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd
+NOOPT_VS2010xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+
+ DEBUG_VS2010xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2010xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
+NOOPT_VS2010xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+
+##################
+# X64 definitions
+##################
+*_VS2010xASL_X64_*_DLL = DEF(VS2010_DLL)
+
+*_VS2010xASL_X64_CC_PATH = DEF(VS2010_BINX64)\cl.exe
+*_VS2010xASL_X64_PP_PATH = DEF(VS2010_BINX64)\cl.exe
+*_VS2010xASL_X64_APP_PATH = DEF(VS2010_BINX64)\cl.exe
+*_VS2010xASL_X64_VFRPP_PATH = DEF(VS2010_BINX64)\cl.exe
+*_VS2010xASL_X64_ASM_PATH = DEF(VS2010_BINX64)\ml64.exe
+*_VS2010xASL_X64_SLINK_PATH = DEF(VS2010_BINX64)\lib.exe
+*_VS2010xASL_X64_DLINK_PATH = DEF(VS2010_BINX64)\link.exe
+*_VS2010xASL_X64_ASLCC_PATH = DEF(VS2010_BINX64)\cl.exe
+*_VS2010xASL_X64_ASLPP_PATH = DEF(VS2010_BINX64)\cl.exe
+*_VS2010xASL_X64_ASLDLINK_PATH = DEF(VS2010_BINX64)\link.exe
+
+
+ DEBUG_VS2010xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
+RELEASE_VS2010xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
+NOOPT_VS2010xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
+
+ DEBUG_VS2010xASL_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi
+RELEASE_VS2010xASL_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd
+NOOPT_VS2010xASL_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi
+
+ DEBUG_VS2010xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2010xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
+NOOPT_VS2010xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+
+##################
+# IPF definitions
+##################
+*_VS2010xASL_IPF_*_DLL = DEF(VS2010_DLL)
+
+*_VS2010xASL_IPF_PP_PATH = DEF(VS2010_BIN64)\cl.exe
+*_VS2010xASL_IPF_APP_PATH = DEF(VS2010_BIN64)\cl.exe
+*_VS2010xASL_IPF_VFRPP_PATH = DEF(VS2010_BIN64)\cl.exe
+*_VS2010xASL_IPF_CC_PATH = DEF(VS2010_BIN64)\cl.exe
+*_VS2010xASL_IPF_ASM_PATH = DEF(VS2010_BIN64)\ias.exe
+*_VS2010xASL_IPF_SLINK_PATH = DEF(VS2010_BIN64)\lib.exe
+*_VS2010xASL_IPF_DLINK_PATH = DEF(VS2010_BIN64)\link.exe
+*_VS2010xASL_IPF_ASLCC_PATH = DEF(VS2010_BIN64)\cl.exe
+*_VS2010xASL_IPF_ASLPP_PATH = DEF(VS2010_BIN64)\cl.exe
+*_VS2010xASL_IPF_ASLDLINK_PATH = DEF(VS2010_BIN64)\link.exe
+
+ DEBUG_VS2010xASL_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi
+RELEASE_VS2010xASL_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32
+NOOPT_VS2010xASL_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /FIAutoGen.h /QIPF_fr32 /Zi /Od
+
+ DEBUG_VS2010xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug
+RELEASE_VS2010xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4
+NOOPT_VS2010xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug
+
+ DEBUG_VS2010xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
+RELEASE_VS2010xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
+NOOPT_VS2010xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
+
+##################
+# EBC definitions
+##################
+*_VS2010xASL_EBC_*_FAMILY = INTEL
+
+*_VS2010xASL_EBC_MAKE_PATH = DEF(VS2010_BIN)\nmake.exe
+*_VS2010xASL_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
+*_VS2010xASL_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
+*_VS2010xASL_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
+*_VS2010xASL_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe
+*_VS2010xASL_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe
+
+*_VS2010xASL_EBC_MAKE_FLAGS = /nologo
+*_VS2010xASL_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
+*_VS2010xASL_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
+*_VS2010xASL_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+*_VS2010xASL_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC
+*_VS2010xASL_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
+
+
+####################################################################################
+# VS2010x86 - Microsoft Visual Studio 2010 (x86) with Intel ASL
+# ASL - Intel ACPI Source Language Compiler (iasl.exe)
+####################################################################################
+# VS2010x86 - Microsoft Visual Studio 2010 (x86) ALL Edition with Intel ASL
+*_VS2010x86_*_*_FAMILY = MSFT
+
+*_VS2010x86_*_MAKE_PATH = DEF(VS2010x86_BIN)\nmake.exe
+*_VS2010x86_*_MAKE_FLAG = /nologo
+*_VS2010x86_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+
+*_VS2010x86_*_MAKE_FLAGS = /nologo
+*_VS2010x86_*_SLINK_FLAGS = /NOLOGO /LTCG
+*_VS2010x86_*_APP_FLAGS = /nologo /E /TC
+*_VS2010x86_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
+*_VS2010x86_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+
+*_VS2010x86_*_ASM16_PATH = DEF(VS2010x86_BIN)\ml.exe
+
+##################
+# ASL definitions
+##################
+*_VS2010x86_*_ASL_PATH = DEF(WIN_IASL_BIN)
+*_VS2010x86_*_ASL_FLAGS = DEF(DEFAULT_WIN_ASL_FLAGS)
+*_VS2010x86_*_ASL_OUTFLAGS = DEF(DEFAULT_WIN_ASL_OUTFLAGS)
+*_VS2010x86_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)
+*_VS2010x86_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)
+*_VS2010x86_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)
+
+##################
+# IA32 definitions
+##################
+*_VS2010x86_IA32_*_DLL = DEF(VS2010x86_DLL)
+
+*_VS2010x86_IA32_MAKE_PATH = DEF(VS2010x86_BIN)\nmake.exe
+*_VS2010x86_IA32_CC_PATH = DEF(VS2010x86_BIN)\cl.exe
+*_VS2010x86_IA32_VFRPP_PATH = DEF(VS2010x86_BIN)\cl.exe
+*_VS2010x86_IA32_ASLCC_PATH = DEF(VS2010x86_BIN)\cl.exe
+*_VS2010x86_IA32_ASLPP_PATH = DEF(VS2010x86_BIN)\cl.exe
+*_VS2010x86_IA32_SLINK_PATH = DEF(VS2010x86_BIN)\lib.exe
+*_VS2010x86_IA32_DLINK_PATH = DEF(VS2010x86_BIN)\link.exe
+*_VS2010x86_IA32_ASLDLINK_PATH= DEF(VS2010x86_BIN)\link.exe
+*_VS2010x86_IA32_APP_PATH = DEF(VS2010x86_BIN)\cl.exe
+*_VS2010x86_IA32_PP_PATH = DEF(VS2010x86_BIN)\cl.exe
+*_VS2010x86_IA32_ASM_PATH = DEF(VS2010x86_BIN)\ml.exe
+
+ *_VS2010x86_IA32_MAKE_FLAGS = /nologo
+ DEBUG_VS2010x86_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm
+RELEASE_VS2010x86_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
+NOOPT_VS2010x86_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od
+
+ DEBUG_VS2010x86_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+RELEASE_VS2010x86_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd
+NOOPT_VS2010x86_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+
+ DEBUG_VS2010x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2010x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
+NOOPT_VS2010x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+
+##################
+# X64 definitions
+##################
+*_VS2010x86_X64_*_DLL = DEF(VS2010x86_DLL)
+
+*_VS2010x86_X64_CC_PATH = DEF(VS2010x86_BINX64)\cl.exe
+*_VS2010x86_X64_PP_PATH = DEF(VS2010x86_BINX64)\cl.exe
+*_VS2010x86_X64_APP_PATH = DEF(VS2010x86_BINX64)\cl.exe
+*_VS2010x86_X64_VFRPP_PATH = DEF(VS2010x86_BINX64)\cl.exe
+*_VS2010x86_X64_ASLCC_PATH = DEF(VS2010x86_BINX64)\cl.exe
+*_VS2010x86_X64_ASLPP_PATH = DEF(VS2010x86_BINX64)\cl.exe
+*_VS2010x86_X64_ASM_PATH = DEF(VS2010x86_BINX64)\ml64.exe
+*_VS2010x86_X64_SLINK_PATH = DEF(VS2010x86_BINX64)\lib.exe
+*_VS2010x86_X64_DLINK_PATH = DEF(VS2010x86_BINX64)\link.exe
+*_VS2010x86_X64_ASLDLINK_PATH = DEF(VS2010x86_BINX64)\link.exe
+
+ DEBUG_VS2010x86_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
+RELEASE_VS2010x86_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
+NOOPT_VS2010x86_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
+
+ DEBUG_VS2010x86_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi
+RELEASE_VS2010x86_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd
+NOOPT_VS2010x86_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi
+
+ DEBUG_VS2010x86_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2010x86_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
+NOOPT_VS2010x86_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+
+
+##################
+# IPF definitions
+##################
+*_VS2010x86_IPF_*_DLL = DEF(VS2010x86_DLL)
+
+*_VS2010x86_IPF_PP_PATH = DEF(VS2010x86_BIN64)\cl.exe
+*_VS2010x86_IPF_APP_PATH = DEF(VS2010x86_BIN64)\cl.exe
+*_VS2010x86_IPF_VFRPP_PATH = DEF(VS2010x86_BIN64)\cl.exe
+*_VS2010x86_IPF_ASLCC_PATH = DEF(VS2010x86_BIN64)\cl.exe
+*_VS2010x86_IPF_ASLPP_PATH = DEF(VS2010x86_BIN64)\cl.exe
+*_VS2010x86_IPF_CC_PATH = DEF(VS2010x86_BIN64)\cl.exe
+*_VS2010x86_IPF_ASM_PATH = DEF(VS2010x86_BIN64)\ias.exe
+*_VS2010x86_IPF_SLINK_PATH = DEF(VS2010x86_BIN64)\lib.exe
+*_VS2010x86_IPF_DLINK_PATH = DEF(VS2010x86_BIN64)\link.exe
+*_VS2010x86_IPF_ASLDLINK_PATH = DEF(VS2010x86_BIN64)\link.exe
+
+ DEBUG_VS2010x86_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi
+RELEASE_VS2010x86_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32
+NOOPT_VS2010x86_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /FIAutoGen.h /QIPF_fr32 /Zi /Od
+
+ DEBUG_VS2010x86_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug
+RELEASE_VS2010x86_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4
+NOOPT_VS2010x86_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug
+
+ DEBUG_VS2010x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
+RELEASE_VS2010x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
+NOOPT_VS2010x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
+
+
+####################################################################################
+# VS2010x86xASL - Microsoft Visual Studio 2010 with Microsoft ASL
+# ASL - Microsoft ACPI Source Language Compiler (asl.exe)
+####################################################################################
+*_VS2010x86xASL_*_*_FAMILY = MSFT
+
+*_VS2010x86xASL_*_MAKE_PATH = DEF(VS2010x86_BIN)\nmake.exe
+*_VS2010x86xASL_*_MAKE_FLAG = /nologo
+*_VS2010x86xASL_*_RC_PATH = DEF(WINSDK_BIN)\rc.exe
+
+*_VS2010x86xASL_*_MAKE_FLAGS = /nologo
+*_VS2010x86xASL_*_SLINK_FLAGS = /NOLOGO /LTCG
+*_VS2010x86xASL_*_APP_FLAGS = /nologo /E /TC
+*_VS2010x86xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
+*_VS2010x86xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
+
+*_VS2010x86xASL_*_ASM16_PATH = DEF(VS2010x86_BIN)\ml.exe
+
+##################
+# ASL definitions
+##################
+*_VS2010x86xASL_*_ASL_PATH = DEF(WIN_ASL_BIN)
+*_VS2010x86xASL_*_ASL_FLAGS = DEF(MS_ASL_FLAGS)
+*_VS2010x86xASL_*_ASL_OUTFLAGS = DEF(MS_ASL_OUTFLAGS)
+*_VS2010x86xASL_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)
+*_VS2010x86xASL_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)
+*_VS2010x86xASL_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)
+
+##################
+# IA32 definitions
+##################
+*_VS2010x86xASL_IA32_*_DLL = DEF(VS2010x86_DLL)
+
+*_VS2010x86xASL_IA32_MAKE_PATH = DEF(VS2010x86_BIN)\nmake.exe
+*_VS2010x86xASL_IA32_CC_PATH = DEF(VS2010x86_BIN)\cl.exe
+*_VS2010x86xASL_IA32_VFRPP_PATH = DEF(VS2010x86_BIN)\cl.exe
+*_VS2010x86xASL_IA32_ASLCC_PATH = DEF(VS2010x86_BIN)\cl.exe
+*_VS2010x86xASL_IA32_ASLPP_PATH = DEF(VS2010x86_BIN)\cl.exe
+*_VS2010x86xASL_IA32_SLINK_PATH = DEF(VS2010x86_BIN)\lib.exe
+*_VS2010x86xASL_IA32_DLINK_PATH = DEF(VS2010x86_BIN)\link.exe
+*_VS2010x86xASL_IA32_ASLDLINK_PATH= DEF(VS2010x86_BIN)\link.exe
+*_VS2010x86xASL_IA32_APP_PATH = DEF(VS2010x86_BIN)\cl.exe
+*_VS2010x86xASL_IA32_PP_PATH = DEF(VS2010x86_BIN)\cl.exe
+*_VS2010x86xASL_IA32_ASM_PATH = DEF(VS2010x86_BIN)\ml.exe
+
+ *_VS2010x86xASL_IA32_MAKE_FLAGS = /nologo
+ DEBUG_VS2010x86xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm
+RELEASE_VS2010x86xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
+NOOPT_VS2010x86xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od
+
+ DEBUG_VS2010x86xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+RELEASE_VS2010x86xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd
+NOOPT_VS2010x86xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
+
+ DEBUG_VS2010x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2010x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
+NOOPT_VS2010x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+
+##################
+# X64 definitions
+##################
+*_VS2010x86xASL_X64_*_DLL = DEF(VS2010x86_DLL)
+
+*_VS2010x86xASL_X64_CC_PATH = DEF(VS2010x86_BINX64)\cl.exe
+*_VS2010x86xASL_X64_PP_PATH = DEF(VS2010x86_BINX64)\cl.exe
+*_VS2010x86xASL_X64_APP_PATH = DEF(VS2010x86_BINX64)\cl.exe
+*_VS2010x86xASL_X64_VFRPP_PATH = DEF(VS2010x86_BINX64)\cl.exe
+*_VS2010x86xASL_X64_ASLCC_PATH = DEF(VS2010x86_BINX64)\cl.exe
+*_VS2010x86xASL_X64_ASLPP_PATH = DEF(VS2010x86_BINX64)\cl.exe
+*_VS2010x86xASL_X64_ASM_PATH = DEF(VS2010x86_BINX64)\ml64.exe
+*_VS2010x86xASL_X64_SLINK_PATH = DEF(VS2010x86_BINX64)\lib.exe
+*_VS2010x86xASL_X64_DLINK_PATH = DEF(VS2010x86_BINX64)\link.exe
+*_VS2010x86xASL_X64_ASLDLINK_PATH = DEF(VS2010x86_BINX64)\link.exe
+
+ DEBUG_VS2010x86xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
+RELEASE_VS2010x86xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
+NOOPT_VS2010x86xASL_X64_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
+
+ DEBUG_VS2010x86xASL_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi
+RELEASE_VS2010x86xASL_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd
+NOOPT_VS2010x86xASL_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi
+
+ DEBUG_VS2010x86xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+RELEASE_VS2010x86xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
+NOOPT_VS2010x86xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+
+##################
+# IPF definitions
+##################
+*_VS2010x86xASL_IPF_*_DLL = DEF(VS2010x86_DLL)
+
+*_VS2010x86xASL_IPF_PP_PATH = DEF(VS2010x86_BIN64)\cl.exe
+*_VS2010x86xASL_IPF_APP_PATH = DEF(VS2010x86_BIN64)\cl.exe
+*_VS2010x86xASL_IPF_VFRPP_PATH = DEF(VS2010x86_BIN64)\cl.exe
+*_VS2010x86xASL_IPF_ASLCC_PATH = DEF(VS2010x86_BIN64)\cl.exe
+*_VS2010x86xASL_IPF_ASLPP_PATH = DEF(VS2010x86_BIN64)\cl.exe
+*_VS2010x86xASL_IPF_CC_PATH = DEF(VS2010x86_BIN64)\cl.exe
+*_VS2010x86xASL_IPF_ASM_PATH = DEF(VS2010x86_BIN64)\ias.exe
+*_VS2010x86xASL_IPF_SLINK_PATH = DEF(VS2010x86_BIN64)\lib.exe
+*_VS2010x86xASL_IPF_DLINK_PATH = DEF(VS2010x86_BIN64)\link.exe
+*_VS2010x86xASL_IPF_ASLDLINK_PATH = DEF(VS2010x86_BIN64)\link.exe
+
+ DEBUG_VS2010x86xASL_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi
+RELEASE_VS2010x86xASL_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32
+NOOPT_VS2010x86xASL_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /FIAutoGen.h /QIPF_fr32 /Zi /Od
+
+ DEBUG_VS2010x86xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug
+RELEASE_VS2010x86xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4
+NOOPT_VS2010x86xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug
+
+ DEBUG_VS2010x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
+RELEASE_VS2010x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
+NOOPT_VS2010x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4001 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG
+
+
+####################################################################################
+#
# Microsoft Device Driver Kit 3790.1830 (IA-32, X64, Itanium, with Link Time Code Generation)
# And Intel ACPI Compiler
#
Modified: trunk/BaseTools/toolsetup.bat
===================================================================
--- trunk/BaseTools/toolsetup.bat 2012-04-05 06:57:23 UTC (rev 2516)
+++ trunk/BaseTools/toolsetup.bat 2012-04-05 08:22:02 UTC (rev 2517)
@@ -3,7 +3,7 @@
@REM however it may be executed directly from the BaseTools project folder
@REM if the file is not executed within a WORKSPACE\BaseTools folder.
@REM
-@REM Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+@REM Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
@REM
@REM This program and the accompanying materials are licensed and made available
@REM under the terms and conditions of the BSD Licensewhich accompanies this
@@ -291,16 +291,24 @@
echo.
if defined VCINSTALLDIR goto VisualStudioAvailable
- if defined VS71COMNTOOLS (
- call "%VS71COMNTOOLS%\vsvars32.bat"
+ if defined VS100COMNTOOLS (
+ call "%VS100COMNTOOLS%\vsvars32.bat"
) else (
- if defined VS80COMNTOOLS (
- call "%VS80COMNTOOLS%\vsvars32.bat"
+ if defined VS90COMNTOOLS (
+ call "%VS90COMNTOOLS%\vsvars32.bat"
) else (
- echo.
- echo !!! ERROR !!!! Cannot find Visual Studio, required to build C tools !!!
- echo.
- goto end
+ if defined VS80COMNTOOLS (
+ call "%VS80COMNTOOLS%\vsvars32.bat"
+ ) else (
+ if defined VS71COMNTOOLS (
+ call "%VS71COMNTOOLS%\vsvars32.bat"
+ ) else (
+ echo.
+ echo !!! ERROR !!!! Cannot find Visual Studio, required to build C tools !!!
+ echo.
+ goto end
+ )
+ )
)
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2012-04-05 06:57:31
|
Revision: 2516
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2516&view=rev
Author: xfzyr
Date: 2012-04-05 06:57:23 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
Fix some regression issues with BRG:
1) Eliminate unnecessary blank lines in report.
2) Change the case for some keyword to align with spec.
3) Add the slash flag ?\226?\128?\152\\?\226?\128?\153 and space flag ?\226?\128?\152 ?\226?\128?\152 to break a long long line.
Fix a regression build break on Linux with debug and release as TARGET, GCC44 as TOOL_CHAIN.
Signed-off-by: Yurui Zeng <yur...@in...>
Reviewed-by: Liming Gao <lim...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/Python/Common/DataType.py
trunk/BaseTools/Source/Python/build/BuildReport.py
trunk/BaseTools/Source/Python/build/build.py
Modified: trunk/BaseTools/Source/Python/Common/DataType.py
===================================================================
--- trunk/BaseTools/Source/Python/Common/DataType.py 2012-04-03 20:14:31 UTC (rev 2515)
+++ trunk/BaseTools/Source/Python/Common/DataType.py 2012-04-05 06:57:23 UTC (rev 2516)
@@ -422,6 +422,10 @@
TAB_UNKNOWN_FILE = "UNKNOWN-TYPE-FILE"
TAB_DEFAULT_BINARY_FILE = "_BINARY_FILE_"
+# used by BRG
+TAB_BRG_PCD = 'PCD'
+TAB_BRG_LIBRARY = 'Library'
+
#
# Build Rule File Version Definition
#
Modified: trunk/BaseTools/Source/Python/build/BuildReport.py
===================================================================
--- trunk/BaseTools/Source/Python/build/BuildReport.py 2012-04-03 20:14:31 UTC (rev 2515)
+++ trunk/BaseTools/Source/Python/build/BuildReport.py 2012-04-05 06:57:23 UTC (rev 2516)
@@ -34,9 +34,11 @@
from Common.BuildToolError import FILE_WRITE_FAILURE
from Common.BuildToolError import CODE_ERROR
from Common.DataType import TAB_LINE_BREAK
-from Common.DataType import TAB_INF_PCD
-from Common.DataType import EDK_COMPONENT_TYPE_LIBRARY
from Common.DataType import TAB_DEPEX
+from Common.DataType import TAB_SLASH
+from Common.DataType import TAB_SPACE_SPLIT
+from Common.DataType import TAB_BRG_PCD
+from Common.DataType import TAB_BRG_LIBRARY
## Pattern to extract contents in EDK DXS files
gDxsDependencyPattern = re.compile(r"DEPENDENCY_START(.+)DEPENDENCY_END", re.DOTALL)
@@ -182,17 +184,24 @@
# @param MaxLength The Max Length of the line
#
def FileLinesSplit(Content=None, MaxLength=None):
- ContentList = Content.split(os.linesep)
+ ContentList = Content.split(TAB_LINE_BREAK)
NewContent = ''
NewContentList = []
for Line in ContentList:
- while len(Line) > MaxLength:
- NewContentList.append(Line[:MaxLength])
- Line = Line[MaxLength:]
+ while len(Line.rstrip()) > MaxLength:
+ LineSpaceIndex = Line.rfind(TAB_SPACE_SPLIT, 0, MaxLength)
+ LineSlashIndex = Line.rfind(TAB_SLASH, 0, MaxLength)
+ LineBreakIndex = MaxLength
+ if LineSpaceIndex > LineSlashIndex:
+ LineBreakIndex = LineSpaceIndex
+ elif LineSlashIndex > LineSpaceIndex:
+ LineBreakIndex = LineSlashIndex
+ NewContentList.append(Line[:LineBreakIndex])
+ Line = Line[LineBreakIndex:]
if Line:
NewContentList.append(Line)
for NewLine in NewContentList:
- NewContent += NewLine + os.linesep
+ NewContent += NewLine + TAB_LINE_BREAK
return NewContent
@@ -294,7 +303,7 @@
#
def GenerateReport(self, File):
FileWrite(File, gSubSectionStart)
- FileWrite(File, EDK_COMPONENT_TYPE_LIBRARY)
+ FileWrite(File, TAB_BRG_LIBRARY)
if len(self.LibraryList) > 0:
FileWrite(File, gSubSectionSep)
for LibraryItem in self.LibraryList:
@@ -718,7 +727,7 @@
# For module PCD sub-section
#
FileWrite(File, gSubSectionStart)
- FileWrite(File, TAB_INF_PCD)
+ FileWrite(File, TAB_BRG_PCD)
FileWrite(File, gSubSectionSep)
for Key in self.AllPcds:
Modified: trunk/BaseTools/Source/Python/build/build.py
===================================================================
--- trunk/BaseTools/Source/Python/build/build.py 2012-04-03 20:14:31 UTC (rev 2515)
+++ trunk/BaseTools/Source/Python/build/build.py 2012-04-05 06:57:23 UTC (rev 2516)
@@ -60,6 +60,7 @@
gToolsDefinition = "Conf/tools_def.txt"
TemporaryTablePattern = re.compile(r'^_\d+_\d+_[a-fA-F0-9]+$')
+TmpTableDict = {}
## Check environment PATH variable to make sure the specified tool is found
#
@@ -1450,14 +1451,13 @@
if BuildTask.HasError():
EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)
- #
- # Drop temp tables to avoid database be locked.
#
+ # Save temp tables to a TmpTableDict.
+ #
for Key in Wa.BuildDatabase._CACHE_:
if Wa.BuildDatabase._CACHE_[Key]._RawData and Wa.BuildDatabase._CACHE_[Key]._RawData._Table and Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Table:
if TemporaryTablePattern.match(Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Table):
- Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Drop()
- Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Table = 0
+ TmpTableDict[Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Table] = Wa.BuildDatabase._CACHE_[Key]._RawData._Table.Cur
#
#
# All modules have been put in build tasks queue. Tell task scheduler
@@ -1822,6 +1822,10 @@
MyBuild = Build(Target, Workspace, Option)
GlobalData.gCommandLineDefines['ARCH'] = ' '.join(MyBuild.ArchList)
MyBuild.Launch()
+ # Drop temp tables to avoid database locked.
+ for TmpTableName in TmpTableDict:
+ SqlCommand = """drop table IF EXISTS %s""" % TmpTableName
+ TmpTableDict[TmpTableName].execute(SqlCommand)
#MyBuild.DumpBuildData()
except FatalError, X:
if MyBuild != None:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Andrew F. <af...@ap...> - 2012-04-03 20:16:42
|
I don't see the error after your fix. Andrew Fish On Apr 3, 2012, at 1:14 PM, jlj...@us... wrote: > Revision: 2515 > http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2515&view=rev > Author: jljusten > Date: 2012-04-03 20:14:31 +0000 (Tue, 03 Apr 2012) > Log Message: > ----------- > BaseTools/Tests/TestTools.py: Look for tools in more places > > When testing tools in non-Windows enviroments, the > tools can be found in 3 possible places: > 1. BaseTools/Bin/`uname -sm` > 2. BaseTools/BinWrappers/`uname -sm` > 3. BaseTools/BinWrappers/PosixLike > > Signed-off-by: Jordan Justen <jor...@in...> > Reviewed-by: Erik Bjorge <eri...@in...> > > Modified Paths: > -------------- > trunk/BaseTools/Tests/TestTools.py > > Modified: trunk/BaseTools/Tests/TestTools.py > =================================================================== > --- trunk/BaseTools/Tests/TestTools.py 2012-04-02 00:22:32 UTC (rev 2514) > +++ trunk/BaseTools/Tests/TestTools.py 2012-04-03 20:14:31 UTC (rev 2515) > @@ -1,7 +1,7 @@ > ## @file > # Utility functions and classes for BaseTools unit tests > # > -# Copyright (c) 2008, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR> > # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the BSD License > @@ -41,21 +41,20 @@ > tests.append(item()) > return lambda: unittest.TestSuite(tests) > > -def GetBaseToolsPath(): > +def GetBaseToolsPaths(): > if sys.platform in ('win32', 'win64'): > - return os.path.join(BaseToolsDir, 'Bin', sys.platform.title()) > - elif sys.platform in ('cygwin'): > - uname = os.popen('uname -sm').read().strip() > - for char in (' ', '/'): > - uname = uname.replace(char, '-') > - return os.path.join(BaseToolsDir, 'Bin', uname) > + return [ os.path.join(BaseToolsDir, 'Bin', sys.platform.title()) ] > else: > uname = os.popen('uname -sm').read().strip() > for char in (' ', '/'): > uname = uname.replace(char, '-') > - return os.path.join(BaseToolsDir, 'BinWrappers', uname) > + return [ > + os.path.join(BaseToolsDir, 'Bin', uname), > + os.path.join(BaseToolsDir, 'BinWrappers', uname), > + os.path.join(BaseToolsDir, 'BinWrappers', 'PosixLike') > + ] > > -BaseToolsBinPath = GetBaseToolsPath() > +BaseToolsBinPaths = GetBaseToolsPaths() > > class BaseToolsTest(unittest.TestCase): > > @@ -93,6 +92,14 @@ > sys.stdout.write(self.ReadTmpFile(fileName)) > sys.stdout.flush() > > + def FindToolBin(self, toolName): > + for binPath in BaseToolsBinPaths: > + bin = os.path.join(binPath, toolName) > + if os.path.exists(bin): > + break > + assert os.path.exists(bin) > + return bin > + > def RunTool(self, *args, **kwd): > if 'toolName' in kwd: toolName = kwd['toolName'] > else: toolName = None > @@ -100,7 +107,7 @@ > else: logFile = None > > if toolName is None: toolName = self.toolName > - bin = os.path.join(self.baseToolsBins, toolName) > + bin = self.FindToolBin(toolName) > if logFile is not None: > logFile = open(os.path.join(self.testDir, logFile), 'w') > popenOut = logFile > @@ -154,9 +161,9 @@ > self.savedEnvPath = os.environ['PATH'] > self.savedSysPath = sys.path[:] > > - self.baseToolsBins = BaseToolsBinPath > - os.environ['PATH'] = \ > - os.path.pathsep.join((os.environ['PATH'], self.baseToolsBins)) > + for binPath in BaseToolsBinPaths: > + os.environ['PATH'] = \ > + os.path.pathsep.join((os.environ['PATH'], binPath)) > > self.testDir = TestTempDir > if not os.path.exists(self.testDir): > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > > ------------------------------------------------------------------------------ > Better than sec? Nothing is better than sec when it comes to > monitoring Big Data applications. Try Boundary one-second > resolution app monitoring today. Free. > http://p.sf.net/sfu/Boundary-dev2dev > _______________________________________________ > edk2-buildtools-commits mailing list > edk...@li... > https://lists.sourceforge.net/lists/listinfo/edk2-buildtools-commits |
|
From: <jlj...@us...> - 2012-04-03 20:14:37
|
Revision: 2515
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2515&view=rev
Author: jljusten
Date: 2012-04-03 20:14:31 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
BaseTools/Tests/TestTools.py: Look for tools in more places
When testing tools in non-Windows enviroments, the
tools can be found in 3 possible places:
1. BaseTools/Bin/`uname -sm`
2. BaseTools/BinWrappers/`uname -sm`
3. BaseTools/BinWrappers/PosixLike
Signed-off-by: Jordan Justen <jor...@in...>
Reviewed-by: Erik Bjorge <eri...@in...>
Modified Paths:
--------------
trunk/BaseTools/Tests/TestTools.py
Modified: trunk/BaseTools/Tests/TestTools.py
===================================================================
--- trunk/BaseTools/Tests/TestTools.py 2012-04-02 00:22:32 UTC (rev 2514)
+++ trunk/BaseTools/Tests/TestTools.py 2012-04-03 20:14:31 UTC (rev 2515)
@@ -1,7 +1,7 @@
## @file
# Utility functions and classes for BaseTools unit tests
#
-# Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -41,21 +41,20 @@
tests.append(item())
return lambda: unittest.TestSuite(tests)
-def GetBaseToolsPath():
+def GetBaseToolsPaths():
if sys.platform in ('win32', 'win64'):
- return os.path.join(BaseToolsDir, 'Bin', sys.platform.title())
- elif sys.platform in ('cygwin'):
- uname = os.popen('uname -sm').read().strip()
- for char in (' ', '/'):
- uname = uname.replace(char, '-')
- return os.path.join(BaseToolsDir, 'Bin', uname)
+ return [ os.path.join(BaseToolsDir, 'Bin', sys.platform.title()) ]
else:
uname = os.popen('uname -sm').read().strip()
for char in (' ', '/'):
uname = uname.replace(char, '-')
- return os.path.join(BaseToolsDir, 'BinWrappers', uname)
+ return [
+ os.path.join(BaseToolsDir, 'Bin', uname),
+ os.path.join(BaseToolsDir, 'BinWrappers', uname),
+ os.path.join(BaseToolsDir, 'BinWrappers', 'PosixLike')
+ ]
-BaseToolsBinPath = GetBaseToolsPath()
+BaseToolsBinPaths = GetBaseToolsPaths()
class BaseToolsTest(unittest.TestCase):
@@ -93,6 +92,14 @@
sys.stdout.write(self.ReadTmpFile(fileName))
sys.stdout.flush()
+ def FindToolBin(self, toolName):
+ for binPath in BaseToolsBinPaths:
+ bin = os.path.join(binPath, toolName)
+ if os.path.exists(bin):
+ break
+ assert os.path.exists(bin)
+ return bin
+
def RunTool(self, *args, **kwd):
if 'toolName' in kwd: toolName = kwd['toolName']
else: toolName = None
@@ -100,7 +107,7 @@
else: logFile = None
if toolName is None: toolName = self.toolName
- bin = os.path.join(self.baseToolsBins, toolName)
+ bin = self.FindToolBin(toolName)
if logFile is not None:
logFile = open(os.path.join(self.testDir, logFile), 'w')
popenOut = logFile
@@ -154,9 +161,9 @@
self.savedEnvPath = os.environ['PATH']
self.savedSysPath = sys.path[:]
- self.baseToolsBins = BaseToolsBinPath
- os.environ['PATH'] = \
- os.path.pathsep.join((os.environ['PATH'], self.baseToolsBins))
+ for binPath in BaseToolsBinPaths:
+ os.environ['PATH'] = \
+ os.path.pathsep.join((os.environ['PATH'], binPath))
self.testDir = TestTempDir
if not os.path.exists(self.testDir):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jlj...@us...> - 2012-04-02 00:22:38
|
Revision: 2514
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2514&view=rev
Author: jljusten
Date: 2012-04-02 00:22:32 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
BaseTools/Source/C/GNUmakefile: Detect i*86 as IA32
This change allows i486 & i586 results from 'uname -m'
to be detected as IA32.
Signed-off-by: Jordan Justen <jor...@in...>
Reviewed-by: Erik Bjorge <eri...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/C/GNUmakefile
Modified: trunk/BaseTools/Source/C/GNUmakefile
===================================================================
--- trunk/BaseTools/Source/C/GNUmakefile 2012-04-02 00:22:14 UTC (rev 2513)
+++ trunk/BaseTools/Source/C/GNUmakefile 2012-04-02 00:22:32 UTC (rev 2514)
@@ -1,7 +1,7 @@
## @file
# GNU Make makefile for C tools build.
#
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -22,12 +22,9 @@
ifeq ($(uname_m),x86_64)
ARCH=X64
endif
- ifeq ($(uname_m),i386)
+ ifeq ($(patsubst i%86,IA32,$(uname_m)),IA32)
ARCH=IA32
endif
- ifeq ($(uname_m),i686)
- ARCH=IA32
- endif
ifndef ARCH
$(info Could not detected ARCH from uname results)
$(error ARCH is not defined!)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jlj...@us...> - 2012-04-02 00:22:21
|
Revision: 2513
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2513&view=rev
Author: jljusten
Date: 2012-04-02 00:22:14 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
BaseTools/BinWrappers/PosixLike: Add scripts (rather than symlinks)
The content of many of these scripts are duplicated. But,
to avoid issues with windows svn and cygwin svn, we are
avoiding using symbolic links.
Signed-off-by: Jordan Justen <jor...@in...>
Reviewed-by: Erik Bjorge <eri...@in...>
Added Paths:
-----------
trunk/BaseTools/BinWrappers/PosixLike/BPDG
trunk/BaseTools/BinWrappers/PosixLike/BootSectImage
trunk/BaseTools/BinWrappers/PosixLike/Ecc
trunk/BaseTools/BinWrappers/PosixLike/EfiLdrImage
trunk/BaseTools/BinWrappers/PosixLike/EfiRom
trunk/BaseTools/BinWrappers/PosixLike/GenCrc32
trunk/BaseTools/BinWrappers/PosixLike/GenFds
trunk/BaseTools/BinWrappers/PosixLike/GenFfs
trunk/BaseTools/BinWrappers/PosixLike/GenFv
trunk/BaseTools/BinWrappers/PosixLike/GenFw
trunk/BaseTools/BinWrappers/PosixLike/GenPage
trunk/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
trunk/BaseTools/BinWrappers/PosixLike/GenSec
trunk/BaseTools/BinWrappers/PosixLike/GenVtf
trunk/BaseTools/BinWrappers/PosixLike/GnuGenBootSector
trunk/BaseTools/BinWrappers/PosixLike/LzmaCompress
trunk/BaseTools/BinWrappers/PosixLike/PatchPcdValue
trunk/BaseTools/BinWrappers/PosixLike/Split
trunk/BaseTools/BinWrappers/PosixLike/TargetTool
trunk/BaseTools/BinWrappers/PosixLike/TianoCompress
trunk/BaseTools/BinWrappers/PosixLike/Trim
trunk/BaseTools/BinWrappers/PosixLike/UPT
trunk/BaseTools/BinWrappers/PosixLike/VfrCompile
trunk/BaseTools/BinWrappers/PosixLike/VolInfo
trunk/BaseTools/BinWrappers/PosixLike/build
Added: trunk/BaseTools/BinWrappers/PosixLike/BPDG
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/BPDG (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/BPDG 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+PYTHONPATH="`dirname $0`/../../Source/Python" \
+ python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py $*
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/BPDG
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/BootSectImage
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/BootSectImage (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/BootSectImage 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/BootSectImage
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/Ecc
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/Ecc (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/Ecc 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+PYTHONPATH="`dirname $0`/../../Source/Python" \
+ python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py $*
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/Ecc
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/EfiLdrImage
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/EfiLdrImage (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/EfiLdrImage 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/EfiLdrImage
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/EfiRom
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/EfiRom (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/EfiRom 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/EfiRom
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/GenCrc32
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenCrc32 (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenCrc32 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/GenCrc32
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/GenFds
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenFds (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenFds 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+PYTHONPATH="`dirname $0`/../../Source/Python" \
+ python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py $*
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/GenFds
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/GenFfs
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenFfs (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenFfs 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/GenFfs
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/GenFv
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenFv (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenFv 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/GenFv
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/GenFw
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenFw (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenFw 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/GenFw
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/GenPage
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenPage (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenPage 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/GenPage
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+PYTHONPATH="`dirname $0`/../../Source/Python" \
+ python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py $*
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/GenSec
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenSec (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenSec 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/GenSec
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/GenVtf
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenVtf (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenVtf 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/GenVtf
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/GnuGenBootSector
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GnuGenBootSector (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/GnuGenBootSector 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/GnuGenBootSector
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/LzmaCompress
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/LzmaCompress (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/LzmaCompress 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/LzmaCompress
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/PatchPcdValue
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/PatchPcdValue (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/PatchPcdValue 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+PYTHONPATH="`dirname $0`/../../Source/Python" \
+ python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py $*
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/PatchPcdValue
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/Split
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/Split (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/Split 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/Split
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/TargetTool
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/TargetTool (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/TargetTool 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+PYTHONPATH="`dirname $0`/../../Source/Python" \
+ python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py $*
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/TargetTool
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/TianoCompress
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/TianoCompress (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/TianoCompress 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/TianoCompress
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/Trim
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/Trim (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/Trim 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+PYTHONPATH="`dirname $0`/../../Source/Python" \
+ python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py $*
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/Trim
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/UPT
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/UPT (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/UPT 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+PYTHONPATH="`dirname $0`/../../Source/Python" \
+ python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py $*
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/UPT
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/VfrCompile
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/VfrCompile (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/VfrCompile 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/VfrCompile
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/VolInfo
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/VolInfo (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/VolInfo 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+#exec `dirname $0`/../../../../C/bin/`basename $0` $*
+
+TOOL_BASENAME=`basename $0`
+
+if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
+then
+ exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
+elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
+then
+ if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
+ then
+ echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
+ echo You may need to run:
+ echo " make -C $EDK_TOOLS_PATH/Source/C"
+ else
+ exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
+ fi
+elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
+then
+ exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
+else
+ echo Unable to find the real \'$TOOL_BASENAME\' to run
+ echo This message was printed by
+ echo " $0"
+ exit -1
+fi
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/VolInfo
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/build
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/build (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/build 2012-04-02 00:22:14 UTC (rev 2513)
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+#python `dirname $0`/RunToolFromSource.py `basename $0` $*
+PYTHONPATH="`dirname $0`/../../Source/Python" \
+ python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py $*
+
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/build
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jlj...@us...> - 2012-04-02 00:21:22
|
Revision: 2512
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2512&view=rev
Author: jljusten
Date: 2012-04-02 00:21:15 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
BaseTools/BinWrappers: Remove all symbolic links
Windows svn and cygwin svn do not treat symbolic links
the same and this can lead to issues.
To fix this we will just duplicate the scripts where
required.
In the case of the common usage of PosixLike, we will
add the PosixLike directory into the PATH environment
variable.
Signed-off-by: Jordan Justen <jor...@in...>
Reviewed-by: Erik Bjorge <eri...@in...>
Removed Paths:
-------------
trunk/BaseTools/BinWrappers/Darwin-i386
trunk/BaseTools/BinWrappers/Darwin-x86_64
trunk/BaseTools/BinWrappers/Linux-i686
trunk/BaseTools/BinWrappers/Linux-x86_64
trunk/BaseTools/BinWrappers/PosixLike/BPDG
trunk/BaseTools/BinWrappers/PosixLike/BootSectImage
trunk/BaseTools/BinWrappers/PosixLike/BuildEnv
trunk/BaseTools/BinWrappers/PosixLike/Ecc
trunk/BaseTools/BinWrappers/PosixLike/EfiLdrImage
trunk/BaseTools/BinWrappers/PosixLike/EfiRom
trunk/BaseTools/BinWrappers/PosixLike/GenCrc32
trunk/BaseTools/BinWrappers/PosixLike/GenFds
trunk/BaseTools/BinWrappers/PosixLike/GenFfs
trunk/BaseTools/BinWrappers/PosixLike/GenFv
trunk/BaseTools/BinWrappers/PosixLike/GenFw
trunk/BaseTools/BinWrappers/PosixLike/GenPage
trunk/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
trunk/BaseTools/BinWrappers/PosixLike/GenSec
trunk/BaseTools/BinWrappers/PosixLike/GenVtf
trunk/BaseTools/BinWrappers/PosixLike/GnuGenBootSector
trunk/BaseTools/BinWrappers/PosixLike/LzmaCompress
trunk/BaseTools/BinWrappers/PosixLike/PatchPcdValue
trunk/BaseTools/BinWrappers/PosixLike/RunBinToolFromBuildDir
trunk/BaseTools/BinWrappers/PosixLike/RunToolFromSource
trunk/BaseTools/BinWrappers/PosixLike/Split
trunk/BaseTools/BinWrappers/PosixLike/TargetTool
trunk/BaseTools/BinWrappers/PosixLike/TianoCompress
trunk/BaseTools/BinWrappers/PosixLike/Trim
trunk/BaseTools/BinWrappers/PosixLike/UPT
trunk/BaseTools/BinWrappers/PosixLike/VfrCompile
trunk/BaseTools/BinWrappers/PosixLike/VolInfo
trunk/BaseTools/BinWrappers/PosixLike/build
Deleted: trunk/BaseTools/BinWrappers/Darwin-i386
===================================================================
--- trunk/BaseTools/BinWrappers/Darwin-i386 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/Darwin-i386 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link PosixLike
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/Darwin-x86_64
===================================================================
--- trunk/BaseTools/BinWrappers/Darwin-x86_64 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/Darwin-x86_64 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link PosixLike/
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/Linux-i686
===================================================================
--- trunk/BaseTools/BinWrappers/Linux-i686 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/Linux-i686 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link PosixLike
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/Linux-x86_64
===================================================================
--- trunk/BaseTools/BinWrappers/Linux-x86_64 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/Linux-x86_64 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link PosixLike
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/BPDG
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/BPDG 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/BPDG 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunToolFromSource
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/BootSectImage
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/BootSectImage 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/BootSectImage 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/BuildEnv
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/BuildEnv 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/BuildEnv 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunToolFromSource
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/Ecc
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/Ecc 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/Ecc 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunToolFromSource
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/EfiLdrImage
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/EfiLdrImage 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/EfiLdrImage 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/EfiRom
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/EfiRom 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/EfiRom 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/GenCrc32
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenCrc32 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenCrc32 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/GenFds
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenFds 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenFds 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunToolFromSource
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/GenFfs
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenFfs 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenFfs 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/GenFv
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenFv 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenFv 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/GenFw
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenFw 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenFw 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/GenPage
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenPage 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenPage 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunToolFromSource
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/GenSec
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenSec 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenSec 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/GenVtf
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GenVtf 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/GenVtf 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/GnuGenBootSector
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/GnuGenBootSector 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/GnuGenBootSector 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/LzmaCompress
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/LzmaCompress 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/LzmaCompress 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/PatchPcdValue
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/PatchPcdValue 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/PatchPcdValue 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunToolFromSource
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/RunBinToolFromBuildDir
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/RunBinToolFromBuildDir 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/RunBinToolFromBuildDir 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-#python `dirname $0`/RunToolFromSource.py `basename $0` $*
-#exec `dirname $0`/../../../../C/bin/`basename $0` $*
-
-TOOL_BASENAME=`basename $0`
-
-if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ]
-then
- exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME
-elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ]
-then
- if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ]
- then
- echo BaseTools C Tool binary was not found \($TOOL_BASENAME\)
- echo You may need to run:
- echo " make -C $EDK_TOOLS_PATH/Source/C"
- else
- exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $*
- fi
-elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ]
-then
- exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $*
-else
- echo Unable to find the real \'$TOOL_BASENAME\' to run
- echo This message was printed by
- echo " $0"
- exit -1
-fi
-
Deleted: trunk/BaseTools/BinWrappers/PosixLike/RunToolFromSource
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/RunToolFromSource 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/RunToolFromSource 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-#python `dirname $0`/RunToolFromSource.py `basename $0` $*
-PYTHONPATH="`dirname $0`/../../Source/Python" \
- python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py $*
-
Deleted: trunk/BaseTools/BinWrappers/PosixLike/Split
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/Split 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/Split 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/TargetTool
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/TargetTool 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/TargetTool 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunToolFromSource
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/TianoCompress
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/TianoCompress 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/TianoCompress 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/Trim
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/Trim 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/Trim 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunToolFromSource
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/UPT
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/UPT 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/UPT 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunToolFromSource
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/VfrCompile
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/VfrCompile 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/VfrCompile 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/VolInfo
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/VolInfo 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/VolInfo 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunBinToolFromBuildDir
\ No newline at end of file
Deleted: trunk/BaseTools/BinWrappers/PosixLike/build
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/build 2012-04-02 00:20:38 UTC (rev 2511)
+++ trunk/BaseTools/BinWrappers/PosixLike/build 2012-04-02 00:21:15 UTC (rev 2512)
@@ -1 +0,0 @@
-link RunToolFromSource
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jlj...@us...> - 2012-04-02 00:20:44
|
Revision: 2511
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2511&view=rev
Author: jljusten
Date: 2012-04-02 00:20:38 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
BaseTools/BuildEnv: Add BinWrappers/PosixLike in PATH
As before, we add a directory based on 'uname -sm' into
the path, but now we follow it with
BaseTools/BinWrappers/PosixLike. Since PosixLike is added
later in PATH, the 'uname -sm' path will take precedence.
Signed-off-by: Jordan Justen <jor...@in...>
Reviewed-by: Erik Bjorge <eri...@in...>
Modified Paths:
--------------
trunk/BaseTools/BuildEnv
Modified: trunk/BaseTools/BuildEnv
===================================================================
--- trunk/BaseTools/BuildEnv 2012-04-01 08:34:35 UTC (rev 2510)
+++ trunk/BaseTools/BuildEnv 2012-04-02 00:20:38 UTC (rev 2511)
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
# 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
@@ -160,6 +160,14 @@
echo $EDK_TOOLS_PATH_BIN
}
+AddDirToStartOfPath() {
+ DIRNAME=$1
+ PATH=$DIRNAME:$DIRNAME:$DIRNAME:$PATH
+ PATH=${PATH//$DIRNAME:/}
+ PATH=$DIRNAME:$PATH
+ export PATH
+}
+
AddEdkToolsToPath() {
#
@@ -172,19 +180,9 @@
EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory`
- if [ ! -e $EDK_TOOLS_PATH_BIN ]
- then
- echo "Unable to find expected bin path under \$EDK_TOOLS_PATH!"
- echo "> $EDK_TOOLS_PATH_BIN"
- return 1
- fi
+ AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike
+ AddDirToStartOfPath $EDK_TOOLS_PATH_BIN
- if [ "${PATH/$EDK_TOOLS_PATH_BIN/}" == "$PATH" ]
- then
- export PATH=$EDK_TOOLS_PATH_BIN:$PATH
- return 0
- fi
-
}
CopySingleTemplateFile() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2012-04-01 08:34:42
|
Revision: 2510
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2510&view=rev
Author: yingke
Date: 2012-04-01 08:34:35 +0000 (Sun, 01 Apr 2012)
Log Message:
-----------
Roll back 2509 to 2508. Changes of 2509 does more check for modules even if they are not used by current build arch.
Signed-off-by: Yingke Liu <yin...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
Modified: trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2012-03-31 08:08:58 UTC (rev 2509)
+++ trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2012-04-01 08:34:35 UTC (rev 2510)
@@ -287,23 +287,22 @@
if self.CapTargetList:
EdkLogger.info("No flash definition file found. Capsule [%s] will be ignored." % " ".join(self.CapTargetList))
self.CapTargetList = []
+
+ # apply SKU and inject PCDs from Flash Definition file
+ for Arch in self.ArchList:
+ Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
- # Collect all declared PCD to check if PCDs used in FDF and DSC are declared.
- AllDeclaredPcd = set()
- for Arch in self.Platform.SupArchList:
+ DecPcds = set()
PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)
Pkgs = PGen.PackageList
for Pkg in Pkgs:
for Pcd in Pkg.Pcds.keys():
- AllDeclaredPcd.add((Pcd[0], Pcd[1]))
+ DecPcds.add((Pcd[0], Pcd[1]))
+ Platform.IsPlatformPcdDeclared(DecPcds)
- # apply SKU and inject PCDs from Flash Definition file
- for Arch in self.ArchList:
- Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
- Platform.IsPlatformPcdDeclared(AllDeclaredPcd)
Platform.SkuName = self.SkuId
for Name, Guid in PcdSet:
- if (Name, Guid) not in AllDeclaredPcd:
+ if (Name, Guid) not in DecPcds:
EdkLogger.error(
'build',
PARSER_ERROR,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2012-03-31 08:09:05
|
Revision: 2509
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2509&view=rev
Author: yingke
Date: 2012-03-31 08:08:58 +0000 (Sat, 31 Mar 2012)
Log Message:
-----------
Check all PCD listed in DSC file, the PCD must be declared by DEC files which are referenced by modules listed in component sections.
Signed-off-by: yingke
Reviewed-by: lgao4
Modified Paths:
--------------
trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
Modified: trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2012-03-29 05:07:34 UTC (rev 2508)
+++ trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2012-03-31 08:08:58 UTC (rev 2509)
@@ -287,22 +287,23 @@
if self.CapTargetList:
EdkLogger.info("No flash definition file found. Capsule [%s] will be ignored." % " ".join(self.CapTargetList))
self.CapTargetList = []
-
- # apply SKU and inject PCDs from Flash Definition file
- for Arch in self.ArchList:
- Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
- DecPcds = set()
+ # Collect all declared PCD to check if PCDs used in FDF and DSC are declared.
+ AllDeclaredPcd = set()
+ for Arch in self.Platform.SupArchList:
PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)
Pkgs = PGen.PackageList
for Pkg in Pkgs:
for Pcd in Pkg.Pcds.keys():
- DecPcds.add((Pcd[0], Pcd[1]))
- Platform.IsPlatformPcdDeclared(DecPcds)
+ AllDeclaredPcd.add((Pcd[0], Pcd[1]))
+ # apply SKU and inject PCDs from Flash Definition file
+ for Arch in self.ArchList:
+ Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
+ Platform.IsPlatformPcdDeclared(AllDeclaredPcd)
Platform.SkuName = self.SkuId
for Name, Guid in PcdSet:
- if (Name, Guid) not in DecPcds:
+ if (Name, Guid) not in AllDeclaredPcd:
EdkLogger.error(
'build',
PARSER_ERROR,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2012-03-29 05:07:41
|
Revision: 2508
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2508&view=rev
Author: yingke
Date: 2012-03-29 05:07:34 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
Check if PCD name defined in DSC file is declared in DEC files.
Signed-off-by: yingke
Reviewed-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
Modified: trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2012-03-27 05:56:14 UTC (rev 2507)
+++ trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2012-03-29 05:07:34 UTC (rev 2508)
@@ -291,22 +291,24 @@
# apply SKU and inject PCDs from Flash Definition file
for Arch in self.ArchList:
Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
+
DecPcds = set()
- if PcdSet:
- PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)
- Pkgs = PGen.PackageList
- for Pkg in Pkgs:
- for Pcd in Pkg.Pcds.keys():
- DecPcds.add((Pcd[0], Pcd[1]))
+ PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)
+ Pkgs = PGen.PackageList
+ for Pkg in Pkgs:
+ for Pcd in Pkg.Pcds.keys():
+ DecPcds.add((Pcd[0], Pcd[1]))
+ Platform.IsPlatformPcdDeclared(DecPcds)
+
Platform.SkuName = self.SkuId
for Name, Guid in PcdSet:
if (Name, Guid) not in DecPcds:
EdkLogger.error(
'build',
- FORMAT_INVALID,
- "PCD (%s.%s) used in FDF is not declared in DEC files. FDF file: %s, line #: %d." % \
- (Guid, Name, self.FdfProfile.PcdFileLineDict[Name, Guid][0], self.FdfProfile.PcdFileLineDict[Name, Guid][1]),
- ExtraData=None
+ PARSER_ERROR,
+ "PCD (%s.%s) used in FDF is not declared in DEC files." % (Guid, Name),
+ File = self.FdfProfile.PcdFileLineDict[Name, Guid][0],
+ Line = self.FdfProfile.PcdFileLineDict[Name, Guid][1]
)
Platform.AddPcd(Name, Guid, PcdSet[Name, Guid])
Modified: trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
===================================================================
--- trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py 2012-03-27 05:56:14 UTC (rev 2507)
+++ trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py 2012-03-29 05:07:34 UTC (rev 2508)
@@ -842,6 +842,17 @@
self.Pcds[Name, Guid] = PcdClassObject(Name, Guid, '', '', '', '', '', {}, False, None)
self.Pcds[Name, Guid].DefaultValue = Value
+ def IsPlatformPcdDeclared(self, DecPcds):
+ for PcdType in (MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE, MODEL_PCD_FEATURE_FLAG,
+ MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_HII, MODEL_PCD_DYNAMIC_VPD,
+ MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_DYNAMIC_EX_HII, MODEL_PCD_DYNAMIC_EX_VPD):
+ RecordList = self._RawData[PcdType, self._Arch]
+ for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList:
+ if (PcdCName, TokenSpaceGuid) not in DecPcds:
+ EdkLogger.error('build', PARSER_ERROR,
+ "Pcd (%s.%s) defined in DSC is not declared in DEC files." % (TokenSpaceGuid, PcdCName),
+ File=self.MetaFile, Line=Dummy4)
+
_Macros = property(_GetMacros)
Arch = property(_GetArch, _SetArch)
Platform = property(_GetPlatformName)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lg...@us...> - 2012-03-27 05:56:21
|
Revision: 2507
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2507&view=rev
Author: lgao4
Date: 2012-03-27 05:56:14 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
Add LzmaF86Compress tool to only use the standard options.
Signed-off-by: Liming Gao <lim...@in...>
Reviewed-by: Larry Hauch <lar...@in...>
Modified Paths:
--------------
trunk/BaseTools/Conf/tools_def.template
trunk/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
Added Paths:
-----------
trunk/BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaF86Compress
trunk/BaseTools/BinWrappers/PosixLike/LzmaF86Compress
Added: trunk/BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaF86Compress
===================================================================
--- trunk/BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaF86Compress (rev 0)
+++ trunk/BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaF86Compress 2012-03-27 05:56:14 UTC (rev 2507)
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# This script will exec LzmaCompress tool with --f86 option that enables converter for x86 code.
+#
+# Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
+# 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.
+#
+
+for arg in $*; do
+ if [ "arg" = "-e" -o "arg" = "-d" ]; then
+ FLAG=--f86
+ break;
+ fi
+done
+
+LzmaCompress $* $FLAG
Property changes on: trunk/BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaF86Compress
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/BaseTools/BinWrappers/PosixLike/LzmaF86Compress
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/LzmaF86Compress (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/LzmaF86Compress 2012-03-27 05:56:14 UTC (rev 2507)
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# This script will exec LzmaCompress tool with --f86 option that enables converter for x86 code.
+#
+# Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
+# 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.
+#
+
+for arg in $*; do
+ if [ "arg" = "-e" -o "arg" = "-d" ]; then
+ FLAG=--f86
+ break;
+ fi
+done
+
+LzmaCompress $* $FLAG
Property changes on: trunk/BaseTools/BinWrappers/PosixLike/LzmaF86Compress
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template 2012-03-23 07:00:57 UTC (rev 2506)
+++ trunk/BaseTools/Conf/tools_def.template 2012-03-27 05:56:14 UTC (rev 2507)
@@ -4370,13 +4370,12 @@
*_*_*_LZMA_GUID = EE4E5898-3914-4259-9D6E-DC7BD79403CF
##################
-# LzmaCompress tool definitions with converter for x86 code.
+# LzmaF86Compress tool definitions with converter for x86 code.
# It can improve the compression ratio if the input file is IA32 or X64 PE image.
# Notes: If X64 PE image is built based on GCC44, it may not get the better compression.
##################
-*_*_*_LZMAF86_PATH = LzmaCompress
+*_*_*_LZMAF86_PATH = LzmaF86Compress
*_*_*_LZMAF86_GUID = D42AE6BD-1352-4bfb-909A-CA72A6EAE889
-*_*_*_LZMAF86_FLAGS = --f86
##################
# TianoCompress tool definitions
Modified: trunk/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py 2012-03-23 07:00:57 UTC (rev 2506)
+++ trunk/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py 2012-03-27 05:56:14 UTC (rev 2507)
@@ -1,7 +1,7 @@
## @file
# Global variables for GenFds
#
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -581,7 +581,7 @@
sys.stdout.write('\n')
try:
- PopenObject = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr= subprocess.PIPE)
+ PopenObject = subprocess.Popen(' '.join(cmd), stdout=subprocess.PIPE, stderr= subprocess.PIPE, shell=True)
except Exception, X:
EdkLogger.error("GenFds", COMMAND_FAILURE, ExtraData="%s: %s" % (str(X), cmd[0]))
(out, error) = PopenObject.communicate()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2012-03-23 07:01:03
|
Revision: 2506
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2506&view=rev
Author: yingke
Date: 2012-03-23 07:00:57 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Check if PCD name used in FDF file is declared in DEC files.
Signed-off-by: yingke
Reviewed-by: lgao4
Modified Paths:
--------------
trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
Modified: trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2012-03-23 06:59:21 UTC (rev 2505)
+++ trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2012-03-23 07:00:57 UTC (rev 2506)
@@ -291,8 +291,23 @@
# apply SKU and inject PCDs from Flash Definition file
for Arch in self.ArchList:
Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
+ DecPcds = set()
+ if PcdSet:
+ PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)
+ Pkgs = PGen.PackageList
+ for Pkg in Pkgs:
+ for Pcd in Pkg.Pcds.keys():
+ DecPcds.add((Pcd[0], Pcd[1]))
Platform.SkuName = self.SkuId
for Name, Guid in PcdSet:
+ if (Name, Guid) not in DecPcds:
+ EdkLogger.error(
+ 'build',
+ FORMAT_INVALID,
+ "PCD (%s.%s) used in FDF is not declared in DEC files. FDF file: %s, line #: %d." % \
+ (Guid, Name, self.FdfProfile.PcdFileLineDict[Name, Guid][0], self.FdfProfile.PcdFileLineDict[Name, Guid][1]),
+ ExtraData=None
+ )
Platform.AddPcd(Name, Guid, PcdSet[Name, Guid])
Pa = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yi...@us...> - 2012-03-23 06:59:27
|
Revision: 2505
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2505&view=rev
Author: yingke
Date: 2012-03-23 06:59:21 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Report readable error message if invalid PCD is used in conditional directive.
Signed-off-by: yingke
Reviewed-by: lgao4
Reviewed-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Source/Python/Common/Expression.py
trunk/BaseTools/Source/Python/Common/GlobalData.py
trunk/BaseTools/Source/Python/GenFds/FdfParser.py
trunk/BaseTools/Source/Python/Workspace/MetaFileParser.py
Modified: trunk/BaseTools/Source/Python/Common/Expression.py
===================================================================
--- trunk/BaseTools/Source/Python/Common/Expression.py 2012-03-16 09:20:30 UTC (rev 2504)
+++ trunk/BaseTools/Source/Python/Common/Expression.py 2012-03-23 06:59:21 UTC (rev 2505)
@@ -465,7 +465,9 @@
# PCD token
if self.PcdPattern.match(self._Token):
if self._Token not in self._Symb:
- raise BadExpression(ERR_PCD_RESOLVE % self._Token)
+ Ex = BadExpression(ERR_PCD_RESOLVE % self._Token)
+ Ex.Pcd = self._Token
+ raise Ex
self._Token = ValueExpression(self._Symb[self._Token], self._Symb)(True)
if type(self._Token) != type(''):
self._LiteralToken = hex(self._Token)
Modified: trunk/BaseTools/Source/Python/Common/GlobalData.py
===================================================================
--- trunk/BaseTools/Source/Python/Common/GlobalData.py 2012-03-16 09:20:30 UTC (rev 2504)
+++ trunk/BaseTools/Source/Python/Common/GlobalData.py 2012-03-23 06:59:21 UTC (rev 2505)
@@ -26,7 +26,10 @@
gGlobalDefines = {}
gPlatformDefines = {}
+# PCD name and value pair for fixed at build and feature flag
gPlatformPcds = {}
+# PCDs with type that are not fixed at build and feature flag
+gPlatformOtherPcds = {}
gActivePlatform = None
gCommandLineDefines = {}
gEdkGlobal = {}
Modified: trunk/BaseTools/Source/Python/GenFds/FdfParser.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/FdfParser.py 2012-03-16 09:20:30 UTC (rev 2504)
+++ trunk/BaseTools/Source/Python/GenFds/FdfParser.py 2012-03-23 06:59:21 UTC (rev 2505)
@@ -853,7 +853,19 @@
Line=Line)
return Excpt.result
except Exception, Excpt:
- raise Warning("Invalid expression", *FileLineTuple)
+ if hasattr(Excpt, 'Pcd'):
+ if Excpt.Pcd in GlobalData.gPlatformOtherPcds:
+ Info = GlobalData.gPlatformOtherPcds[Excpt.Pcd]
+ raise Warning("Cannot use this PCD (%s) in an expression as"
+ " it must be defined in a [PcdsFixedAtBuild] or [PcdsFeatureFlag] section"
+ " of the DSC file (%s), and it is currently defined in this section:"
+ " %s, line #: %d." % (Excpt.Pcd, GlobalData.gPlatformOtherPcds['DSCFILE'], Info[0], Info[1]),
+ *FileLineTuple)
+ else:
+ raise Warning("PCD (%s) is not defined in DSC file (%s)" % (Excpt.Pcd, GlobalData.gPlatformOtherPcds['DSCFILE']),
+ *FileLineTuple)
+ else:
+ raise Warning(str(Excpt), *FileLineTuple)
else:
if Expression.startswith('$(') and Expression[-1] == ')':
Expression = Expression[2:-1]
Modified: trunk/BaseTools/Source/Python/Workspace/MetaFileParser.py
===================================================================
--- trunk/BaseTools/Source/Python/Workspace/MetaFileParser.py 2012-03-16 09:20:30 UTC (rev 2504)
+++ trunk/BaseTools/Source/Python/Workspace/MetaFileParser.py 2012-03-23 06:59:21 UTC (rev 2505)
@@ -1185,9 +1185,23 @@
# Only catch expression evaluation error here. We need to report
# the precise number of line on which the error occurred
#
- EdkLogger.error('Parser', FORMAT_INVALID, "Invalid expression: %s" % str(Excpt),
- File=self._FileWithError, ExtraData=' '.join(self._ValueList),
- Line=self._LineIndex+1)
+ if hasattr(Excpt, 'Pcd'):
+ if Excpt.Pcd in GlobalData.gPlatformOtherPcds:
+ Info = GlobalData.gPlatformOtherPcds[Excpt.Pcd]
+ EdkLogger.error('Parser', FORMAT_INVALID, "Cannot use this PCD (%s) in an expression as"
+ " it must be defined in a [PcdsFixedAtBuild] or [PcdsFeatureFlag] section"
+ " of the DSC file, and it is currently defined in this section:"
+ " %s, line #: %d." % (Excpt.Pcd, Info[0], Info[1]),
+ File=self._FileWithError, ExtraData=' '.join(self._ValueList),
+ Line=self._LineIndex+1)
+ else:
+ EdkLogger.error('Parser', FORMAT_INVALID, "PCD (%s) is not defined in DSC file" % Excpt.Pcd,
+ File=self._FileWithError, ExtraData=' '.join(self._ValueList),
+ Line=self._LineIndex+1)
+ else:
+ EdkLogger.error('Parser', FORMAT_INVALID, "Invalid expression: %s" % str(Excpt),
+ File=self._FileWithError, ExtraData=' '.join(self._ValueList),
+ Line=self._LineIndex+1)
except MacroException, Excpt:
EdkLogger.error('Parser', FORMAT_INVALID, str(Excpt),
File=self._FileWithError, ExtraData=' '.join(self._ValueList),
@@ -1246,6 +1260,20 @@
Name = TokenSpaceGuid + '.' + PcdName
self._Symbols[Name] = Value
+ Content = open(str(self.MetaFile), 'r').readlines()
+ GlobalData.gPlatformOtherPcds['DSCFILE'] = str(self.MetaFile)
+ for PcdType in (MODEL_PCD_PATCHABLE_IN_MODULE, MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_HII,
+ MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_DYNAMIC_EX_HII,
+ MODEL_PCD_DYNAMIC_EX_VPD):
+ Records = self._RawTable.Query(PcdType, BelongsToItem=-1.0)
+ for TokenSpaceGuid,PcdName,Value,Dummy2,Dummy3,ID,Line in Records:
+ Name = TokenSpaceGuid + '.' + PcdName
+ if Name not in GlobalData.gPlatformOtherPcds:
+ PcdLine = Line
+ while not Content[Line - 1].lstrip().startswith(TAB_SECTION_START):
+ Line -= 1
+ GlobalData.gPlatformOtherPcds[Name] = (CleanString(Content[Line - 1]), PcdLine, PcdType)
+
def __ProcessDefine(self):
if not self._Enabled:
return
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
