Skip to content

Commit fdb401c

Browse files
committed
Exporter - source_relative name fix
relative did not contain enough details what's the intention with this flag.
1 parent 5800af1 commit fdb401c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

tools/export/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def online_build_url_resolver(url):
5858

5959

6060
def export(project_path, project_name, ide, target, destination='/tmp/',
61-
tempdir=None, clean=True, extra_symbols=None, zip=True, relative=False, build_url_resolver=online_build_url_resolver):
61+
tempdir=None, clean=True, extra_symbols=None, zip=True, sources_relative=False, build_url_resolver=online_build_url_resolver):
6262
# Convention: we are using capitals for toolchain and target names
6363
if target is not None:
6464
target = target.upper()
@@ -75,7 +75,7 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
7575
try:
7676
ide = "zip"
7777
exporter = zip.ZIP(target, tempdir, project_name, build_url_resolver, extra_symbols=extra_symbols)
78-
exporter.scan_and_copy_resources(project_path, tempdir, relative)
78+
exporter.scan_and_copy_resources(project_path, tempdir, sources_relative)
7979
exporter.generate()
8080
report['success'] = True
8181
except OldLibrariesException, e:
@@ -101,8 +101,8 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
101101
if supported:
102102
# target checked, export
103103
try:
104-
exporter = Exporter(target, tempdir, project_name, build_url_resolver, extra_symbols=extra_symbols, sources_relative=relative)
105-
exporter.scan_and_copy_resources(project_path, tempdir, relative)
104+
exporter = Exporter(target, tempdir, project_name, build_url_resolver, extra_symbols=extra_symbols, sources_relative=sources_relative)
105+
exporter.scan_and_copy_resources(project_path, tempdir, sources_relative)
106106
exporter.generate()
107107
report['success'] = True
108108
except OldLibrariesException, e:

tools/project.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
setup_user_prj(project_dir[0], test.source_dir, test.dependencies)
211211

212212
# Export to selected toolchain
213-
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)
213+
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)
214214
if report['success']:
215215
if not zip:
216216
zip_path = join(project_temp, "%s_%s" % (project_name, mcu))

0 commit comments

Comments
 (0)