At present buildman sets the python path on startup so that it can access
the libraries it needs. If we convert to use absolute imports this is not
necessary.
Move buildman to use absolute imports. Also adjust moveconfig.py too since
it uses some buildman modules and cannot work without this.
Signed-off-by: Simon Glass <sjg@chromium.org>
import threading
import time
import threading
import time
+from buildman import builderthread
+from buildman import toolchain
import command
import gitutil
import terminal
from terminal import Print
import command
import gitutil
import terminal
from terminal import Print
import multiprocessing
import os
import shutil
import multiprocessing
import os
import shutil
-import board
-import bsettings
-from builder import Builder
+from buildman import board
+from buildman import bsettings
+from buildman import toolchain
+from buildman.builder import Builder
+import command
import gitutil
import patchstream
import terminal
from terminal import Print
import gitutil
import patchstream
import terminal
from terminal import Print
-import toolchain
-import command
-import subprocess
def GetPlural(count):
"""Returns a plural 's' if count is not 1"""
def GetPlural(count):
"""Returns a plural 's' if count is not 1"""
import tempfile
import unittest
import tempfile
import unittest
-import board
-import bsettings
-import cmdline
+from buildman import board
+from buildman import bsettings
+from buildman import cmdline
+from buildman import control
+from buildman import toolchain
import gitutil
import terminal
import toolchain
import gitutil
import terminal
import toolchain
"""See README for more information"""
"""See README for more information"""
import multiprocessing
import os
import re
import multiprocessing
import os
import re
# Bring in the patman libraries
our_path = os.path.dirname(os.path.realpath(__file__))
# Bring in the patman libraries
our_path = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(1, os.path.join(our_path, '../patman'))
+sys.path.insert(1, os.path.join(our_path, '..'))
+sys.path.insert(2, os.path.join(our_path, '../patman'))
-import board
-import bsettings
-import builder
-import checkpatch
-import cmdline
-import control
-import doctest
-import gitutil
+from buildman import board
+from buildman import bsettings
+from buildman import builder
+from buildman import cmdline
+from buildman import control
+from buildman import toolchain
def RunTests(skip_net_tests):
import func_test
def RunTests(skip_net_tests):
import func_test
our_path = os.path.dirname(os.path.realpath(__file__))
sys.path.append(os.path.join(our_path, '../patman'))
our_path = os.path.dirname(os.path.realpath(__file__))
sys.path.append(os.path.join(our_path, '../patman'))
-import board
-import bsettings
-import builder
-import control
-import command
+from buildman import board
+from buildman import bsettings
+from buildman import builder
+from buildman import control
+from buildman import toolchain
import terminal
import test_util
import terminal
import test_util
import tools
use_network = True
import tools
use_network = True
import tempfile
import urllib.request, urllib.error, urllib.parse
import tempfile
import urllib.request, urllib.error, urllib.parse
+from buildman import bsettings
import command
import terminal
import tools
import command
import terminal
import tools
import threading
import time
import threading
import time
-sys.path.append(os.path.join(os.path.dirname(__file__), 'buildman'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
sys.path.append(os.path.join(os.path.dirname(__file__), 'patman'))
sys.path.append(os.path.join(os.path.dirname(__file__), 'patman'))
-import bsettings
-import kconfiglib
-import toolchain
+from buildman import bsettings
+from buildman import kconfiglib
+from buildman import toolchain
SHOW_GNU_MAKE = 'scripts/show-gnu-make'
SLEEP_TIME=0.03
SHOW_GNU_MAKE = 'scripts/show-gnu-make'
SLEEP_TIME=0.03