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%)
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>
---
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
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#45515): https://edk2.groups.io/g/devel/message/45515
Mute This Topic: https://groups.io/mt/32850915/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Bob: Can you submit BZ for this change? I want to know what problem will be fixed by this change. >-----Original Message----- >From: Feng, Bob C >Sent: Tuesday, August 13, 2019 5:40 PM >To: edk2-devel@lists.01.org; devel@edk2.groups.io >Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com> >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 <liming.gao@intel.com> >Signed-off-by: Bob Feng <bob.c.feng@intel.com> >--- > 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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#45514): https://edk2.groups.io/g/devel/message/45514 Mute This Topic: https://groups.io/mt/32850915/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.