From: Simon Glass <simon.glass@canonical.com> Rename all CamelCase methods in toolchain.py to snake_case to follow Python naming conventions and fix pylint warnings. Toolchain class: - GetPriority() -> get_priority() - GetWrapper() -> get_wrapper() - GetEnvArgs() -> get_env_args() - MakeEnvironment() -> make_environment() - MakeArgs() -> make_args() Toolchains class: - GetPathList() -> get_path_list() - GetSettings() -> get_settings() - Add() -> add() - ScanPath() -> scan_path() - ScanPathEnv() -> scan_path_env() - Scan() -> scan() - List() -> list() - Select() -> select() - ResolveReferences() -> resolve_references() - GetMakeArguments() -> get_make_arguments() - LocateArchUrl() -> locate_arch_url() - Unpack() -> unpack() - TestSettingsHasPath() -> test_settings_has_path() - ListArchs() -> list_archs() - FetchAndInstall() -> fetch_and_install() Update all callers in buildman and qconfig.py. Co-developed-by: Claude <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- tools/buildman/builder.py | 2 +- tools/buildman/builderthread.py | 6 +-- tools/buildman/control.py | 16 +++--- tools/buildman/func_test.py | 6 +-- tools/buildman/test.py | 90 ++++++++++++++++----------------- tools/buildman/toolchain.py | 84 +++++++++++++++--------------- tools/qconfig.py | 8 +-- 7 files changed, 106 insertions(+), 106 deletions(-) diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index e218aa4184a..28943a5a9b8 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -435,7 +435,7 @@ class Builder: key (str): Variable name value (str): Variable value """ - env = toolchain.MakeEnvironment(self.full_path) + env = toolchain.make_environment(self.full_path) if self.dtc: env[b'DTC'] = tools.to_bytes(self.dtc) return env diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index 3d1b656531d..0fd589934fe 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -274,8 +274,8 @@ class BuilderThread(threading.Thread): args.append('NO_LTO=1') if self.builder.reproducible_builds: args.append('SOURCE_DATE_EPOCH=0') - args.extend(self.builder.toolchains.GetMakeArguments(brd)) - args.extend(self.toolchain.MakeArgs()) + args.extend(self.builder.toolchains.get_make_arguments(brd)) + args.extend(self.toolchain.make_args()) return args, cwd, src_dir def _reconfigure(self, commit, brd, cwd, args, env, config_args, config_out, @@ -549,7 +549,7 @@ class BuilderThread(threading.Thread): # We are going to have to build it. First, get a toolchain if not self.toolchain: try: - self.toolchain = self.builder.toolchains.Select(brd.arch) + self.toolchain = self.builder.toolchains.select(brd.arch) except ValueError as err: result.return_code = 10 result.stdout = '' diff --git a/tools/buildman/control.py b/tools/buildman/control.py index f43d8fcf715..88e8338c599 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -152,11 +152,11 @@ def show_toolchain_prefix(brds, toolchains): board_selected = brds.get_selected_dict() tc_set = set() for brd in board_selected.values(): - tc_set.add(toolchains.Select(brd.arch)) + tc_set.add(toolchains.select(brd.arch)) if len(tc_set) != 1: sys.exit('Supplied boards must share one toolchain') tchain = tc_set.pop() - print(tchain.GetEnvArgs(toolchain.VAR_CROSS_COMPILE)) + print(tchain.get_env_args(toolchain.VAR_CROSS_COMPILE)) def show_arch(brds): """Show information about a the architecture used by one or more boards @@ -330,19 +330,19 @@ def do_fetch_arch(toolchains, col, fetch_arch): int: Return code for buildman """ if fetch_arch == 'list': - sorted_list = toolchains.ListArchs() + sorted_list = toolchains.list_archs() print(col.build( col.BLUE, f"Available architectures: {' '.join(sorted_list)}\n")) return 0 if fetch_arch == 'all': - fetch_arch = ','.join(toolchains.ListArchs()) + fetch_arch = ','.join(toolchains.list_archs()) print(col.build(col.CYAN, f'\nDownloading toolchains: {fetch_arch}')) for arch in fetch_arch.split(','): print() - ret = toolchains.FetchAndInstall(arch) + ret = toolchains.fetch_and_install(arch) if ret: return ret return 0 @@ -374,10 +374,10 @@ def get_toolchains(toolchains, col, override_toolchain, fetch_arch, return do_fetch_arch(toolchains, col, fetch_arch) if no_toolchains: - toolchains.GetSettings() - toolchains.Scan(list_tool_chains and verbose) + toolchains.get_settings() + toolchains.scan(list_tool_chains and verbose) if list_tool_chains: - toolchains.List() + toolchains.list() print() return 0 return toolchains diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index 6167ea525e7..3ecbd22613f 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -194,8 +194,8 @@ class TestFunctional(unittest.TestCase): bsettings.setup(None) bsettings.add_file(settings_data) self.setupToolchains() - self._toolchains.Add('arm-gcc', test=False) - self._toolchains.Add('powerpc-gcc', test=False) + self._toolchains.add('arm-gcc', test=False) + self._toolchains.add('powerpc-gcc', test=False) self._boards = boards.Boards() for brd in BOARDS: self._boards.add_board(board.Board(*brd)) @@ -232,7 +232,7 @@ class TestFunctional(unittest.TestCase): def setupToolchains(self): self._toolchains = toolchain.Toolchains() - self._toolchains.Add('gcc', test=False) + self._toolchains.add('gcc', test=False) def _RunBuildman(self, *args): all_args = [self._buildman_pathname] + list(args) diff --git a/tools/buildman/test.py b/tools/buildman/test.py index 8269dfec2ba..3d153619d5d 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -166,11 +166,11 @@ class TestBuild(unittest.TestCase): # Set up the toolchains self.toolchains = toolchain.Toolchains() - self.toolchains.Add('arm-linux-gcc', test=False) - self.toolchains.Add('sparc-linux-gcc', test=False) - self.toolchains.Add('powerpc-linux-gcc', test=False) - self.toolchains.Add('/path/to/aarch64-linux-gcc', test=False) - self.toolchains.Add('gcc', test=False) + self.toolchains.add('arm-linux-gcc', test=False) + self.toolchains.add('sparc-linux-gcc', test=False) + self.toolchains.add('powerpc-linux-gcc', test=False) + self.toolchains.add('/path/to/aarch64-linux-gcc', test=False) + self.toolchains.add('gcc', test=False) # Avoid sending any output terminal.set_print_test_mode() @@ -594,82 +594,82 @@ class TestBuild(unittest.TestCase): self.CheckDirs(build, '') def testToolchainAliases(self): - self.assertTrue(self.toolchains.Select('arm') != None) + self.assertTrue(self.toolchains.select('arm') != None) with self.assertRaises(ValueError): - self.toolchains.Select('no-arch') + self.toolchains.select('no-arch') with self.assertRaises(ValueError): - self.toolchains.Select('x86') + self.toolchains.select('x86') self.toolchains = toolchain.Toolchains() - self.toolchains.Add('x86_64-linux-gcc', test=False) - self.assertTrue(self.toolchains.Select('x86') != None) + self.toolchains.add('x86_64-linux-gcc', test=False) + self.assertTrue(self.toolchains.select('x86') != None) self.toolchains = toolchain.Toolchains() - self.toolchains.Add('i386-linux-gcc', test=False) - self.assertTrue(self.toolchains.Select('x86') != None) + self.toolchains.add('i386-linux-gcc', test=False) + self.assertTrue(self.toolchains.select('x86') != None) def testToolchainDownload(self): """Test that we can download toolchains""" if use_network: with terminal.capture() as (stdout, stderr): - url = self.toolchains.LocateArchUrl('arm') + url = self.toolchains.locate_arch_url('arm') self.assertRegex(url, 'https://www.kernel.org/pub/tools/' 'crosstool/files/bin/x86_64/.*/' 'x86_64-gcc-.*-nolibc[-_]arm-.*linux-gnueabi.tar.xz') def testGetEnvArgs(self): """Test the GetEnvArgs() function""" - tc = self.toolchains.Select('arm') + tc = self.toolchains.select('arm') self.assertEqual('arm-linux-', - tc.GetEnvArgs(toolchain.VAR_CROSS_COMPILE)) - self.assertEqual('', tc.GetEnvArgs(toolchain.VAR_PATH)) + tc.get_env_args(toolchain.VAR_CROSS_COMPILE)) + self.assertEqual('', tc.get_env_args(toolchain.VAR_PATH)) self.assertEqual('arm', - tc.GetEnvArgs(toolchain.VAR_ARCH)) - self.assertEqual('', tc.GetEnvArgs(toolchain.VAR_MAKE_ARGS)) + tc.get_env_args(toolchain.VAR_ARCH)) + self.assertEqual('', tc.get_env_args(toolchain.VAR_MAKE_ARGS)) - tc = self.toolchains.Select('sandbox') - self.assertEqual('', tc.GetEnvArgs(toolchain.VAR_CROSS_COMPILE)) + tc = self.toolchains.select('sandbox') + self.assertEqual('', tc.get_env_args(toolchain.VAR_CROSS_COMPILE)) - self.toolchains.Add('/path/to/x86_64-linux-gcc', test=False) - tc = self.toolchains.Select('x86') + self.toolchains.add('/path/to/x86_64-linux-gcc', test=False) + tc = self.toolchains.select('x86') self.assertEqual('/path/to', - tc.GetEnvArgs(toolchain.VAR_PATH)) + tc.get_env_args(toolchain.VAR_PATH)) tc.override_toolchain = 'clang' self.assertEqual('HOSTCC=clang CC=clang', - tc.GetEnvArgs(toolchain.VAR_MAKE_ARGS)) + tc.get_env_args(toolchain.VAR_MAKE_ARGS)) # Test config with ccache wrapper bsettings.setup(None) bsettings.add_file(settings_data_wrapper) - tc = self.toolchains.Select('arm') + tc = self.toolchains.select('arm') self.assertEqual('ccache arm-linux-', - tc.GetEnvArgs(toolchain.VAR_CROSS_COMPILE)) + tc.get_env_args(toolchain.VAR_CROSS_COMPILE)) - tc = self.toolchains.Select('sandbox') - self.assertEqual('', tc.GetEnvArgs(toolchain.VAR_CROSS_COMPILE)) + tc = self.toolchains.select('sandbox') + self.assertEqual('', tc.get_env_args(toolchain.VAR_CROSS_COMPILE)) def testMakeEnvironment(self): - """Test the MakeEnvironment function""" + """Test the make_environment function""" os.environ.pop('CROSS_COMPILE', None) - tc = self.toolchains.Select('arm') - env = tc.MakeEnvironment(False) + tc = self.toolchains.select('arm') + env = tc.make_environment(False) self.assertEqual(env[b'CROSS_COMPILE'], b'arm-linux-') - tc = self.toolchains.Select('sandbox') - env = tc.MakeEnvironment(False) + tc = self.toolchains.select('sandbox') + env = tc.make_environment(False) self.assertTrue(b'CROSS_COMPILE' not in env) # Test config with ccache wrapper bsettings.setup(None) bsettings.add_file(settings_data_wrapper) - tc = self.toolchains.Select('arm') - env = tc.MakeEnvironment(False) + tc = self.toolchains.select('arm') + env = tc.make_environment(False) self.assertEqual(env[b'CROSS_COMPILE'], b'ccache arm-linux-') - tc = self.toolchains.Select('sandbox') - env = tc.MakeEnvironment(False) + tc = self.toolchains.select('sandbox') + env = tc.make_environment(False) self.assertTrue(b'CROSS_COMPILE' not in env) def testPrepareOutputSpace(self): @@ -942,7 +942,7 @@ class TestBuild(unittest.TestCase): self.assertEqual(self.finish_time, self.cur_time) def call_make_environment(self, tchn, full_path, in_env=None): - """Call Toolchain.MakeEnvironment() and process the result + """Call Toolchain.make_environment() and process the result Args: tchn (Toolchain): Toolchain to use @@ -958,7 +958,7 @@ class TestBuild(unittest.TestCase): which were added) str: Full value of the new PATH variable """ - env = tchn.MakeEnvironment(full_path, env=in_env) + env = tchn.make_environment(full_path, env=in_env) # Get the original environment orig_env = dict(os.environb if in_env is None else in_env) @@ -983,7 +983,7 @@ class TestBuild(unittest.TestCase): def test_toolchain_env(self): """Test PATH and other environment settings for toolchains""" # Use a toolchain which has a path, so that full_path makes a difference - tchn = self.toolchains.Select('aarch64') + tchn = self.toolchains.select('aarch64') # Normal cases diff = self.call_make_environment(tchn, full_path=False)[0] @@ -1044,13 +1044,13 @@ class TestBuild(unittest.TestCase): build = builder.Builder(self.toolchains, self.base_dir, None, 0, 2, dtc_skip=True) - tch = self.toolchains.Select('arm') + tch = self.toolchains.select('arm') env = build.make_environment(tch) self.assertIn(b'DTC', env) # Try the normal case, i.e. not skipping the dtc build build = builder.Builder(self.toolchains, self.base_dir, None, 0, 2) - tch = self.toolchains.Select('arm') + tch = self.toolchains.select('arm') env = build.make_environment(tch) self.assertNotIn(b'DTC', env) finally: @@ -1065,12 +1065,12 @@ class TestBuild(unittest.TestCase): # Set up the toolchains home = os.path.expanduser('~') toolchains = toolchain.Toolchains() - toolchains.GetSettings() + toolchains.get_settings() self.assertEqual([f'{home}/mypath'], toolchains.paths) # Check scanning with terminal.capture() as (stdout, _): - toolchains.Scan(verbose=True, raise_on_error=False) + toolchains.scan(verbose=True, raise_on_error=False) lines = iter(stdout.getvalue().splitlines() + ['##done']) self.assertEqual('Scanning for tool chains', next(lines)) self.assertEqual(f" - scanning prefix '{home}/mypath-x86-'", @@ -1087,7 +1087,7 @@ class TestBuild(unittest.TestCase): # Check adding a toolchain with terminal.capture() as (stdout, _): - toolchains.Add('~/aarch64-linux-gcc', test=True, verbose=True) + toolchains.add('~/aarch64-linux-gcc', test=True, verbose=True) lines = iter(stdout.getvalue().splitlines() + ['##done']) self.assertEqual('Tool chain test: BAD', next(lines)) self.assertEqual(f'Command: {home}/aarch64-linux-gcc --version', diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 5e5bb4b0aed..346bb349dfe 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -91,12 +91,12 @@ class Toolchain: if self.arch == 'sandbox' and override_toolchain: self.gcc = override_toolchain - env = self.MakeEnvironment(False) + env = self.make_environment(False) # As a basic sanity check, run the C compiler with --version cmd = [fname, '--version'] if priority == PRIORITY_CALC: - self.priority = self.GetPriority(fname) + self.priority = self.get_priority(fname) else: self.priority = priority if test: @@ -116,7 +116,7 @@ class Toolchain: else: self.ok = True - def GetPriority(self, fname): + def get_priority(self, fname): """Return the priority of the toolchain. Toolchains are ranked according to their suitability by their @@ -136,7 +136,7 @@ class Toolchain: return PRIORITY_CALC + prio return PRIORITY_CALC + prio - def GetWrapper(self, show_warning=True): + def get_wrapper(self, show_warning=True): """Get toolchain wrapper from the setting file. """ value = '' @@ -148,7 +148,7 @@ class Toolchain: return value - def GetEnvArgs(self, which): + def get_env_args(self, which): """Get an environment variable/args value based on the the toolchain Args: @@ -158,7 +158,7 @@ class Toolchain: Value of that environment variable or arguments """ if which == VAR_CROSS_COMPILE: - wrapper = self.GetWrapper() + wrapper = self.get_wrapper() base = '' if self.arch == 'sandbox' else self.path if (base == '' and self.cross == ''): return '' @@ -168,14 +168,14 @@ class Toolchain: elif which == VAR_ARCH: return self.arch elif which == VAR_MAKE_ARGS: - args = self.MakeArgs() + args = self.make_args() if args: return ' '.join(args) return '' else: raise ValueError('Unknown arg to GetEnvArgs (%d)' % which) - def MakeEnvironment(self, full_path, env=None): + def make_environment(self, full_path, env=None): """Returns an environment for using the toolchain. This takes the current environment and adds CROSS_COMPILE so that @@ -206,7 +206,7 @@ class Toolchain: """ env = dict(env or os.environb) - wrapper = self.GetWrapper() + wrapper = self.get_wrapper() if self.override_toolchain: # We'll use MakeArgs() to provide this @@ -238,7 +238,7 @@ class Toolchain: return env - def MakeArgs(self): + def make_args(self): """Create the 'make' arguments for a toolchain This is only used when the toolchain is being overridden. Since the @@ -277,7 +277,7 @@ class Toolchains: self.override_toolchain = override_toolchain self._make_flags = dict(bsettings.get_items('make-flags')) - def GetPathList(self, show_warning=True): + def get_path_list(self, show_warning=True): """Get a list of available toolchain paths Args: @@ -304,16 +304,16 @@ class Toolchains: paths.append(fname) return paths - def GetSettings(self, show_warning=True): + def get_settings(self, show_warning=True): """Get toolchain settings from the settings file. Args: show_warning: True to show a warning if there are no tool chains. """ self.prefixes = bsettings.get_items('toolchain-prefix') - self.paths += self.GetPathList(show_warning) + self.paths += self.get_path_list(show_warning) - def Add(self, fname, test=True, verbose=False, priority=PRIORITY_CALC, + def add(self, fname, test=True, verbose=False, priority=PRIORITY_CALC, arch=None): """Add a toolchain to our list @@ -341,7 +341,7 @@ class Toolchains: (toolchain.gcc, toolchain.priority, toolchain.arch, self.toolchains[toolchain.arch].priority))) - def ScanPath(self, path, verbose): + def scan_path(self, path, verbose): """Scan a path for a valid toolchain Args: @@ -359,7 +359,7 @@ class Toolchains: fnames.append(fname) return fnames - def ScanPathEnv(self, fname): + def scan_path_env(self, fname): """Scan the PATH environment variable for a given filename. Args: @@ -375,7 +375,7 @@ class Toolchains: pathname_list.append(pathname) return pathname_list - def Scan(self, verbose, raise_on_error=True): + def scan(self, verbose, raise_on_error=True): """Scan for available toolchains and select the best for each arch. We look for all the toolchains we can file, figure out the @@ -390,15 +390,15 @@ class Toolchains: fname = os.path.expanduser(value) if verbose: print(" - scanning prefix '%s'" % fname) if os.path.exists(fname): - self.Add(fname, True, verbose, PRIORITY_FULL_PREFIX, name) + self.add(fname, True, verbose, PRIORITY_FULL_PREFIX, name) continue fname += 'gcc' if os.path.exists(fname): - self.Add(fname, True, verbose, PRIORITY_PREFIX_GCC, name) + self.add(fname, True, verbose, PRIORITY_PREFIX_GCC, name) continue - fname_list = self.ScanPathEnv(fname) + fname_list = self.scan_path_env(fname) for f in fname_list: - self.Add(f, True, verbose, PRIORITY_PREFIX_GCC_PATH, name) + self.add(f, True, verbose, PRIORITY_PREFIX_GCC_PATH, name) if not fname_list: msg = f"No tool chain found for prefix '{fname}'" if raise_on_error: @@ -407,11 +407,11 @@ class Toolchains: print(f'Error: {msg}') for path in self.paths: if verbose: print(" - scanning path '%s'" % path) - fnames = self.ScanPath(path, verbose) + fnames = self.scan_path(path, verbose) for fname in fnames: - self.Add(fname, True, verbose) + self.add(fname, True, verbose) - def List(self): + def list(self): """List out the selected toolchains for each architecture""" col = terminal.Color() print(col.build(col.BLUE, 'List of available toolchains (%d):' % @@ -422,7 +422,7 @@ class Toolchains: else: print('None') - def Select(self, arch): + def select(self, arch): """Returns the toolchain for a given architecture Args: @@ -441,7 +441,7 @@ class Toolchains: raise ValueError("No tool chain found for arch '%s'" % arch) return self.toolchains[arch] - def ResolveReferences(self, var_dict, args): + def resolve_references(self, var_dict, args): """Resolve variable references in a string This converts ${blah} within the string to the value of blah. @@ -455,12 +455,12 @@ class Toolchains: Returns: >>> bsettings.setup(None) >>> tcs = Toolchains() - >>> tcs.Add('fred', False) + >>> tcs.add('fred', False) >>> var_dict = {'oblique' : 'OBLIQUE', 'first' : 'fi${second}rst', \ 'second' : '2nd'} - >>> tcs.ResolveReferences(var_dict, 'this=${oblique}_set') + >>> tcs.resolve_references(var_dict, 'this=${oblique}_set') 'this=OBLIQUE_set' - >>> tcs.ResolveReferences(var_dict, 'this=${oblique}_set${first}nd') + >>> tcs.resolve_references(var_dict, 'this=${oblique}_set${first}nd') 'this=OBLIQUE_setfi2ndrstnd' """ re_var = re.compile(r'(\$\{[-_a-z0-9A-Z]{1,}\})') @@ -474,7 +474,7 @@ class Toolchains: args = args[:m.start(0)] + value + args[m.end(0):] return args - def GetMakeArguments(self, brd): + def get_make_arguments(self, brd): """Returns 'make' arguments for a given board The flags are in a section called 'make-flags'. Flags are named @@ -500,7 +500,7 @@ class Toolchains: 'make' flags for that board, or '' if none """ self._make_flags['target'] = brd.target - arg_str = self.ResolveReferences(self._make_flags, + arg_str = self.resolve_references(self._make_flags, self._make_flags.get(brd.target, '')) args = re.findall(r"(?:\".*?\"|\S)+", arg_str) i = 0 @@ -512,7 +512,7 @@ class Toolchains: i += 1 return args - def LocateArchUrl(self, fetch_arch): + def locate_arch_url(self, fetch_arch): """Find a toolchain available online Look in standard places for available toolchains. At present the @@ -548,7 +548,7 @@ class Toolchains: return arch, links return None - def Unpack(self, fname, dest): + def unpack(self, fname, dest): """Unpack a tar file Args: @@ -562,18 +562,18 @@ class Toolchains: dirs = stdout.splitlines()[1].split('/')[:2] return '/'.join(dirs) - def TestSettingsHasPath(self, path): + def test_settings_has_path(self, path): """Check if buildman will find this toolchain Returns: True if the path is in settings, False if not """ - paths = self.GetPathList(False) + paths = self.get_path_list(False) return path in paths - def ListArchs(self): + def list_archs(self): """List architectures with available toolchains to download""" - host_arch, archives = self.LocateArchUrl('list') + host_arch, archives = self.locate_arch_url('list') re_arch = re.compile('[-a-z0-9.]*[-_]([^-]*)-.*') arch_set = set() for archive in archives: @@ -584,7 +584,7 @@ class Toolchains: arch_set.add(arch.group(1)) return sorted(arch_set) - def FetchAndInstall(self, arch): + def fetch_and_install(self, arch): """Fetch and install a new toolchain arch: @@ -593,7 +593,7 @@ class Toolchains: # Fist get the URL for this architecture col = terminal.Color() print(col.build(col.BLUE, "Downloading toolchain for arch '%s'" % arch)) - url = self.LocateArchUrl(arch) + url = self.locate_arch_url(arch) if not url: print(("Cannot find toolchain for arch '%s' - use 'list' to list" % arch)) @@ -609,7 +609,7 @@ class Toolchains: return 1 print(col.build(col.GREEN, 'Unpacking to: %s' % dest), end=' ') sys.stdout.flush() - path = self.Unpack(tarfile, dest) + path = self.unpack(tarfile, dest) os.remove(tarfile) os.rmdir(tmpdir) print() @@ -617,7 +617,7 @@ class Toolchains: # Check that the toolchain works print(col.build(col.GREEN, 'Testing')) dirpath = os.path.join(dest, path) - compiler_fname_list = self.ScanPath(dirpath, True) + compiler_fname_list = self.scan_path(dirpath, True) if not compiler_fname_list: print('Could not locate C compiler - fetch failed.') return 1 @@ -627,7 +627,7 @@ class Toolchains: toolchain = Toolchain(compiler_fname_list[0], True, True) # Make sure that it will be found by buildman - if not self.TestSettingsHasPath(dirpath): + if not self.test_settings_has_path(dirpath): print(("Adding 'download' to config file '%s'" % bsettings.config_fname)) bsettings.set_item('toolchain', 'download', '%s/*/*' % dest) diff --git a/tools/qconfig.py b/tools/qconfig.py index eca6f5b1e1c..70d53b5f8d9 100755 --- a/tools/qconfig.py +++ b/tools/qconfig.py @@ -506,14 +506,14 @@ class Slot: arch = self.parser.get_arch() try: - tchain = self.toolchains.Select(arch) + tchain = self.toolchains.select(arch) except ValueError: self.log.append(self.col.build( self.col.YELLOW, f"Tool chain for '{arch}' is missing: do nothing")) self.finish(False) return - env = tchain.MakeEnvironment(False) + env = tchain.make_environment(False) cmd = list(self.make_cmd) cmd.append('KCONFIG_IGNORE_DUPLICATES=1') @@ -745,8 +745,8 @@ def move_config(args): # Get toolchains to use toolchains = toolchain.Toolchains() - toolchains.GetSettings() - toolchains.Scan(verbose=False) + toolchains.get_settings() + toolchains.scan(verbose=False) if args.git_ref: reference_src = ReferenceSource(args.git_ref) -- 2.43.0