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

Merge pull request #2026 from 0xc0170/fix_paths 

Fix paths for project.py
pull/2031/head
Bogdan Marinescu 2016-06-27 18:10:45 +03:00 committed by GitHub
parent 703aee4f61 fdb401ce4e
commit 104b8fa7cb
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/export/__init__.py
View File

@ -58,7 +58,7 @@ def online_build_url_resolver(url):
def export(project_path, project_name, ide, target, destination='/tmp/', def export(project_path, project_name, ide, target, destination='/tmp/',
tempdir=None, clean=True, extra_symbols=None, zip=True, relative=False, build_url_resolver=online_build_url_resolver): tempdir=None, clean=True, extra_symbols=None, zip=True, sources_relative=False, build_url_resolver=online_build_url_resolver):
# Convention: we are using capitals for toolchain and target names # Convention: we are using capitals for toolchain and target names
if target is not None: if target is not None:
target = target.upper() target = target.upper()
@ -75,7 +75,7 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
try: try:
ide = "zip" ide = "zip"
exporter = zip.ZIP(target, tempdir, project_name, build_url_resolver, extra_symbols=extra_symbols) exporter = zip.ZIP(target, tempdir, project_name, build_url_resolver, extra_symbols=extra_symbols)
exporter.scan_and_copy_resources(project_path, tempdir, relative) exporter.scan_and_copy_resources(project_path, tempdir, sources_relative)
exporter.generate() exporter.generate()
report['success'] = True report['success'] = True
except OldLibrariesException, e: except OldLibrariesException, e:
@ -101,8 +101,8 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
if supported: if supported:
# target checked, export # target checked, export
try: try:
exporter = Exporter(target, tempdir, project_name, build_url_resolver, extra_symbols=extra_symbols) exporter = Exporter(target, tempdir, project_name, build_url_resolver, extra_symbols=extra_symbols, sources_relative=sources_relative)
exporter.scan_and_copy_resources(project_path, tempdir, relative) exporter.scan_and_copy_resources(project_path, tempdir, sources_relative)
exporter.generate() exporter.generate()
report['success'] = True report['success'] = True
except OldLibrariesException, e: except OldLibrariesException, e:

5
tools/export/exporters.py
View File

@ -25,7 +25,7 @@ class Exporter(object):
TEMPLATE_DIR = dirname(__file__) TEMPLATE_DIR = dirname(__file__)
DOT_IN_RELATIVE_PATH = False DOT_IN_RELATIVE_PATH = False
def __init__(self, target, inputDir, program_name, build_url_resolver, extra_symbols=None): def __init__(self, target, inputDir, program_name, build_url_resolver, extra_symbols=None, sources_relative=True):
self.inputDir = inputDir self.inputDir = inputDir
self.target = target self.target = target
self.program_name = program_name self.program_name = program_name
@ -35,6 +35,7 @@ class Exporter(object):
self.jinja_environment = Environment(loader=jinja_loader) self.jinja_environment = Environment(loader=jinja_loader)
self.extra_symbols = extra_symbols self.extra_symbols = extra_symbols
self.config_macros = [] self.config_macros = []
self.sources_relative = sources_relative
def get_toolchain(self): def get_toolchain(self):
return self.TOOLCHAIN return self.TOOLCHAIN
@ -109,7 +110,7 @@ class Exporter(object):
# TODO: Fix this, the inc_dirs are not valid (our scripts copy files), therefore progen # TODO: Fix this, the inc_dirs are not valid (our scripts copy files), therefore progen
# thinks it is not dict but a file, and adds them to workspace. # thinks it is not dict but a file, and adds them to workspace.
project.project['common']['include_paths'] = self.resources.inc_dirs project.project['common']['include_paths'] = self.resources.inc_dirs
project.generate(tool_name, copied=True) project.generate(tool_name, copied=not self.sources_relative)
def __scan_all(self, path): def __scan_all(self, path):
resources = [] resources = []

2
tools/project.py
View File

@ -210,7 +210,7 @@ if __name__ == '__main__':
setup_user_prj(project_dir[0], test.source_dir, test.dependencies) setup_user_prj(project_dir[0], test.source_dir, test.dependencies)
# Export to selected toolchain # Export to selected toolchain
tmp_path, report = export(project_dir, project_name, ide, mcu, project_dir[0], project_temp, clean=clean, zip=zip, extra_symbols=lib_symbols, relative=sources_relative) tmp_path, report = export(project_dir, project_name, ide, mcu, project_dir[0], project_temp, clean=clean, zip=zip, extra_symbols=lib_symbols, sources_relative=sources_relative)
if report['success']: if report['success']:
if not zip: if not zip:
zip_path = join(project_temp, "%s_%s" % (project_name, mcu)) zip_path = join(project_temp, "%s_%s" % (project_name, mcu))