Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-09-21 02:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

BaseTools: init DependencyHeaderFileSet for each MakeFile class as Tiano did

Browse Source 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
Sergey Isakov 2019-09-25 16:05:31 +03:00
parent 3e96e6b530
commit 4f3cce8594
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,6 +449,7 @@ cleanlib:
self.GenFfsList = ModuleAutoGen.GenFfsList
self.MacroList = ['FFS_OUTPUT_DIR', 'MODULE_GUID', 'OUTPUT_DIR']
self.FfsOutputFileList = []
self.DependencyHeaderFileSet = set()
# Compose a dict object containing information used to do replacement in template
@property
@ -910,7 +911,6 @@ cleanlib:
self._AutoGenObject.IncludePathList + self._AutoGenObject.BuildOptionIncPathList
)
self.DependencyHeaderFileSet = set()
if FileDependencyDict:
for Dependency in FileDependencyDict.values():
self.DependencyHeaderFileSet.update(set(Dependency))
@ -1244,6 +1244,7 @@ ${BEGIN}\t-@${create_directory_command}\n${END}\
BuildFile.__init__(self, ModuleAutoGen)
self.PlatformInfo = self._AutoGenObject.PlatformInfo
self.IntermediateDirectoryList = ["$(DEBUG_DIR)", "$(OUTPUT_DIR)"]
self.DependencyHeaderFileSet = set()
# Compose a dict object containing information used to do replacement in template
@property
@ -1434,6 +1435,7 @@ cleanlib:
self.ModuleBuildDirectoryList = []
self.LibraryBuildDirectoryList = []
self.LibraryMakeCommandList = []
self.DependencyHeaderFileSet = set()
# Compose a dict object containing information used to do replacement in template
@property
@ -1539,6 +1541,7 @@ class TopLevelMakefile(BuildFile):
def __init__(self, Workspace):
BuildFile.__init__(self, Workspace)
self.IntermediateDirectoryList = []
self.DependencyHeaderFileSet = set()
# Compose a dict object containing information used to do replacement in template
@property

2
Conf/tools_def.txt
View File

@ -2829,7 +2829,7 @@ RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_F
##################
# NASM tool definitions
##################
*_*_*_NASM_PATH = ENV(NASM_PREFIX)/nasm
*_*_*_NASM_PATH = ENV(NASM_PREFIX)nasm
# NASMB uses NASM produce a .bin from a .nasmb NASM source file
*_*_*_NASMB_FLAGS = -f bin

12
cbuild.bat
View File

@ -30,12 +30,14 @@ set DEVSTAGE=
set IASL_PREFIX=c:\ASL\
set DEFAULT_CYGWIN_HOME=c:\cygwin
set DEFAULT_PYTHONHOME="d:\Program File\Python37"
set DEFAULT_PYTHONHOME=
rem d:\Program File\Python37"
set DEFAULT_PYTHON_FREEZER_PATH=%PYTHON_HOME%\Scripts
set PYTHON3_ENABLE="TRUE"
set PYTHON3_ENABLE=TRUE
set DEFAULT_NASM_PREFIX=
rem C:\Program Files (x86)\NASM"
rem # %DEFAULT_CYGWIN_HOME%\bin
set DEFAULT_TOOLCHAIN=VS2015x86
set DEFAULT_TOOLCHAIN=VS2017
set DEFAULT_BUILDTARGET=RELEASE
set DEFAULT_TARGETARCH=X64
set DEFAULT_THREADNUMBER=%NUMBER_OF_PROCESSORS%
@ -267,12 +269,12 @@ rem # setup build
set "CMD_BUILD=%CMD_BUILD% -p %DSCFILE% %EDK2_BUILD_OPTIONS%"
set clover_build_info=%CMD_BUILD%
set clover_build_info="cbuild.bat"
set clover_build_info=%clover_build_info:\=\\%
set clover_build_info=%clover_build_info:"=\"%
for /f "tokens=* delims= " %%A in ('echo %clover_build_info% ') do set clover_build_info=%%A
set clover_build_info=%clover_build_info:~0,-1%
set clover_build_info="Args: %~nx0 %* | Command: %clover_build_info% | OS: Win %WINVER%"
set clover_build_info="Command: %clover_build_info% | OS: Win %WINVER%"
rem # generate build date and time
set BUILDDATE=%date:~10,4%-%date:~4,2%-%date:~7,2% %time:~0,-3%