From 08a54c9e0a3db85d6a9fa7f418a914ea978fecc7 Mon Sep 17 00:00:00 2001 From: Bob Feng Date: Tue, 13 Aug 2019 17:39:39 +0800 Subject: [PATCH] BaseTools: Move buildoptions.py to Common folder 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 Reviewed-by: Liming Gao --- 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 @@ -10,7 +10,7 @@ # 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 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 4de3f43c27..4bfa54666b 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -26,7 +26,7 @@ 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