From nobody Sun May 5 04:51:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+55744+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55744+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1583906614; cv=none; d=zohomail.com; s=zohoarc; b=cf8u94EMkIVRK2UBw8aSm9Uca9enFS1Sqi/FhbEQVWpoQSytU6L/Ph9h3QoFaykNXIWxhCcSFPy4o0FYIASAPLZkate1I3qi5tUF8AnJQi67+Mkrue3bcqEUJLuNqwXLEPC4jkEkrcJMlVzizFXiaoo9oZTYgDMvT2rdJob+IHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583906614; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=In3THRuKG2GDNiEicm5hbO+F/uusK+l1fT7NWzbMlZg=; b=F0Unhj4pUzKln+oo8rOv4+XtzTlAPamQsR3S039hhTxNX3Ez5hdfGUTVIQNlnYIvJuosEKeo5sB5UpenCZ554ITNN/NgUrYTC0eiJxOvgdQIhx8iNpetuWRKFye40ylF8OGPPm1HsVO7z7cBB7QlmdKHLvA2oPnfaIZh5tYLHko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55744+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1583906614391237.6688085582424; Tue, 10 Mar 2020 23:03:34 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id r1glYY1788612xz95b2MTg2W; Tue, 10 Mar 2020 23:03:34 -0700 X-Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web10.2992.1583906613623164019 for ; Tue, 10 Mar 2020 23:03:33 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Mar 2020 23:03:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,539,1574150400"; d="scan'208";a="245937919" X-Received: from zhijufax-mobl.ccr.corp.intel.com ([10.238.4.120]) by orsmga006.jf.intel.com with ESMTP; 10 Mar 2020 23:03:31 -0700 From: "Fan, ZhijuX" To: devel@edk2.groups.io Cc: Liming Gao , Bob Feng , "Zhiju . Fan" Subject: [edk2-devel] [PATCH V2] BaseTools:copy the common PcdValueCommon.c to output directory Date: Wed, 11 Mar 2020 14:03:05 +0800 Message-Id: <20200311060305.15416-1-zhijux.fan@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhijux.fan@intel.com X-Gm-Message-State: kNWmjHPcEnvgvxjcpgvK0v6ax1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1583906614; bh=3dYOlsBR+bq3MBJynhWjdNpxM6LmuZ9hAEgFSlborlA=; h=Cc:Date:From:Reply-To:Subject:To; b=w8ax4f8ABWEfr5Zchgru0epWekE6wxRc2qBw5IFik25DCY04dI0WXylz5uUOv2bG/o3 IcfIY/5ZiUH4tPFbkgmvAwqSrWEjcdBv1Zqioy/CWJ+5PXTX/VUtcD8cCSFQr6R4CdMDK 7O/q92kb1c1JwI+CLwaztqnhBrVO4JtDGw4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2568 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 Cc: Bob Feng Signed-off-by: Zhiju.Fan --- copy source file PcdValueCommon.c in the generated Makefile instead of do it in python script 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..07647e835875 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -55,6 +55,7 @@ def _IsFieldValueAnArray (Value): return False =20 PcdValueInitName =3D 'PcdValueInit' +PcdValueCommonName =3D 'PcdValueCommon' =20 PcdMainCHeader =3D ''' /** @@ -2634,10 +2635,18 @@ class DscBuildData(PlatformBuildClassObject): =20 MakeApp =3D PcdMakefileHeader if sys.platform =3D=3D "win32": - MakeApp =3D MakeApp + 'APPFILE =3D %s\%s.exe\n' % (self.Output= Path, PcdValueInitName) + 'APPNAME =3D %s\n' % (PcdValueInitName) + 'OBJECT= S =3D %s\%s.obj %s.obj\n' % (self.OutputPath, PcdValueInitName, os.path.nor= mpath(mws.join(GlobalData.gGlobalDefines["EDK_TOOLS_PATH"], "Source/C/Commo= n/PcdValueCommon"))) + 'INC =3D ' + PcdValueCommonPath =3D os.path.normpath(mws.join(GlobalData.gG= lobalDefines["EDK_TOOLS_PATH"], "Source\C\Common\PcdValueCommon.c")) + MakeApp =3D MakeApp + 'all:%s\PcdValueCommon.c\n' % self.Outpu= tPath + MakeApp =3D MakeApp + '%s\PcdValueCommon.c : %s\n' % (self.Out= putPath, PcdValueCommonPath) + MakeApp =3D MakeApp + '\tcopy /y %s $@\n' % (PcdValueCommonPat= h) + MakeApp =3D MakeApp + 'APPFILE =3D %s\%s.exe\n' % (self.Output= Path, PcdValueInitName) + 'APPNAME =3D %s\n' % (PcdValueInitName) + 'OBJECT= S =3D %s\%s.obj %s.obj\n' % (self.OutputPath, PcdValueInitName, os.path.joi= n(self.OutputPath,'%s' % PcdValueCommonName)) + 'INC =3D ' else: MakeApp =3D MakeApp + PcdGccMakefile - MakeApp =3D MakeApp + 'APPFILE =3D %s/%s\n' % (self.OutputPath= , PcdValueInitName) + 'APPNAME =3D %s\n' % (PcdValueInitName) + 'OBJECTS = =3D %s/%s.o %s.o\n' % (self.OutputPath, PcdValueInitName, os.path.normpath(= mws.join(GlobalData.gGlobalDefines["EDK_TOOLS_PATH"], "Source/C/Common/PcdV= alueCommon"))) + \ + PcdValueCommonPath =3D os.path.normpath(mws.join(GlobalData.gG= lobalDefines["EDK_TOOLS_PATH"], "Source/C/Common/PcdValueCommon.c")) + MakeApp =3D MakeApp + 'all:%s\PcdValueCommon.c\n' % self.Outpu= tPath + MakeApp =3D MakeApp + '%s/PcdValueCommon.c : %s\n' % (self.Out= putPath, PcdValueCommonPath) + MakeApp =3D MakeApp + '\tcp -f %s %s/PcdValueCommon.c\n' % (Pc= dValueCommonPath, self.OutputPath) + MakeApp =3D MakeApp + 'APPFILE =3D %s/%s\n' % (self.OutputPath= , PcdValueInitName) + 'APPNAME =3D %s\n' % (PcdValueInitName) + 'OBJECTS = =3D %s/%s.o %s.o\n' % (self.OutputPath, PcdValueInitName, os.path.join(self= .OutputPath,'%s' % PcdValueCommonName)) + \ 'include $(MAKEROOT)/Makefiles/app.makefile\n' + 'IN= CLUDE +=3D' =20 IncSearchList =3D [] --=20 2.14.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#55744): https://edk2.groups.io/g/devel/message/55744 Mute This Topic: https://groups.io/mt/71874103/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-