sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync EDKII BaseTools to BaseTools project r2100.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11118 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4
2010-12-06 05:17:09 +00:00
parent 6a55eea3eb
commit 641370270f
21 changed files with 84 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
BaseTools/Source/C/Common/ParseInf.c
View File

@@ -506,11 +506,19 @@ Returns:
//
// Add each character to the result
//
if (IsHex || (AsciiString[Index] == '0' && (AsciiString[Index + 1] == 'x' || AsciiString[Index + 1] == 'X'))) {
//
// Skip first two chars only if the string starts with '0x' or '0X'
//
if (AsciiString[Index] == '0' && (AsciiString[Index + 1] == 'x' || AsciiString[Index + 1] == 'X')) {
IsHex = TRUE;
Index += 2;
}
if (IsHex) {
//
// Convert the hex string.
//
for (Index = Index + 2; AsciiString[Index] != '\0'; Index++) {
for (; AsciiString[Index] != '\0'; Index++) {
CurrentChar = AsciiString[Index];
if (CurrentChar == ' ') {
break;

2
BaseTools/Source/C/VfrCompile/Makefile
View File

@@ -12,7 +12,7 @@
#
!INCLUDE ..\Makefiles\ms.common
CPPFLAGS = $(CPPFLAGS) /WX /D PCCTS_USE_NAMESPACE_STD /D VFREXP_DEBUG
CPPFLAGS = $(CPPFLAGS) /WX /D PCCTS_USE_NAMESPACE_STD
APPNAME = VfrCompile
LIBS = $(LIB_PATH)\Common.lib

9
BaseTools/Source/Python/AutoGen/GenMake.py
View File

@@ -448,7 +448,7 @@ cleanlib:
% (self._AutoGenObject.BuildTarget, self._AutoGenObject.ToolChain, self._AutoGenObject.Arch),
ExtraData="[%s]" % str(self._AutoGenObject))
# convert dependent libaries to build command
# convert dependent libraries to build command
self.ProcessDependentLibrary()
if len(self._AutoGenObject.Module.ModuleEntryPointList) > 0:
ModuleEntryPoint = self._AutoGenObject.Module.ModuleEntryPointList[0]
@@ -632,7 +632,7 @@ cleanlib:
if DepSet == None:
DepSet = set()
#
# Extract comman files list in the dependency files
# Extract common files list in the dependency files
#
for File in DepSet:
self.CommonFileDependency.append(self.PlaceMacro(File.Path, self.Macros))
@@ -728,6 +728,9 @@ cleanlib:
gDependencyDatabase[self._AutoGenObject.Arch] = {}
DepDb = gDependencyDatabase[self._AutoGenObject.Arch]
# add path of given source file into search path list.
if File.Dir not in SearchPathList:
SearchPathList.append(File.Dir)
while len(FileStack) > 0:
F = FileStack.pop()
@@ -777,7 +780,7 @@ cleanlib:
FileStack.append(FilePath)
break
else:
EdkLogger.debug(EdkLogger.DEBUG_9, "%s included by %s was not found"\
EdkLogger.debug(EdkLogger.DEBUG_9, "%s included by %s was not found "\
"in any given path:\n\t%s" % (Inc, F, "\n\t".join(SearchPathList)))
if not MacroUsedByIncludedFile: