From e2fd0ea15236f4c6dabeb6209e23d83f7d9b5d73 Mon Sep 17 00:00:00 2001 From: JojoS Date: Wed, 16 Aug 2017 18:45:39 +0200 Subject: [PATCH] revert hack to force zipfile creation remove forcing to create zipfiles --- tools/export/__init__.py | 2 +- tools/project.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/export/__init__.py b/tools/export/__init__.py index e64fc365b5..6a2356c1ca 100644 --- a/tools/export/__init__.py +++ b/tools/export/__init__.py @@ -346,7 +346,7 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None, resource.add(res) if isinstance(zip_proj, basestring): zip_export(join(export_path, zip_proj), name, resource_dict, - files , inc_repos) + files + exporter.static_files, inc_repos) else: zip_export(zip_proj, name, resource_dict, files + exporter.static_files, inc_repos) diff --git a/tools/project.py b/tools/project.py index d05e311352..05f5c0a7d0 100644 --- a/tools/project.py +++ b/tools/project.py @@ -235,7 +235,7 @@ def main(): if exists(EXPORT_DIR): rmtree(EXPORT_DIR) - zip_proj = True #not bool(options.source_dir) + zip_proj = not bool(options.source_dir) if (options.program is None) and (not options.source_dir): args_error(parser, "one of -p, -n, or --source is required")