summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Feng <bob.c.feng@intel.com>2019-08-13 17:39:39 +0800
committerFeng, Bob C <bob.c.feng@intel.com>2019-08-14 13:54:49 +0800
commit08a54c9e0a3db85d6a9fa7f418a914ea978fecc7 (patch)
tree9da516f7ff4e0b218a9e88846492650ec7876490
parent1f06aa24c29405f271f514f01c396c2ba19c1370 (diff)
downloadedk2-08a54c9e0a3db85d6a9fa7f418a914ea978fecc7.tar.gz
edk2-08a54c9e0a3db85d6a9fa7f418a914ea978fecc7.tar.bz2
edk2-08a54c9e0a3db85d6a9fa7f418a914ea978fecc7.zip
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 <liming.gao@intel.com> Signed-off-by: Bob Feng <bob.c.feng@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
-rw-r--r--BaseTools/Source/Python/Common/TargetTxtClassObject.py2
-rw-r--r--BaseTools/Source/Python/Common/buildoptions.py (renamed from BaseTools/Source/Python/build/buildoptions.py)0
-rw-r--r--BaseTools/Source/Python/build/build.py2
3 files changed, 2 insertions, 2 deletions
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
index 7161aa66f2..7161aa66f2 100644
--- a/BaseTools/Source/Python/build/buildoptions.py
+++ b/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