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

Added missing macros to symbol list

pull/452/head
Przemek Wirkus 2014-08-20 10:59:28 +01:00
parent f44b3ab3e2
commit a9713521d7
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
workspace_tools/toolchains/__init__.py
View File

@ -32,7 +32,7 @@ import workspace_tools.hooks as hooks
import re import re
#Disables multiprocessing if set to higher number than the host machine CPUs #Disables multiprocessing if set to higher number than the host machine CPUs
CPU_COUNT_MIN = 1 CPU_COUNT_MIN = 1
def print_notify(event): def print_notify(event):
# Default command line notification # Default command line notification
@ -74,7 +74,7 @@ def compile_worker(job):
'output': stderr, 'output': stderr,
'command': command 'command': command
}) })
return { return {
'source': job['source'], 'source': job['source'],
'object': job['object'], 'object': job['object'],
@ -235,11 +235,11 @@ class mbedToolchain:
self.build_all = False self.build_all = False
self.timestamp = time() self.timestamp = time()
self.jobs = 1 self.jobs = 1
self.CHROOT = None self.CHROOT = None
self.mp_pool = None self.mp_pool = None
def __exit__(self): def __exit__(self):
if self.mp_pool is not None: if self.mp_pool is not None:
self.mp_pool.terminate() self.mp_pool.terminate()
@ -271,8 +271,9 @@ class mbedToolchain:
self.symbols.append('MBED_USERNAME=' + MBED_ORG_USER) self.symbols.append('MBED_USERNAME=' + MBED_ORG_USER)
# Add target's symbols # Add target's symbols
for macro in self.target.macros: self.symbols += self.target.macros
self.symbols.append(macro) # Add extra symbols passed via 'macros' parameter
self.symbols += self.macros
# Form factor variables # Form factor variables
if hasattr(self.target, 'supported_form_factors'): if hasattr(self.target, 'supported_form_factors'):
@ -310,7 +311,7 @@ class mbedToolchain:
return True return True
return False return False
def scan_resources(self, path): def scan_resources(self, path):
labels = self.get_labels() labels = self.get_labels()
resources = Resources(path) resources = Resources(path)
@ -426,38 +427,38 @@ class mbedToolchain:
obj_dir = join(build_path, relpath(source_dir, base_dir)) obj_dir = join(build_path, relpath(source_dir, base_dir))
mkdir(obj_dir) mkdir(obj_dir)
return join(obj_dir, name + '.o') return join(obj_dir, name + '.o')
def compile_sources(self, resources, build_path, inc_dirs=None): def compile_sources(self, resources, build_path, inc_dirs=None):
# Web IDE progress bar for project build # Web IDE progress bar for project build
files_to_compile = resources.s_sources + resources.c_sources + resources.cpp_sources files_to_compile = resources.s_sources + resources.c_sources + resources.cpp_sources
self.to_be_compiled = len(files_to_compile) self.to_be_compiled = len(files_to_compile)
self.compiled = 0 self.compiled = 0
#for i in self.build_params: #for i in self.build_params:
# self.debug(i) # self.debug(i)
# self.debug("%s" % self.build_params[i]) # self.debug("%s" % self.build_params[i])
inc_paths = resources.inc_dirs inc_paths = resources.inc_dirs
if inc_dirs is not None: if inc_dirs is not None:
inc_paths.extend(inc_dirs) inc_paths.extend(inc_dirs)
objects = [] objects = []
queue = [] queue = []
prev_dir = None prev_dir = None
# The dependency checking for C/C++ is delegated to the compiler # The dependency checking for C/C++ is delegated to the compiler
base_path = resources.base_path base_path = resources.base_path
files_to_compile.sort() files_to_compile.sort()
for source in files_to_compile: for source in files_to_compile:
_, name, _ = split_path(source) _, name, _ = split_path(source)
object = self.relative_object_path(build_path, base_path, source) object = self.relative_object_path(build_path, base_path, source)
# Avoid multiple mkdir() calls on same work directory # Avoid multiple mkdir() calls on same work directory
work_dir = dirname(object) work_dir = dirname(object)
if work_dir is not prev_dir: if work_dir is not prev_dir:
prev_dir = work_dir prev_dir = work_dir
mkdir(work_dir) mkdir(work_dir)
# Queue mode (multiprocessing) # Queue mode (multiprocessing)
commands = self.compile_command(source, object, inc_paths) commands = self.compile_command(source, object, inc_paths)
if commands is not None: if commands is not None:
@ -481,7 +482,7 @@ class mbedToolchain:
def compile_seq(self, queue, objects): def compile_seq(self, queue, objects):
for item in queue: for item in queue:
result = compile_worker(item) result = compile_worker(item)
self.compiled += 1 self.compiled += 1
self.progress("compile", item['source'], build_update=True) self.progress("compile", item['source'], build_update=True)
for res in result['results']: for res in result['results']:
@ -497,7 +498,7 @@ class mbedToolchain:
def compile_queue(self, queue, objects): def compile_queue(self, queue, objects):
jobs_count = int(self.jobs if self.jobs else cpu_count()) jobs_count = int(self.jobs if self.jobs else cpu_count())
p = Pool(processes=jobs_count) p = Pool(processes=jobs_count)
results = [] results = []
for i in range(len(queue)): for i in range(len(queue)):
results.append(p.apply_async(compile_worker, [queue[i]])) results.append(p.apply_async(compile_worker, [queue[i]]))
@ -509,7 +510,7 @@ class mbedToolchain:
p.terminate() p.terminate()
p.join() p.join()
raise ToolException("Compile did not finish in 5 minutes") raise ToolException("Compile did not finish in 5 minutes")
pending = 0 pending = 0
for r in results: for r in results:
if r._ready is True: if r._ready is True:
@ -535,7 +536,7 @@ class mbedToolchain:
pending += 1 pending += 1
if pending > jobs_count: if pending > jobs_count:
break break
if len(results) == 0: if len(results) == 0:
break break
@ -544,15 +545,15 @@ class mbedToolchain:
results = None results = None
p.terminate() p.terminate()
p.join() p.join()
return objects return objects
def compile_command(self, source, object, includes): def compile_command(self, source, object, includes):
# Check dependencies # Check dependencies
_, ext = splitext(source) _, ext = splitext(source)
ext = ext.lower() ext = ext.lower()
if ext == '.c' or ext == '.cpp': if ext == '.c' or ext == '.cpp':
base, _ = splitext(object) base, _ = splitext(object)
dep_path = base + '.d' dep_path = base + '.d'
@ -568,19 +569,19 @@ class mbedToolchain:
return self.assemble(source, object, includes) return self.assemble(source, object, includes)
else: else:
return False return False
return None return None
def compile_output(self, output=[]): def compile_output(self, output=[]):
rc = output[0] rc = output[0]
stderr = output[1] stderr = output[1]
command = output[2] command = output[2]
# Parse output for Warnings and Errors # Parse output for Warnings and Errors
self.parse_output(stderr) self.parse_output(stderr)
self.debug("Return: %s" % rc) self.debug("Return: %s" % rc)
self.debug("Output: %s" % stderr) self.debug("Output: %s" % stderr)
# Check return code # Check return code
if rc != 0: if rc != 0:
raise ToolException(stderr) raise ToolException(stderr)
@ -588,17 +589,17 @@ class mbedToolchain:
def compile(self, cc, source, object, includes): def compile(self, cc, source, object, includes):
_, ext = splitext(source) _, ext = splitext(source)
ext = ext.lower() ext = ext.lower()
command = cc + ['-D%s' % s for s in self.get_symbols()] + ["-I%s" % i for i in includes] + ["-o", object, source] 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"): if hasattr(self, "get_dep_opt"):
base, _ = splitext(object) base, _ = splitext(object)
dep_path = base + '.d' dep_path = base + '.d'
command.extend(self.get_dep_opt(dep_path)) command.extend(self.get_dep_opt(dep_path))
if hasattr(self, "cc_extra"): if hasattr(self, "cc_extra"):
command.extend(self.cc_extra(base)) command.extend(self.cc_extra(base))
return [command] return [command]
def compile_c(self, source, object, includes): def compile_c(self, source, object, includes):
@ -650,7 +651,7 @@ class mbedToolchain:
stdout, stderr, rc = run_cmd(command) stdout, stderr, rc = run_cmd(command)
self.debug("Return: %s" % rc) self.debug("Return: %s" % rc)
self.debug("Output: %s" % ' '.join(stdout)) self.debug("Output: %s" % ' '.join(stdout))
if rc != 0: if rc != 0:
for line in stderr.splitlines(): for line in stderr.splitlines():
self.tool_error(line) self.tool_error(line)