REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2568
PcdValueInit shares the same Edk2\BaseTools\Source\C\PcdValueCommon.c.
To avoid the conflict, it should copy this file to its output directory,
If so, PcdValueCommon.c file will be private for PcdValueInit
Cc: Liming Gao <liming....@intel.com>
Cc: Bob Feng <bob.c.f...@intel.com>
Signed-off-by: Zhiju.Fan <zhijux....@intel.com>
---
Optimized the generated Makefile and script code
'%s' % PcdValueCommonName change to PcdValueCommonName
BaseTools/Source/Python/Workspace/DscBuildData.py | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 476c7edaf9da..75f419c7ff1b 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -55,6 +55,7 @@ def _IsFieldValueAnArray (Value):
return False
PcdValueInitName = 'PcdValueInit'
+PcdValueCommonName = 'PcdValueCommon'
PcdMainCHeader = '''
/**
@@ -2634,10 +2635,10 @@ class DscBuildData(PlatformBuildClassObject):
MakeApp = PcdMakefileHeader
if sys.platform == "win32":
- MakeApp = MakeApp + 'APPFILE = %s\%s.exe\n' % (self.OutputPath,
PcdValueInitName) + 'APPNAME = %s\n' % (PcdValueInitName) + 'OBJECTS =
%s\%s.obj %s.obj\n' % (self.OutputPath, PcdValueInitName,
os.path.normpath(mws.join(GlobalData.gGlobalDefines["EDK_TOOLS_PATH"],
"Source/C/Common/PcdValueCommon"))) + 'INC = '
+ MakeApp = MakeApp + 'APPFILE = %s\%s.exe\n' % (self.OutputPath,
PcdValueInitName) + 'APPNAME = %s\n' % (PcdValueInitName) + 'OBJECTS =
%s\%s.obj %s.obj\n' % (self.OutputPath, PcdValueInitName,
os.path.join(self.OutputPath, PcdValueCommonName)) + 'INC = '
else:
MakeApp = MakeApp + PcdGccMakefile
- MakeApp = MakeApp + 'APPFILE = %s/%s\n' % (self.OutputPath,
PcdValueInitName) + 'APPNAME = %s\n' % (PcdValueInitName) + 'OBJECTS = %s/%s.o
%s.o\n' % (self.OutputPath, PcdValueInitName,
os.path.normpath(mws.join(GlobalData.gGlobalDefines["EDK_TOOLS_PATH"],
"Source/C/Common/PcdValueCommon"))) + \
+ MakeApp = MakeApp + 'APPFILE = %s/%s\n' % (self.OutputPath,
PcdValueInitName) + 'APPNAME = %s\n' % (PcdValueInitName) + 'OBJECTS = %s/%s.o
%s.o\n' % (self.OutputPath, PcdValueInitName, os.path.join(self.OutputPath,
PcdValueCommonName)) + \
'include $(MAKEROOT)/Makefiles/app.makefile\n' +
'INCLUDE +='
IncSearchList = []
@@ -2742,6 +2743,14 @@ class DscBuildData(PlatformBuildClassObject):
IncFileList = GetDependencyList(IncludeFileFullPaths, SearchPathList)
for include_file in IncFileList:
MakeApp += "$(OBJECTS) : %s\n" % include_file
+ if sys.platform == "win32":
+ PcdValueCommonPath =
os.path.normpath(mws.join(GlobalData.gGlobalDefines["EDK_TOOLS_PATH"],
"Source\C\Common\PcdValueCommon.c"))
+ MakeApp = MakeApp + '%s\PcdValueCommon.c : %s\n' %
(self.OutputPath, PcdValueCommonPath)
+ MakeApp = MakeApp + '\tcopy /y %s $@\n' % (PcdValueCommonPath)
+ else:
+ PcdValueCommonPath =
os.path.normpath(mws.join(GlobalData.gGlobalDefines["EDK_TOOLS_PATH"],
"Source/C/Common/PcdValueCommon.c"))
+ MakeApp = MakeApp + '%s/PcdValueCommon.c : %s\n' %
(self.OutputPath, PcdValueCommonPath)
+ MakeApp = MakeApp + '\tcp -f %s %s/PcdValueCommon.c\n' %
(PcdValueCommonPath, self.OutputPath)
MakeFileName = os.path.join(self.OutputPath, 'Makefile')
MakeApp += "$(OBJECTS) : %s\n" % MakeFileName
SaveFileOnChange(MakeFileName, MakeApp, False)
--
2.14.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#55747): https://edk2.groups.io/g/devel/message/55747
Mute This Topic: https://groups.io/mt/71875979/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
