From 9bcd1da2fa32af6becbaefaad4f9c7a6d4642fb0 Mon Sep 17 00:00:00 2001 From: Johan Stokking Date: Tue, 25 Jul 2017 13:46:55 +0200 Subject: [PATCH] ZIP export static files Signed-off-by: Johan Stokking --- tools/export/__init__.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/export/__init__.py b/tools/export/__init__.py index 0e4acb6461..3bcbb3a727 100644 --- a/tools/export/__init__.py +++ b/tools/export/__init__.py @@ -346,13 +346,14 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None, if label not in toolchain.target.features: resource.add(res) if isinstance(zip_proj, basestring): - zip_export(join(export_path, zip_proj), name, resource_dict, files, - inc_repos) + zip_export(join(export_path, zip_proj), name, resource_dict, + files + exporter.static_files, inc_repos) else: - zip_export(zip_proj, name, resource_dict, files, inc_repos) - - for static_file in exporter.static_files: - if not exists(join(export_path, basename(static_file))): - copyfile(static_file, join(export_path, basename(static_file))) + zip_export(zip_proj, name, resource_dict, + files + exporter.static_files, inc_repos) + else: + for static_file in exporter.static_files: + if not exists(join(export_path, basename(static_file))): + copyfile(static_file, join(export_path, basename(static_file))) return exporter