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: <yi...@us...> - 2012-01-13 05:52:29
|
Revision: 2479
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2479&view=rev
Author: yingke
Date: 2012-01-13 05:52:23 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
Add ARCH, FAMILY, TOOL_CHAIN_TAG, TARGET as highest priority macros which can be used in FDF and DSC file.
Signed-off-by: yingke
Reviewed-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Source/Python/build/build.py
Modified: trunk/BaseTools/Source/Python/build/build.py
===================================================================
--- trunk/BaseTools/Source/Python/build/build.py 2012-01-12 13:11:16 UTC (rev 2478)
+++ trunk/BaseTools/Source/Python/build/build.py 2012-01-13 05:52:23 UTC (rev 2479)
@@ -1809,6 +1809,19 @@
EdkLogger.error("build", OPTION_VALUE_INVALID, "UNI flag must be one of -c or -s")
MyBuild = Build(Target, Workspace, Option)
+ GlobalData.gCommandLineDefines['ARCH'] = ' '.join(MyBuild.ArchList)
+ GlobalData.gCommandLineDefines['TOOL_CHAIN_TAG'] = ' '.join(MyBuild.ToolChainList)
+ FamilyList = []
+ for ToolChain in MyBuild.ToolChainList:
+ Family = 'MSFT'
+ try:
+ Family = MyBuild.ToolDef.ToolsDefTxtDatabase[TAB_TOD_DEFINES_FAMILY][ToolChain]
+ except KeyError:
+ pass
+ if Family not in FamilyList:
+ FamilyList.append(Family)
+ GlobalData.gCommandLineDefines['FAMILY'] = ' '.join(FamilyList)
+ GlobalData.gCommandLineDefines['TARGET'] = ' '.join(MyBuild.BuildTargetList)
MyBuild.Launch()
#MyBuild.DumpBuildData()
except FatalError, X:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yd...@us...> - 2012-01-12 13:11:27
|
Revision: 2478
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2478&view=rev
Author: ydong10
Date: 2012-01-12 13:11:16 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
Correct definition to follow spec.
Signed-off-by: ydong10
Reviewed-by: lgao4
Modified Paths:
--------------
trunk/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
Modified: trunk/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
===================================================================
--- trunk/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h 2012-01-10 02:12:06 UTC (rev 2477)
+++ trunk/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h 2012-01-12 13:11:16 UTC (rev 2478)
@@ -3,7 +3,7 @@
IFR is primarily consumed by the EFI presentation engine, and produced by EFI
internal application and drivers as well as all add-in card option-ROM drivers
- Copyright (c) 2006 - 2010, 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
@@ -613,7 +613,7 @@
#define EFI_IFR_INCONSISTENT_IF_OP 0x11
#define EFI_IFR_EQ_ID_VAL_OP 0x12
#define EFI_IFR_EQ_ID_ID_OP 0x13
-#define EFI_IFR_EQ_ID_LIST_OP 0x14
+#define EFI_IFR_EQ_ID_VAL_LIST_OP 0x14
#define EFI_IFR_AND_OP 0x15
#define EFI_IFR_OR_OP 0x16
#define EFI_IFR_NOT_OP 0x17
Modified: trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp 2012-01-10 02:12:06 UTC (rev 2477)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp 2012-01-12 13:11:16 UTC (rev 2478)
@@ -2,7 +2,7 @@
The definition of CFormPkg's member function
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 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
@@ -963,7 +963,7 @@
switch (OpCode) {
case EFI_IFR_EQ_ID_VAL_OP:
case EFI_IFR_EQ_ID_ID_OP:
- case EFI_IFR_EQ_ID_LIST_OP:
+ case EFI_IFR_EQ_ID_VAL_LIST_OP:
case EFI_IFR_QUESTION_REF1_OP:
return TRUE;
default:
Modified: trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.h 2012-01-10 02:12:06 UTC (rev 2477)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.h 2012-01-12 13:11:16 UTC (rev 2478)
@@ -2,7 +2,7 @@
The definition of CFormPkg's member function
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 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
@@ -1885,8 +1885,8 @@
public:
CIfrEqIdList (
IN UINT32 LineNo
- ) : CIfrObj (EFI_IFR_EQ_ID_LIST_OP, (CHAR8 **)&mEqIdVList, sizeof (EFI_IFR_EQ_ID_VAL_LIST), TRUE),
- CIfrOpHeader (EFI_IFR_EQ_ID_LIST_OP, &mEqIdVList->Header) {
+ ) : CIfrObj (EFI_IFR_EQ_ID_VAL_LIST_OP, (CHAR8 **)&mEqIdVList, sizeof (EFI_IFR_EQ_ID_VAL_LIST), TRUE),
+ CIfrOpHeader (EFI_IFR_EQ_ID_VAL_LIST_OP, &mEqIdVList->Header) {
SetLineNo (LineNo);
mEqIdVList->QuestionId = EFI_QUESTION_ID_INVALID;
mEqIdVList->ListLength = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gi...@us...> - 2012-01-10 02:12:13
|
Revision: 2477
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2477&view=rev
Author: gikidy
Date: 2012-01-10 02:12:06 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
Fix invalid linker option /MACHINE:I386 for VS2005_IA32_DLINK_FLAGS in tools_def.template file.
Signed-off-by: gikidy
Reviewed-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Conf/tools_def.template
Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template 2012-01-04 08:48:29 UTC (rev 2476)
+++ trunk/BaseTools/Conf/tools_def.template 2012-01-10 02:12:06 UTC (rev 2477)
@@ -727,9 +727,9 @@
RELEASE_VS2005_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd
NOOPT_VS2005_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
- DEBUG_VS2005_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_VS2005_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
-NOOPT_VS2005_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
+ DEBUG_VS2005_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_VS2005_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_VS2005_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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2012-01-04 08:48:36
|
Revision: 2476
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2476&view=rev
Author: jsu1
Date: 2012-01-04 08:48:29 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
Correct support for section type of SUBTYPE_GUID for GenFds
Reviewed-by: gikidy
Signed-off-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Source/Python/GenFds/Ffs.py
Modified: trunk/BaseTools/Source/Python/GenFds/Ffs.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/Ffs.py 2012-01-04 06:21:42 UTC (rev 2475)
+++ trunk/BaseTools/Source/Python/GenFds/Ffs.py 2012-01-04 08:48:29 UTC (rev 2476)
@@ -64,6 +64,7 @@
'COMPAT16' : '.com16',
'RAW' : '.raw',
'FREEFORM_SUBTYPE_GUID': '.guid',
+ 'SUBTYPE_GUID' : '.guid',
'FV_IMAGE' : 'fv.sec',
'COMPRESS' : '.com',
'GUIDED' : '.guided',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2012-01-04 06:21:49
|
Revision: 2475
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2475&view=rev
Author: jsu1
Date: 2012-01-04 06:21:42 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
Add check for the six compulsory items for DSC
Reviewed-by: gikidy
Signed-off-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
Modified: trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
===================================================================
--- trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py 2011-12-16 08:04:00 UTC (rev 2474)
+++ trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py 2012-01-04 06:21:42 UTC (rev 2475)
@@ -262,7 +262,7 @@
if self._Header == None:
self._GetHeaderInfo()
if self._Guid == None:
- EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No FILE_GUID", File=self.MetaFile)
+ EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No PLATFORM_GUID", File=self.MetaFile)
return self._Guid
## Retrieve platform version
@@ -271,7 +271,7 @@
if self._Header == None:
self._GetHeaderInfo()
if self._Version == None:
- self._Version = ''
+ EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No PLATFORM_VERSION", File=self.MetaFile)
return self._Version
## Retrieve platform description file version
@@ -280,7 +280,7 @@
if self._Header == None:
self._GetHeaderInfo()
if self._DscSpecification == None:
- self._DscSpecification = ''
+ EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No DSC_SPECIFICATION", File=self.MetaFile)
return self._DscSpecification
## Retrieve OUTPUT_DIRECTORY
@@ -298,7 +298,7 @@
if self._Header == None:
self._GetHeaderInfo()
if self._SupArchList == None:
- self._SupArchList = ARCH_LIST
+ EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No SUPPORTED_ARCHITECTURES", File=self.MetaFile)
return self._SupArchList
## Retrieve BUILD_TARGETS
@@ -307,7 +307,7 @@
if self._Header == None:
self._GetHeaderInfo()
if self._BuildTargets == None:
- self._BuildTargets = ['DEBUG', 'RELEASE', 'NOOPT']
+ EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No BUILD_TARGETS", File=self.MetaFile)
return self._BuildTargets
## Retrieve SKUID_IDENTIFIER
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2011-12-16 08:04:09
|
Revision: 2474
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2474&view=rev
Author: jsu1
Date: 2011-12-16 08:04:00 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Add copyright info to buildversion files
Reviewed-by: hchen30
Signed-off-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Source/C/Include/Common/BuildVersion.h
trunk/BaseTools/Source/Python/Common/BuildVersion.py
Modified: trunk/BaseTools/Source/C/Include/Common/BuildVersion.h
===================================================================
--- trunk/BaseTools/Source/C/Include/Common/BuildVersion.h 2011-12-16 05:48:46 UTC (rev 2473)
+++ trunk/BaseTools/Source/C/Include/Common/BuildVersion.h 2011-12-16 08:04:00 UTC (rev 2474)
@@ -1,3 +1,17 @@
-//This file is for build version number auto generation
-//
+/** @file
+ This file is for build version number auto generation
+
+ Copyright (c) 2011, 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.
+
+ File Name: BuildVersion.h
+
+**/
+
#define __BUILD_VERSION ""
Modified: trunk/BaseTools/Source/Python/Common/BuildVersion.py
===================================================================
--- trunk/BaseTools/Source/Python/Common/BuildVersion.py 2011-12-16 05:48:46 UTC (rev 2473)
+++ trunk/BaseTools/Source/Python/Common/BuildVersion.py 2011-12-16 08:04:00 UTC (rev 2474)
@@ -1,3 +1,16 @@
-#This file is for build version number auto generation
+## @file
#
+# This file is for build version number auto generation
+#
+# Copyright (c) 2011, 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.
+#
+
gBUILD_VERSION = ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2011-12-16 05:48:52
|
Revision: 2473
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2473&view=rev
Author: jsu1
Date: 2011-12-16 05:48:46 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Update UPT to fix the issue that reported by pylint
Reviewed-by: hchen30
Signed-off-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Source/Python/UPT/BuildVersion.py
trunk/BaseTools/Source/Python/UPT/Library/String.py
Modified: trunk/BaseTools/Source/Python/UPT/BuildVersion.py
===================================================================
--- trunk/BaseTools/Source/Python/UPT/BuildVersion.py 2011-12-16 03:16:40 UTC (rev 2472)
+++ trunk/BaseTools/Source/Python/UPT/BuildVersion.py 2011-12-16 05:48:46 UTC (rev 2473)
@@ -1,3 +1,20 @@
-#This file is for build version number auto generation
+## @file
#
+# This file is for build version number auto generation
+#
+# Copyright (c) 2011, 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.
+#
+
+'''
+Build version information
+'''
+
gBUILD_VERSION = ""
Modified: trunk/BaseTools/Source/Python/UPT/Library/String.py
===================================================================
--- trunk/BaseTools/Source/Python/UPT/Library/String.py 2011-12-16 03:16:40 UTC (rev 2472)
+++ trunk/BaseTools/Source/Python/UPT/Library/String.py 2011-12-16 05:48:46 UTC (rev 2473)
@@ -643,35 +643,6 @@
def ConvertToSqlString2(String):
return String.replace("'", "''")
-## RemoveBlockComment
-#
-# Remove comment block
-#
-# @param Lines: Block Comment Lines
-#
-def RemoveBlockComment(Lines):
- IsFindBlockComment = False
- ReservedLine = ''
- NewLines = []
-
- for Line in Lines:
- Line = Line.strip()
- #
- # Remove comment block
- #
- if Line.find(DataType.TAB_COMMENT_EDK1_START) > -1:
- ReservedLine = GetSplitList(Line, DataType.TAB_COMMENT_EDK1_START, 1)[0]
- IsFindBlockComment = True
- if Line.find(DataType.TAB_COMMENT_EDK1_END) > -1:
- Line = ReservedLine + GetSplitList(Line, DataType.TAB_COMMENT_EDK1_END, 1)[1]
- ReservedLine = ''
- IsFindBlockComment = False
- if IsFindBlockComment:
- NewLines.append('')
- continue
- NewLines.append(Line)
- return NewLines
-
## GetStringOfList
#
# Get String of a List
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gi...@us...> - 2011-12-16 03:16:46
|
Revision: 2472
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2472&view=rev
Author: gikidy
Date: 2011-12-16 03:16:40 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Fix an issue while using !ifdef in FDF file.
Signed-off-by: gikidy
Reviewed-by: lgao4
Modified Paths:
--------------
trunk/BaseTools/Source/Python/GenFds/FdfParser.py
Modified: trunk/BaseTools/Source/Python/GenFds/FdfParser.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/FdfParser.py 2011-12-15 03:32:45 UTC (rev 2471)
+++ trunk/BaseTools/Source/Python/GenFds/FdfParser.py 2011-12-16 03:16:40 UTC (rev 2472)
@@ -679,7 +679,7 @@
PreIndex = 0
StartPos = CurLine.find('$(', PreIndex)
EndPos = CurLine.find(')', StartPos+2)
- while StartPos != -1 and EndPos != -1 and not (self.__Token == 'ifdef' or self.__Token == '!ifndef'):
+ while StartPos != -1 and EndPos != -1 and not (self.__Token == '!ifdef' or self.__Token == '!ifndef'):
MacroName = CurLine[StartPos+2 : EndPos]
MacorValue = self.__GetMacroValue(MacroName)
if MacorValue != None:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2011-12-15 03:32:52
|
Revision: 2471
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2471&view=rev
Author: jsu1
Date: 2011-12-15 03:32:45 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Update UPT to fix the issue that the distribution stored in Conf\upt will have two periods if get renamed during install
Reviewed-by: gikidy
Signed-off-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Source/Python/UPT/InstallPkg.py
Modified: trunk/BaseTools/Source/Python/UPT/InstallPkg.py
===================================================================
--- trunk/BaseTools/Source/Python/UPT/InstallPkg.py 2011-12-15 02:48:25 UTC (rev 2470)
+++ trunk/BaseTools/Source/Python/UPT/InstallPkg.py 2011-12-15 03:32:45 UTC (rev 2471)
@@ -403,7 +403,7 @@
DestFile = os.path.normpath(os.path.join(DestDir, DistFileName))
if os.path.exists(DestFile):
FileName, Ext = os.path.splitext(DistFileName)
- NewFileName = FileName + '_' + DistPkg.Header.GetGuid() + '_' + DistPkg.Header.GetVersion() + '.' + Ext
+ NewFileName = FileName + '_' + DistPkg.Header.GetGuid() + '_' + DistPkg.Header.GetVersion() + Ext
DestFile = os.path.normpath(os.path.join(DestDir, NewFileName))
if os.path.exists(DestFile):
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2011-12-15 02:48:32
|
Revision: 2470
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2470&view=rev
Author: jsu1
Date: 2011-12-15 02:48:25 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Update UPT to fix the issue that creating distribution twice will get different entry sequence in xml for INF binaries section
Reviewed-by: gikidy
Signed-off-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
Modified: trunk/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
===================================================================
--- trunk/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py 2011-12-14 09:00:33 UTC (rev 2469)
+++ trunk/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py 2011-12-15 02:48:25 UTC (rev 2470)
@@ -750,7 +750,6 @@
BinaryObj = self.Parser.InfBinariesSection.GetBinary()
BinaryData = BinaryObj.keys()
- BinaryData.sort()
#
# If the INF file does not contain a [Sources] section, and the INF file does contain a [Binaries] section,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2011-12-14 09:00:44
|
Revision: 2469
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2469&view=rev
Author: jsu1
Date: 2011-12-14 09:00:33 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Update UPT to report error if there is no head comment section or head comment section missing in INF
Reviewed-by: gikidy
Signed-off-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Source/Python/UPT/Parser/InfParser.py
Modified: trunk/BaseTools/Source/Python/UPT/Parser/InfParser.py
===================================================================
--- trunk/BaseTools/Source/Python/UPT/Parser/InfParser.py 2011-12-14 07:25:26 UTC (rev 2468)
+++ trunk/BaseTools/Source/Python/UPT/Parser/InfParser.py 2011-12-14 09:00:33 UTC (rev 2469)
@@ -339,7 +339,7 @@
#
# Found the first section, No file header.
#
- if not DefineSectionParsedFlag:
+ if DefineSectionParsedFlag and not HeaderCommentEnd:
Logger.Error("InfParser",
FORMAT_INVALID,
ST.ERR_INF_PARSER_HEADER_MISSGING,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2011-12-14 07:25:35
|
Revision: 2468
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2468&view=rev
Author: jsu1
Date: 2011-12-14 07:25:26 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Fix UPT install windows distribution under linux will fail as backward slash \ is in path
Signed-off-by: jsu1
Reviewed-by: gikidy
Modified Paths:
--------------
trunk/BaseTools/Source/Python/UPT/Library/ParserValidate.py
Modified: trunk/BaseTools/Source/Python/UPT/Library/ParserValidate.py
===================================================================
--- trunk/BaseTools/Source/Python/UPT/Library/ParserValidate.py 2011-12-13 08:53:07 UTC (rev 2467)
+++ trunk/BaseTools/Source/Python/UPT/Library/ParserValidate.py 2011-12-14 07:25:26 UTC (rev 2468)
@@ -286,7 +286,7 @@
if os.path.isabs(Path):
return False
else:
- if Path[1:2] == ':' or Path.find('\\') >=0:
+ if Path[1:2] == ':':
return False
if os.path.isabs(Path):
return False
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gi...@us...> - 2011-12-13 08:53:13
|
Revision: 2467
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2467&view=rev
Author: gikidy
Date: 2011-12-13 08:53:07 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Fix an issue of help information on build arch is not accurate.
Signed-off-by: gikidy
Reviewed-by: lgao4
Modified Paths:
--------------
trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
trunk/BaseTools/Source/Python/build/build.py
Modified: trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2011-12-13 05:47:26 UTC (rev 2466)
+++ trunk/BaseTools/Source/Python/AutoGen/AutoGen.py 2011-12-13 08:53:07 UTC (rev 2467)
@@ -173,7 +173,8 @@
# @param SkuId SKU id from command line
#
def _Init(self, WorkspaceDir, ActivePlatform, Target, Toolchain, ArchList, MetaFileDb,
- BuildConfig, ToolDefinition, FlashDefinitionFile='', Fds=None, Fvs=None, Caps=None, SkuId='', UniFlag=None):
+ BuildConfig, ToolDefinition, FlashDefinitionFile='', Fds=None, Fvs=None, Caps=None, SkuId='', UniFlag=None,
+ Progress=None, BuildModule=None):
if Fds is None:
Fds = []
if Fvs is None:
@@ -236,8 +237,25 @@
# parse FDF file to get PCDs in it, if any
if not self.FdfFile:
self.FdfFile = self.Platform.FlashDefinition
+
+ EdkLogger.info("")
+ if self.ArchList:
+ EdkLogger.info('%-16s = %s' % ("Architecture(s)", ' '.join(self.ArchList)))
+ EdkLogger.info('%-16s = %s' % ("Build target", self.BuildTarget))
+ EdkLogger.info('%-16s = %s' % ("Toolchain",self.ToolChain))
+
+ EdkLogger.info('\n%-24s = %s' % ("Active Platform", self.Platform))
+ if BuildModule:
+ EdkLogger.info('%-24s = %s' % ("Active Module", BuildModule))
+
+ if self.FdfFile:
+ EdkLogger.info('%-24s = %s' % ("Flash Image Definition", self.FdfFile))
+
EdkLogger.verbose("\nFLASH_DEFINITION = %s" % self.FdfFile)
-
+
+ if Progress:
+ Progress.Start("\nProcessing meta-data")
+
if self.FdfFile:
#
# Mark now build in AutoGen Phase
Modified: trunk/BaseTools/Source/Python/build/build.py
===================================================================
--- trunk/BaseTools/Source/Python/build/build.py 2011-12-13 05:47:26 UTC (rev 2466)
+++ trunk/BaseTools/Source/Python/build/build.py 2011-12-13 08:53:07 UTC (rev 2467)
@@ -745,17 +745,8 @@
EdkLogger.quiet("%-16s = %s" % ("EDK_TOOLS_PATH", os.environ["EDK_TOOLS_PATH"]))
EdkLogger.info("")
- if self.ArchList:
- EdkLogger.info('%-16s = %s' % ("Architecture(s)", ' '.join(self.ArchList)))
- EdkLogger.info('%-16s = %s' % ("Build target", ' '.join(self.BuildTargetList)))
- EdkLogger.info('%-16s = %s' % ("Toolchain", ' '.join(self.ToolChainList)))
- EdkLogger.info('\n%-16s = %s' % ("Active Platform", self.PlatformFile))
- if self.ModuleFile:
- EdkLogger.info('%-16s = %s' % ("Active Module", self.ModuleFile))
-
os.chdir(self.WorkspaceDir)
- self.Progress.Start("\nProcessing meta-data")
## Load configuration
#
@@ -1241,7 +1232,8 @@
self.FvList,
self.CapList,
self.SkuId,
- self.UniFlag
+ self.UniFlag,
+ self.Progress
)
self.Fdf = Wa.FdfFile
self.LoadFixAddress = Wa.Platform.LoadFixAddress
@@ -1316,7 +1308,9 @@
self.FvList,
self.CapList,
self.SkuId,
- self.UniFlag
+ self.UniFlag,
+ self.Progress,
+ self.ModuleFile
)
self.Fdf = Wa.FdfFile
self.LoadFixAddress = Wa.Platform.LoadFixAddress
@@ -1401,7 +1395,8 @@
self.FvList,
self.CapList,
self.SkuId,
- self.UniFlag
+ self.UniFlag,
+ self.Progress
)
self.Fdf = Wa.FdfFile
self.LoadFixAddress = Wa.Platform.LoadFixAddress
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gi...@us...> - 2011-12-13 05:47:32
|
Revision: 2466
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2466&view=rev
Author: gikidy
Date: 2011-12-13 05:47:26 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Fix an issue of GenFds tool while generate FvNameGuid string under is 64-bit Linux as host machine OS.
Signed-off-by: gikidy
Reviewed-by: erictian
Modified Paths:
--------------
trunk/BaseTools/Source/Python/GenFds/Fv.py
Modified: trunk/BaseTools/Source/Python/GenFds/Fv.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/Fv.py 2011-12-13 05:35:42 UTC (rev 2465)
+++ trunk/BaseTools/Source/Python/GenFds/Fv.py 2011-12-13 05:47:26 UTC (rev 2466)
@@ -316,7 +316,7 @@
Buffer += pack('B', int(ByteList[Index1], 16))
Guid = self.FvNameGuid.split('-')
- Buffer = pack('LHHBBBBBBBBL',
+ Buffer = pack('=LHHBBBBBBBBL',
int(Guid[0], 16),
int(Guid[1], 16),
int(Guid[2], 16),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gi...@us...> - 2011-12-13 05:35:48
|
Revision: 2465
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2465&view=rev
Author: gikidy
Date: 2011-12-13 05:35:42 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Fix an issue while generate PCD database, the order of SizeTable is not same with LocalTokenNumberTable.
Signed-off-by: gikidy
Reviewed-by: lgao4
Modified Paths:
--------------
trunk/BaseTools/Source/Python/AutoGen/GenC.py
Modified: trunk/BaseTools/Source/Python/AutoGen/GenC.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/GenC.py 2011-12-13 05:28:44 UTC (rev 2464)
+++ trunk/BaseTools/Source/Python/AutoGen/GenC.py 2011-12-13 05:35:42 UTC (rev 2465)
@@ -1575,6 +1575,35 @@
if NumberOfLocalTokens == 0:
AutoGenC.Append(gEmptyPcdDatabaseAutoGenC.Replace(Dict))
else:
+ #
+ # Update Size Table to the right order, it should be same with LocalTokenNumberTable
+ #
+ SizeCNameTempList = []
+ SizeGuidTempList = []
+ SizeCurLenTempList = []
+ SizeMaxLenTempList = []
+ ReOrderFlag = True
+
+ if len(Dict['SIZE_TABLE_CNAME']) == 1:
+ if not (Dict['SIZE_TABLE_CNAME'][0] and Dict['SIZE_TABLE_GUID'][0]):
+ ReOrderFlag = False
+
+ if ReOrderFlag:
+ for Count in range(len(Dict['TOKEN_CNAME'])):
+ for Count1 in range(len(Dict['SIZE_TABLE_CNAME'])):
+ if Dict['TOKEN_CNAME'][Count] == Dict['SIZE_TABLE_CNAME'][Count1] and \
+ Dict['TOKEN_GUID'][Count] == Dict['SIZE_TABLE_GUID'][Count1]:
+ SizeCNameTempList.append(Dict['SIZE_TABLE_CNAME'][Count1])
+ SizeGuidTempList.append(Dict['SIZE_TABLE_GUID'][Count1])
+ SizeCurLenTempList.append(Dict['SIZE_TABLE_CURRENT_LENGTH'][Count1])
+ SizeMaxLenTempList.append(Dict['SIZE_TABLE_MAXIMUM_LENGTH'][Count1])
+
+ for Count in range(len(Dict['SIZE_TABLE_CNAME'])):
+ Dict['SIZE_TABLE_CNAME'][Count] = SizeCNameTempList[Count]
+ Dict['SIZE_TABLE_GUID'][Count] = SizeGuidTempList[Count]
+ Dict['SIZE_TABLE_CURRENT_LENGTH'][Count] = SizeCurLenTempList[Count]
+ Dict['SIZE_TABLE_MAXIMUM_LENGTH'][Count] = SizeMaxLenTempList[Count]
+
AutoGenC.Append(gPcdDatabaseAutoGenC.Replace(Dict))
return AutoGenH, AutoGenC
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gi...@us...> - 2011-12-13 05:28:50
|
Revision: 2464
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2464&view=rev
Author: gikidy
Date: 2011-12-13 05:28:44 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Fix an issue while using !ifndef in FDF file build tool cannot parse !ifndef statement correctly.
Signed-off-by: gikidy
Reviewed-by: lgao4
Reviewed-by: jliu66
Modified Paths:
--------------
trunk/BaseTools/Source/Python/GenFds/FdfParser.py
Modified: trunk/BaseTools/Source/Python/GenFds/FdfParser.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/FdfParser.py 2011-12-09 09:56:48 UTC (rev 2463)
+++ trunk/BaseTools/Source/Python/GenFds/FdfParser.py 2011-12-13 05:28:44 UTC (rev 2464)
@@ -679,7 +679,7 @@
PreIndex = 0
StartPos = CurLine.find('$(', PreIndex)
EndPos = CurLine.find(')', StartPos+2)
- while StartPos != -1 and EndPos != -1:
+ while StartPos != -1 and EndPos != -1 and not (self.__Token == 'ifdef' or self.__Token == '!ifndef'):
MacroName = CurLine[StartPos+2 : EndPos]
MacorValue = self.__GetMacroValue(MacroName)
if MacorValue != None:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2011-12-09 09:56:55
|
Revision: 2463
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2463&view=rev
Author: xfzyr
Date: 2011-12-09 09:56:48 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
Fix a bug of ECC break when there are some temp tables not cleaned in database.
Signed-off-by: yzeng15
Reviewed-by: gikidy
Modified Paths:
--------------
trunk/BaseTools/Source/Python/Ecc/Ecc.py
trunk/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
Modified: trunk/BaseTools/Source/Python/Ecc/Ecc.py
===================================================================
--- trunk/BaseTools/Source/Python/Ecc/Ecc.py 2011-12-09 07:01:44 UTC (rev 2462)
+++ trunk/BaseTools/Source/Python/Ecc/Ecc.py 2011-12-09 09:56:48 UTC (rev 2463)
@@ -22,12 +22,12 @@
from optparse import OptionParser
from Configuration import Configuration
from Check import Check
+import Common.GlobalData as GlobalData
-
from Common.String import NormPath
from Common.BuildVersion import gBUILD_VERSION
from Common import BuildToolError
-
+from Common.Misc import PathClass
from MetaFileWorkspace.MetaFileParser import DscParser
from MetaFileWorkspace.MetaFileParser import DecParser
from MetaFileWorkspace.MetaFileParser import InfParser
@@ -61,7 +61,41 @@
# Parse the options and args
self.ParseOption()
+
+ #
+ # Check EFI_SOURCE (Edk build convention). EDK_SOURCE will always point to ECP
+ #
+ WorkspaceDir = os.path.normcase(os.path.normpath(os.environ["WORKSPACE"]))
+ os.environ["WORKSPACE"] = WorkspaceDir
+ if "ECP_SOURCE" not in os.environ:
+ os.environ["ECP_SOURCE"] = os.path.join(WorkspaceDir, GlobalData.gEdkCompatibilityPkg)
+ if "EFI_SOURCE" not in os.environ:
+ os.environ["EFI_SOURCE"] = os.environ["ECP_SOURCE"]
+ if "EDK_SOURCE" not in os.environ:
+ os.environ["EDK_SOURCE"] = os.environ["ECP_SOURCE"]
+ #
+ # Unify case of characters on case-insensitive systems
+ #
+ EfiSourceDir = os.path.normcase(os.path.normpath(os.environ["EFI_SOURCE"]))
+ EdkSourceDir = os.path.normcase(os.path.normpath(os.environ["EDK_SOURCE"]))
+ EcpSourceDir = os.path.normcase(os.path.normpath(os.environ["ECP_SOURCE"]))
+
+ os.environ["EFI_SOURCE"] = EfiSourceDir
+ os.environ["EDK_SOURCE"] = EdkSourceDir
+ os.environ["ECP_SOURCE"] = EcpSourceDir
+
+ GlobalData.gWorkspace = WorkspaceDir
+ GlobalData.gEfiSource = EfiSourceDir
+ GlobalData.gEdkSource = EdkSourceDir
+ GlobalData.gEcpSource = EcpSourceDir
+
+ GlobalData.gGlobalDefines["WORKSPACE"] = WorkspaceDir
+ GlobalData.gGlobalDefines["EFI_SOURCE"] = EfiSourceDir
+ GlobalData.gGlobalDefines["EDK_SOURCE"] = EdkSourceDir
+ GlobalData.gGlobalDefines["ECP_SOURCE"] = EcpSourceDir
+
+
# Generate checkpoints list
EccGlobalData.gConfig = Configuration(self.ConfigFile)
@@ -152,7 +186,7 @@
EdkLogger.quiet("Parsing %s" % Filename)
Op.write("%s\r" % Filename)
#Dsc(Filename, True, True, EccGlobalData.gWorkspace, EccGlobalData.gDb)
- self.MetaFile = DscParser(Filename, MODEL_FILE_DSC, MetaFileStorage(EccGlobalData.gDb.TblDsc.Cur, Filename, MODEL_FILE_DSC, True))
+ self.MetaFile = DscParser(PathClass(Filename, Root), MODEL_FILE_DSC, MetaFileStorage(EccGlobalData.gDb.TblDsc.Cur, Filename, MODEL_FILE_DSC, True))
# alwasy do post-process, in case of macros change
self.MetaFile.DoPostProcess()
self.MetaFile.Start()
Modified: trunk/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
===================================================================
--- trunk/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py 2011-12-09 07:01:44 UTC (rev 2462)
+++ trunk/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py 2011-12-09 09:56:48 UTC (rev 2463)
@@ -770,13 +770,13 @@
def Start(self):
Content = ''
try:
- Content = open(str(self.MetaFile), 'r').readlines()
+ Content = open(str(self.MetaFile.Path), 'r').readlines()
except:
EdkLogger.error("Parser", FILE_READ_FAILURE, ExtraData=self.MetaFile)
#
# Insert a record for file
#
- Filename = NormPath(self.MetaFile)
+ Filename = NormPath(self.MetaFile.Path)
FileID = self.TblFile.GetFileId(Filename)
if FileID:
self.FileID = FileID
@@ -1162,6 +1162,8 @@
self._IdMapping[Id] = self._LastItem
RecordList = self._Table.GetAll()
+ self._Table.Drop()
+ self._RawTable.Drop()
for Record in RecordList:
EccGlobalData.gDb.TblDsc.Insert(Record[1],Record[2],Record[3],Record[4],Record[5],Record[6],Record[7],Record[8],Record[9],Record[10],Record[11],Record[12],Record[13],Record[14])
GlobalData.gPlatformDefines.update(self._FileLocalMacros)
@@ -1300,7 +1302,7 @@
#
elif "ECP_SOURCE" in GlobalData.gCommandLineDefines.keys():
__IncludeMacros['ECP_SOURCE'] = GlobalData.gCommandLineDefines['ECP_SOURCE']
-
+
__IncludeMacros['EFI_SOURCE'] = GlobalData.gGlobalDefines['EFI_SOURCE']
__IncludeMacros['EDK_SOURCE'] = GlobalData.gGlobalDefines['EDK_SOURCE']
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gi...@us...> - 2011-12-09 07:01:50
|
Revision: 2462
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2462&view=rev
Author: gikidy
Date: 2011-12-09 07:01:44 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
Fix an issue of if define FIX_LOAD_TOP_MEMORY_ADDRESS with unaligned value, build tools not report error. And also the command line defined value not override value defined in DSC file.
Signed-off-by: gikidy
Reviewed-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
Modified: trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
===================================================================
--- trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py 2011-12-07 10:10:49 UTC (rev 2461)
+++ trunk/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py 2011-12-09 07:01:44 UTC (rev 2462)
@@ -383,10 +383,21 @@
self._LoadFixAddress = int (self._LoadFixAddress, 0)
except:
EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS %s is not valid dec or hex string" % (self._LoadFixAddress))
- if self._LoadFixAddress < 0:
- EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS is set to the invalid negative value %s" % (self._LoadFixAddress))
- if self._LoadFixAddress != 0xFFFFFFFFFFFFFFFF and self._LoadFixAddress % 0x1000 != 0:
- EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS is set to the invalid unaligned 4K value %s" % (self._LoadFixAddress))
+
+ #
+ # If command line defined, should override the value in DSC file.
+ #
+ if 'FIX_LOAD_TOP_MEMORY_ADDRESS' in GlobalData.gCommandLineDefines.keys():
+ try:
+ self._LoadFixAddress = int(GlobalData.gCommandLineDefines['FIX_LOAD_TOP_MEMORY_ADDRESS'], 0)
+ except:
+ EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS %s is not valid dec or hex string" % (GlobalData.gCommandLineDefines['FIX_LOAD_TOP_MEMORY_ADDRESS']))
+
+ if self._LoadFixAddress < 0:
+ EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS is set to the invalid negative value 0x%x" % (self._LoadFixAddress))
+ if self._LoadFixAddress != 0xFFFFFFFFFFFFFFFF and self._LoadFixAddress % 0x1000 != 0:
+ EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS is set to the invalid unaligned 4K value 0x%x" % (self._LoadFixAddress))
+
return self._LoadFixAddress
## Retrieve RFCLanguage filter
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <oli...@us...> - 2011-12-07 10:10:55
|
Revision: 2461
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2461&view=rev
Author: oliviermartin
Date: 2011-12-07 10:10:49 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
BaseTools/Conf-ARMLINUXGCC: Ensure the libraries are linked at the base address 0x0
Signed-off-by: oliviermartin
Reviewed-by: gikidy
Modified Paths:
--------------
trunk/BaseTools/Conf/tools_def.template
Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template 2011-12-06 07:00:42 UTC (rev 2460)
+++ trunk/BaseTools/Conf/tools_def.template 2011-12-07 10:10:49 UTC (rev 2461)
@@ -4320,7 +4320,7 @@
*_ARMLINUXGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
*_ARMLINUXGCC_ARM_SLINK_FLAGS = -rc
-*_ARMLINUXGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
+*_ARMLINUXGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -O0
RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2011-12-06 07:00:48
|
Revision: 2460
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2460&view=rev
Author: xfzyr
Date: 2011-12-06 07:00:42 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
Fix a bug of ECC can't figure out the duplicate GUID if they are defined in different string format.
Signed-off-by: yzeng15
Reviewed-by: hchen30
Modified Paths:
--------------
trunk/BaseTools/Source/Python/Ecc/Check.py
trunk/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
Modified: trunk/BaseTools/Source/Python/Ecc/Check.py
===================================================================
--- trunk/BaseTools/Source/Python/Ecc/Check.py 2011-12-06 05:06:47 UTC (rev 2459)
+++ trunk/BaseTools/Source/Python/Ecc/Check.py 2011-12-06 07:00:42 UTC (rev 2460)
@@ -438,14 +438,14 @@
#
# check whether file header comment section started
#
- if Line.startswith('##') and \
+ if Line.startswith('#') and \
(Line.find('@file') > -1) and \
not HeaderCommentStart:
if CurrentSection != MODEL_UNKNOWN:
SqlStatement = """ select ID from File where FullPath like '%s'""" % FullName
ResultSet = EccGlobalData.gDb.TblFile.Exec(SqlStatement)
for Result in ResultSet:
- Msg = 'INF/DEC/DSC/FDF file header comment should begin with ""## @file"" at the very top file'
+ Msg = 'INF/DEC/DSC/FDF file header comment should begin with ""## @file"" or ""# @file""at the very top file'
EccGlobalData.gDb.TblReport.Insert(ERROR_DOXYGEN_CHECK_FILE_HEADER, Msg, "File", Result[0])
else:
@@ -479,7 +479,7 @@
SqlStatement = """ select ID from File where FullPath like '%s'""" % FullName
ResultSet = EccGlobalData.gDb.TblFile.Exec(SqlStatement)
for Result in ResultSet:
- Msg = 'INF/DEC/DSC/FDF file header comment should begin with ""## @file"" at the very top file'
+ Msg = 'INF/DEC/DSC/FDF file header comment should begin with ""## @file"" or ""# @file"" at the very top file'
EccGlobalData.gDb.TblReport.Insert(ERROR_DOXYGEN_CHECK_FILE_HEADER, Msg, "File", Result[0])
if HeaderCommentEnd == False:
SqlStatement = """ select ID from File where FullPath like '%s'""" % FullName
@@ -932,16 +932,16 @@
if Model == MODEL_EFI_PPI:
Name = 'ppi'
SqlCommand = """
- select A.ID, A.Value2 from %s as A, %s as B
+ select A.ID, A.Value1, A.Value2 from %s as A, %s as B
where A.Model = %s and B.Model = %s
and A.Value2 = B.Value2 and A.ID <> B.ID
- and A.Scope1 = B.Scope1
+ and A.Scope1 = B.Scope1 and A.Value1 <> B.Value1
group by A.ID
""" % (Table.Table, Table.Table, Model, Model)
RecordSet = Table.Exec(SqlCommand)
- for Record in RecordSet:
- if not EccGlobalData.gException.IsException(ErrorID, Record[1]):
- EccGlobalData.gDb.TblReport.Insert(ErrorID, OtherMsg="The %s value [%s] is used more than one time" % (Name.upper(), Record[1]), BelongsToTable=Table.Table, BelongsToItem=Record[0])
+ for Record in RecordSet:
+ if not EccGlobalData.gException.IsException(ErrorID, Record[1] + ':' + Record[2]):
+ EccGlobalData.gDb.TblReport.Insert(ErrorID, OtherMsg="The %s value [%s] is used more than one time" % (Name.upper(), Record[2]), BelongsToTable=Table.Table, BelongsToItem=Record[0])
# Naming Convention Check
def NamingConventionCheck(self):
Modified: trunk/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
===================================================================
--- trunk/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py 2011-12-06 05:06:47 UTC (rev 2459)
+++ trunk/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py 2011-12-06 07:00:42 UTC (rev 2460)
@@ -1636,7 +1636,28 @@
" (<CName> = <GuidValueInCFormat:{8,4,4,{2,2,2,2,2,2,2,2}}>)",
File=self.MetaFile, Line=self._LineIndex+1)
self._ValueList[0] = TokenList[0]
- self._ValueList[1] = TokenList[1]
+ #Parse the Guid value format
+ GuidValueList = TokenList[1].strip(' {}').split(',')
+ Index = 0
+ HexList = []
+ if len(GuidValueList) == 11:
+ for GuidValue in GuidValueList:
+ GuidValue = GuidValue.strip()
+ if GuidValue.startswith('0x') or GuidValue.startswith('0X'):
+ HexList.append('0x' + str(GuidValue[2:]))
+ Index += 1
+ continue
+ else:
+ if GuidValue.startswith('{'):
+ HexList.append('0x' + str(GuidValue[3:]))
+ Index += 1
+ self._ValueList[1] = "{ %s, %s, %s, { %s, %s, %s, %s, %s, %s, %s, %s }}" % (HexList[0], HexList[1], HexList[2],HexList[3],HexList[4],HexList[5],HexList[6],HexList[7],HexList[8],HexList[9],HexList[10])
+ else:
+ EdkLogger.error('Parser', FORMAT_INVALID, "Invalid GUID value format",
+ ExtraData=self._CurrentLine + \
+ " (<CName> = <GuidValueInCFormat:{8,4,4,{2,2,2,2,2,2,2,2}}>)",
+ File=self.MetaFile, Line=self._LineIndex+1)
+ self._ValueList[0] = ''
## PCD sections parser
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gi...@us...> - 2011-12-06 05:06:53
|
Revision: 2459
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2459&view=rev
Author: gikidy
Date: 2011-12-06 05:06:47 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
Update GenFv error message
Signed-off-by: gikidy
Reviewed-by: lgao4
Modified Paths:
--------------
trunk/BaseTools/Source/C/GenFv/GenFvInternalLib.c
Modified: trunk/BaseTools/Source/C/GenFv/GenFvInternalLib.c
===================================================================
--- trunk/BaseTools/Source/C/GenFv/GenFvInternalLib.c 2011-12-05 03:19:42 UTC (rev 2458)
+++ trunk/BaseTools/Source/C/GenFv/GenFvInternalLib.c 2011-12-06 05:06:47 UTC (rev 2459)
@@ -1021,7 +1021,7 @@
Status = VerifyFfsFile ((EFI_FFS_FILE_HEADER *)FileBuffer);
if (EFI_ERROR (Status)) {
free (FileBuffer);
- Error (NULL, 0, 3000, "Invalid", "%s is a FFS file.", FvInfo->FvFiles[Index]);
+ Error (NULL, 0, 3000, "Invalid", "%s is not a valid FFS file.", FvInfo->FvFiles[Index]);
return EFI_INVALID_PARAMETER;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gi...@us...> - 2011-12-05 03:19:48
|
Revision: 2458
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2458&view=rev
Author: gikidy
Date: 2011-12-05 03:19:42 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
Make print information format consistent.
Signed-off-by: gikidy
Modified Paths:
--------------
trunk/BaseTools/Source/Python/build/build.py
Modified: trunk/BaseTools/Source/Python/build/build.py
===================================================================
--- trunk/BaseTools/Source/Python/build/build.py 2011-12-05 03:09:46 UTC (rev 2457)
+++ trunk/BaseTools/Source/Python/build/build.py 2011-12-05 03:19:42 UTC (rev 2458)
@@ -750,7 +750,7 @@
EdkLogger.info('%-16s = %s' % ("Build target", ' '.join(self.BuildTargetList)))
EdkLogger.info('%-16s = %s' % ("Toolchain", ' '.join(self.ToolChainList)))
- EdkLogger.info('\n%-24s = %s' % ("Active Platform", self.PlatformFile))
+ EdkLogger.info('\n%-16s = %s' % ("Active Platform", self.PlatformFile))
if self.ModuleFile:
EdkLogger.info('%-16s = %s' % ("Active Module", self.ModuleFile))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2011-12-05 03:09:52
|
Revision: 2457
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2457&view=rev
Author: xfzyr
Date: 2011-12-05 03:09:46 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
Update code to Fix a issue for the regression build failure of TunnelMountain.
Signed-off-by: yzeng15
Reviewed-by: gikidy
Reviewed-by: yingke
Modified Paths:
--------------
trunk/BaseTools/Source/Python/GenFds/FdfParser.py
Modified: trunk/BaseTools/Source/Python/GenFds/FdfParser.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/FdfParser.py 2011-12-05 02:47:45 UTC (rev 2456)
+++ trunk/BaseTools/Source/Python/GenFds/FdfParser.py 2011-12-05 03:09:46 UTC (rev 2457)
@@ -1584,7 +1584,7 @@
BlockSizePcd = PcdPair
self.Profile.PcdDict[PcdPair] = BlockSize
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)
- self.Profile.PcdFileLineDict[pcdPair] = FileLineTuple
+ self.Profile.PcdFileLineDict[PcdPair] = FileLineTuple
BlockSize = long(BlockSize, 0)
BlockNumber = None
@@ -1675,7 +1675,7 @@
Obj.SetVarDict[PcdPair] = Value
self.Profile.PcdDict[PcdPair] = Value
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)
- self.Profile.PcdFileLineDict[pcdPair] = FileLineTuple
+ self.Profile.PcdFileLineDict[PcdPair] = FileLineTuple
return True
return False
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gi...@us...> - 2011-12-05 02:47:51
|
Revision: 2456
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2456&view=rev
Author: gikidy
Date: 2011-12-05 02:47:45 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
Print active platform information during build.
Signed-off-by: gikidy
Reviewed-by: lgao4
Modified Paths:
--------------
trunk/BaseTools/Source/Python/build/build.py
Modified: trunk/BaseTools/Source/Python/build/build.py
===================================================================
--- trunk/BaseTools/Source/Python/build/build.py 2011-12-05 01:16:52 UTC (rev 2455)
+++ trunk/BaseTools/Source/Python/build/build.py 2011-12-05 02:47:45 UTC (rev 2456)
@@ -750,7 +750,7 @@
EdkLogger.info('%-16s = %s' % ("Build target", ' '.join(self.BuildTargetList)))
EdkLogger.info('%-16s = %s' % ("Toolchain", ' '.join(self.ToolChainList)))
- #EdkLogger.info('\n%-24s = %s' % ("Active Platform", self.PlatformFile))
+ EdkLogger.info('\n%-24s = %s' % ("Active Platform", self.PlatformFile))
if self.ModuleFile:
EdkLogger.info('%-16s = %s' % ("Active Module", self.ModuleFile))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2011-12-05 01:16:58
|
Revision: 2455
http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2455&view=rev
Author: jsu1
Date: 2011-12-05 01:16:52 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
Update macro cross section logic
Reviewed-by: yingke
Signed-off-by: jsu1
Modified Paths:
--------------
trunk/BaseTools/Source/Python/Workspace/MetaFileParser.py
Modified: trunk/BaseTools/Source/Python/Workspace/MetaFileParser.py
===================================================================
--- trunk/BaseTools/Source/Python/Workspace/MetaFileParser.py 2011-12-02 08:41:39 UTC (rev 2454)
+++ trunk/BaseTools/Source/Python/Workspace/MetaFileParser.py 2011-12-05 01:16:52 UTC (rev 2455)
@@ -76,17 +76,12 @@
if MODEL_META_DATA_HEADER in self._SectionType:
self._FileLocalMacros[Name] = Value
else:
- for Scope in self._Scope:
- self._SectionsMacroDict.setdefault((Scope[2], Scope[0], Scope[1]), {})[Name] = Value
+ self._ConstructSectionMacroDict(Name, Value)
elif self._SectionType == MODEL_META_DATA_HEADER:
self._FileLocalMacros[Name] = Value
else:
- SectionDictKey = self._SectionType, self._Scope[0][0], self._Scope[0][1]
- if SectionDictKey not in self._SectionsMacroDict:
- self._SectionsMacroDict[SectionDictKey] = {}
- SectionLocalMacros = self._SectionsMacroDict[SectionDictKey]
- SectionLocalMacros[Name] = Value
-
+ self._ConstructSectionMacroDict(Name, Value)
+
# EDK_GLOBAL defined macros
elif type(self) != DscParser:
EdkLogger.error('Parser', FORMAT_INVALID, "EDK_GLOBAL can only be used in .dsc file",
@@ -371,15 +366,60 @@
Macros.update(self._GetApplicableSectionMacro())
return Macros
+ ## Construct section Macro dict
+ def _ConstructSectionMacroDict(self, Name, Value):
+ ScopeKey = [(Scope[0], Scope[1]) for Scope in self._Scope]
+ ScopeKey = tuple(ScopeKey)
+ SectionDictKey = self._SectionType, ScopeKey
+ #
+ # DecParser SectionType is a list, will contain more than one item only in Pcd Section
+ # As Pcd section macro usage is not alllowed, so here it is safe
+ #
+ if type(self) == DecParser:
+ SectionDictKey = self._SectionType[0], ScopeKey
+ if SectionDictKey not in self._SectionsMacroDict:
+ self._SectionsMacroDict[SectionDictKey] = {}
+ SectionLocalMacros = self._SectionsMacroDict[SectionDictKey]
+ SectionLocalMacros[Name] = Value
## Get section Macros that are applicable to current line, which may come from other sections
## that share the same name while scope is wider
def _GetApplicableSectionMacro(self):
Macros = {}
- for Scope1, Scope2 in [("COMMON", "COMMON"), ("COMMON", self._Scope[0][1]),
- (self._Scope[0][0], "COMMON"), (self._Scope[0][0], self._Scope[0][1])]:
- if (self._SectionType, Scope1, Scope2) in self._SectionsMacroDict:
- Macros.update(self._SectionsMacroDict[(self._SectionType, Scope1, Scope2)])
+
+ ComComMacroDict = {}
+ ComSpeMacroDict = {}
+ SpeSpeMacroDict = {}
+
+ ActiveSectionType = self._SectionType
+ if type(self) == DecParser:
+ ActiveSectionType = self._SectionType[0]
+
+ for (SectionType, Scope) in self._SectionsMacroDict:
+ if SectionType != ActiveSectionType:
+ continue
+
+ for ActiveScope in self._Scope:
+ Scope0, Scope1 = ActiveScope[0], ActiveScope[1]
+ if(Scope0, Scope1) not in Scope:
+ break
+ else:
+ SpeSpeMacroDict.update(self._SectionsMacroDict[(SectionType, Scope)])
+
+ for ActiveScope in self._Scope:
+ Scope0, Scope1 = ActiveScope[0], ActiveScope[1]
+ if(Scope0, Scope1) not in Scope and (Scope0, "COMMON") not in Scope and ("COMMON", Scope1) not in Scope:
+ break
+ else:
+ ComSpeMacroDict.update(self._SectionsMacroDict[(SectionType, Scope)])
+
+ if ("COMMON", "COMMON") in Scope:
+ ComComMacroDict.update(self._SectionsMacroDict[(SectionType, Scope)])
+
+ Macros.update(ComComMacroDict)
+ Macros.update(ComSpeMacroDict)
+ Macros.update(SpeSpeMacroDict)
+
return Macros
_SectionParser = {}
@@ -1195,11 +1235,7 @@
if self._SectionType == MODEL_META_DATA_HEADER:
self._FileLocalMacros[Name] = Value
else:
- SectionDictKey = self._SectionType, self._Scope[0][0], self._Scope[0][1]
- if SectionDictKey not in self._SectionsMacroDict:
- self._SectionsMacroDict[SectionDictKey] = {}
- SectionLocalMacros = self._SectionsMacroDict[SectionDictKey]
- SectionLocalMacros[Name] = Value
+ self._ConstructSectionMacroDict(Name, Value)
elif self._ItemType == MODEL_META_DATA_GLOBAL_DEFINE:
GlobalData.gEdkGlobal[Name] = Value
@@ -1530,13 +1566,6 @@
self._Comments = []
self._Done()
- def _GetApplicableSectionMacro(self):
- Macros = {}
- for S1, S2, SectionType in self._Scope:
- for Scope1, Scope2 in [("COMMON", "COMMON"), ("COMMON", S2), (S1, "COMMON"), (S1, S2)]:
- if (SectionType, Scope1, Scope2) in self._SectionsMacroDict:
- Macros.update(self._SectionsMacroDict[(SectionType, Scope1, Scope2)])
- return Macros
## Section header parser
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
