ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

A few changes to the new parallel build system 

- restored assemble/compile_c/compile_cpp, except now they return the commands
  that will run, instead of actually running the commands
- remove need_update_new, since it doesn't seem to be used anywhere
pull/433/head
Bogdan Marinescu 2014-08-07 17:01:39 +01:00
parent 8dbd2833fc
commit 45597fd8e6
4 changed files with 16 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
workspace_tools/toolchains/__init__.py
View File

@ -233,7 +233,6 @@ class mbedToolchain:
self.symbols = None
self.labels = None
self.has_config = False
self.stat_cache = {}
self.build_all = False
self.timestamp = time()
@ -314,31 +313,6 @@ class mbedToolchain:
return False
def need_update_new(self, target, dependencies):
if self.build_all:
return True
if not exists(target):
return True
target_mod_time = stat(target).st_mtime
for d in dependencies:
# Some objects are not provided with full path and here we do not have
# information about the library paths. Safe option: assume an update
if not d:
return True
if self.stat_cache.has_key(d):
if self.stat_cache[d] >= target_mod_time:
return True
else:
if not exists(d): return True
self.stat_cache[d] = stat(d).st_mtime
if self.stat_cache[d] >= target_mod_time: return True
return False
def scan_resources(self, path):
labels = self.get_labels()
resources = Resources(path)
@ -487,7 +461,7 @@ class mbedToolchain:
mkdir(work_dir)
# Queue mode (multiprocessing)
commands = self._compile_command(source, object, inc_paths)
commands = self.compile_command(source, object, inc_paths)
if commands is not None:
queue.append({
'source': source,
@ -514,7 +488,7 @@ class mbedToolchain:
self.progress("compile", item['source'], build_update=True)
for res in result['results']:
self.debug("Command: %s" % ' '.join(res['command']))
self._compile_output([
self.compile_output([
res['code'],
res['output'],
res['command']
@ -549,7 +523,7 @@ class mbedToolchain:
self.progress("compile", result['source'], build_update=True)
for res in result['results']:
self.debug("Command: %s" % ' '.join(res['command']))
self._compile_output([
self.compile_output([
res['code'],
res['output'],
res['command']
@ -576,7 +550,7 @@ class mbedToolchain:
return objects
def _compile_command(self, source, object, includes):
def compile_command(self, source, object, includes):
# Check dependencies
_, ext = splitext(source)
ext = ext.lower()
@ -586,17 +560,20 @@ class mbedToolchain:
dep_path = base + '.d'
deps = self.parse_dependencies(dep_path) if (exists(dep_path)) else []
if len(deps) == 0 or self.need_update(object, deps):
return self._compile(source, object, includes)
if ext == '.c':
return self.compile_c(source, object, includes)
else:
return self.compile_cpp(source, object, includes)
elif ext == '.s':
deps = [source]
if self.need_update(object, deps):
return self._assemble(source, object, includes)
return self.assemble(source, object, includes)
else:
return False
return None
def _compile_output(self, output=[]):
def compile_output(self, output=[]):
rc = output[0]
stderr = output[1]
command = output[2]
@ -610,11 +587,10 @@ class mbedToolchain:
if rc != 0:
raise ToolException(stderr)
def _compile(self, source, object, includes):
def compile(self, cc, source, object, includes):
_, ext = splitext(source)
ext = ext.lower()
cc = self.cppc if ext == ".cpp" else self.cc
command = cc + ['-D%s' % s for s in self.get_symbols()] + ["-I%s" % i for i in includes] + ["-o", object, source]
if hasattr(self, "get_dep_opt"):
@ -627,20 +603,11 @@ class mbedToolchain:
return [command]
def compile(self, source, object, includes):
self.progress("compile", source, build_update=True)
commands = self._compile(source, object, includes)
for command in commands:
self.debug("Command: %s" % ' '.join(command))
_, stderr, rc = run_cmd(command, dirname(object))
self._compile_output([rc, stderr, command])
def compile_c(self, source, object, includes):
self.compile(source, object, includes)
return self.compile(self.cc, source, object, includes)
def compile_cpp(self, source, object, includes):
self.compile(source, object, includes)
return self.compile(self.cppc, source, object, includes)
def build_library(self, objects, dir, name):
lib = self.STD_LIB_NAME % name

7
workspace_tools/toolchains/arm.py
View File

@ -80,7 +80,7 @@ class ARM(mbedToolchain):
if option in tool:
tool.remove(option)
def _assemble(self, source, object, includes):
def assemble(self, source, object, includes):
# Preprocess first, then assemble
tempfile = object + '.E.s'
return [
@ -88,11 +88,6 @@ class ARM(mbedToolchain):
self.hook.get_cmdline_assembler(self.asm + ["-o", object, tempfile])
]
def assemble(self, source, object, includes):
commands = self._assemble(source, object, includes);
for command in commands:
self.default_cmd(command)
def parse_dependencies(self, dep_path):
dependencies = []
for line in open(dep_path).readlines():

7
workspace_tools/toolchains/gcc.py
View File

@ -81,13 +81,8 @@ class GCC(mbedToolchain):
self.ar = join(tool_path, "arm-none-eabi-ar")
self.elf2bin = join(tool_path, "arm-none-eabi-objcopy")
def _assemble(self, source, object, includes):
return [self.hook.get_cmdline_assembler(self.asm + ['-D%s' % s for s in self.get_symbols() + self.macros] + ["-I%s" % i for i in includes] + ["-o", object, source])]
def assemble(self, source, object, includes):
commands = self._assemble(source, object, includes);
for command in commands:
self.default_cmd(command)
return [self.hook.get_cmdline_assembler(self.asm + ['-D%s' % s for s in self.get_symbols() + self.macros] + ["-I%s" % i for i in includes] + ["-o", object, source])]
def parse_dependencies(self, dep_path):
dependencies = []

7
workspace_tools/toolchains/iar.py
View File

@ -94,13 +94,8 @@ class IAR(mbedToolchain):
return [path.strip() for path in open(dep_path).readlines()
if (path and not path.isspace())]
def _assemble(self, source, object, includes):
return [self.hook.get_cmdline_assembler(self.asm + ['-D%s' % s for s in self.get_symbols() + self.macros] + ["-I%s" % i for i in includes] + ["-o", object, source])]
def assemble(self, source, object, includes):
commands = self._assemble(source, object, includes);
for command in commands:
self.default_cmd(command)
return [self.hook.get_cmdline_assembler(self.asm + ['-D%s' % s for s in self.get_symbols() + self.macros] + ["-I%s" % i for i in includes] + ["-o", object, source])]
def archive(self, objects, lib_path):
if exists(lib_path):