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

Exporter - source_relative name fix 

relative did not contain enough details what's the intention with
this flag.
pull/2026/head
Martin Kojtal 2016-06-27 15:29:21 +02:00
parent 5800af11b3
commit fdb401ce4e
2 changed files with 5 additions and 5 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, sources_relative=relative) 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:

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))