From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: bob.c.feng@intel.com) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Tue, 13 Aug 2019 02:43:16 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Aug 2019 02:39:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,381,1559545200"; d="scan'208";a="183824276" Received: from unknown (HELO bfeng1-MOBL1.ccr.corp.intel.com) ([10.239.195.247]) by FMSMGA003.fm.intel.com with ESMTP; 13 Aug 2019 02:39:42 -0700 From: "Bob Feng" To: edk2-devel@lists.01.org, devel@edk2.groups.io Cc: Liming Gao , Bob Feng Subject: [Patch] BaseTools: Move buildoptions.py to Common folder Date: Tue, 13 Aug 2019 17:39:39 +0800 Message-Id: <20190813093939.19864-1-bob.c.feng@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 buildoptions is used by build.py and TargetTxtClassObj.py Move buildoptions.py to Common folder so that build tool and ECC tool work fine. Cc: Liming Gao Signed-off-by: Bob Feng --- BaseTools/Source/Python/Common/TargetTxtClassObject.py | 2 +- BaseTools/Source/Python/{build => Common}/buildoptions.py | 0 BaseTools/Source/Python/build/build.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename BaseTools/Source/Python/{build => Common}/buildoptions.py (100%) diff --git a/BaseTools/Source/Python/Common/TargetTxtClassObject.py b/BaseTools/Source/Python/Common/TargetTxtClassObject.py index 16cc75ccb7..723b9405bf 100644 --- a/BaseTools/Source/Python/Common/TargetTxtClassObject.py +++ b/BaseTools/Source/Python/Common/TargetTxtClassObject.py @@ -8,11 +8,11 @@ ## # Import Modules # from __future__ import print_function from __future__ import absolute_import -from buildoptions import BuildOption,BuildTarget +from Common.buildoptions import BuildOption,BuildTarget import Common.GlobalData as GlobalData import Common.LongFilePathOs as os from . import EdkLogger from . import DataType from .BuildToolError import * diff --git a/BaseTools/Source/Python/build/buildoptions.py b/BaseTools/Source/Python/Common/buildoptions.py similarity index 100% rename from BaseTools/Source/Python/build/buildoptions.py rename to BaseTools/Source/Python/Common/buildoptions.py diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index 23f4a9f8d1..4e4dcc47ef 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -24,11 +24,11 @@ import traceback import multiprocessing from threading import Thread,Event,BoundedSemaphore import threading from subprocess import Popen,PIPE from collections import OrderedDict, defaultdict -from buildoptions import BuildOption,BuildTarget +from Common.buildoptions import BuildOption,BuildTarget from AutoGen.PlatformAutoGen import PlatformAutoGen from AutoGen.ModuleAutoGen import ModuleAutoGen from AutoGen.WorkspaceAutoGen import WorkspaceAutoGen from AutoGen.AutoGenWorker import AutoGenWorkerInProcess,AutoGenManager,\ LogAgent -- 2.18.0.windows.1