Skip to content

tools-exporters! - disable inclusion of repo-dirs in zips by default #2697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2016
Merged

tools-exporters! - disable inclusion of repo-dirs in zips by default #2697

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions tools/project_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def generate_project_files(resources, export_path, target, name, toolchain, ide,
return files, exporter


def zip_export(file_name, prefix, resources, project_files):
def zip_export(file_name, prefix, resources, project_files, inc_repos):
"""Create a zip file from an exported project.

Positional Parameters:
Expand All @@ -105,21 +105,21 @@ def zip_export(file_name, prefix, resources, project_files):
for prj_file in project_files:
zip_file.write(prj_file, join(prefix, basename(prj_file)))
for loc, resource in resources.iteritems():
print resource.features
for res in [resource] + resource.features.values():
extras = []
for directory in res.repo_dirs:
for root, _, files in walk(directory):
for repo_file in files:
source = join(root, repo_file)
extras.append(source)
res.file_basepath[source] = res.base_path
for source in \
to_zip = (
res.headers + res.s_sources + res.c_sources +\
res.cpp_sources + res.libraries + res.hex_files + \
[res.linker_script] + res.bin_files + res.objects + \
res.json_files + res.lib_refs + res.lib_builds + \
res.repo_files + extras:
res.json_files + res.lib_refs + res.lib_builds)
if inc_repos:
for directory in res.repo_dirs:
for root, _, files in walk(directory):
for repo_file in files:
source = join(root, repo_file)
to_zip.append(source)
res.file_basepath[source] = res.base_path
to_zip += res.repo_files
for source in to_zip:
if source:
zip_file.write(
source,
Expand All @@ -132,7 +132,7 @@ def export_project(src_paths, export_path, target, ide,
libraries_paths=None, options=None, linker_script=None,
clean=False, notify=None, verbose=False, name=None,
inc_dirs=None, jobs=1, silent=False, extra_verbose=False,
config=None, macros=None, zip_proj=None):
config=None, macros=None, zip_proj=None, inc_repos=False):
"""Generates a project file and creates a zip archive if specified

Positional Arguments:
Expand Down Expand Up @@ -223,9 +223,9 @@ def export_project(src_paths, export_path, target, ide,
files.append(config_header)
if zip_proj:
if isinstance(zip_proj, basestring):
zip_export(join(export_path, zip_proj), name, resource_dict, files)
zip_export(join(export_path, zip_proj), name, resource_dict, files, inc_repos)
else:
zip_export(zip_proj, name, resource_dict, files)
zip_export(zip_proj, name, resource_dict, files, inc_repos)

return exporter

Expand Down