From fdb401ce4e7616ab6f819d666014d92eb5b438dd Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Mon, 27 Jun 2016 15:29:21 +0200 Subject: [PATCH] Exporter - source_relative name fix relative did not contain enough details what's the intention with this flag. --- tools/export/__init__.py | 8 ++++---- tools/project.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/export/__init__.py b/tools/export/__init__.py index 01db53a2f4..3ca9aa03ed 100644 --- a/tools/export/__init__.py +++ b/tools/export/__init__.py @@ -58,7 +58,7 @@ def online_build_url_resolver(url): 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 if target is not None: target = target.upper() @@ -75,7 +75,7 @@ def export(project_path, project_name, ide, target, destination='/tmp/', try: ide = "zip" 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() report['success'] = True except OldLibrariesException, e: @@ -101,8 +101,8 @@ def export(project_path, project_name, ide, target, destination='/tmp/', if supported: # target checked, export try: - exporter = Exporter(target, tempdir, project_name, build_url_resolver, extra_symbols=extra_symbols, sources_relative=relative) - exporter.scan_and_copy_resources(project_path, tempdir, 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, sources_relative) exporter.generate() report['success'] = True except OldLibrariesException, e: diff --git a/tools/project.py b/tools/project.py index e41f6c3faa..1c5539eb97 100644 --- a/tools/project.py +++ b/tools/project.py @@ -210,7 +210,7 @@ if __name__ == '__main__': setup_user_prj(project_dir[0], test.source_dir, test.dependencies) # 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 not zip: zip_path = join(project_temp, "%s_%s" % (project_name, mcu))