From 056b88ad0eecefa58e0e7169664169e3b5cb5f0d Mon Sep 17 00:00:00 2001 From: kegilbert Date: Fri, 22 Feb 2019 14:53:42 -0600 Subject: [PATCH 1/4] Pull in artifact-name for exported projects --- tools/export/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/export/__init__.py b/tools/export/__init__.py index 1b2f2207e74..cf875dba387 100644 --- a/tools/export/__init__.py +++ b/tools/export/__init__.py @@ -276,6 +276,9 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None, if linker_script is not None: resources.linker_script = linker_script + if toolchain.config.app_config_data['artifact_name'] is not None: + name = toolchain.config.app_config_data['artifact_name'] + files, exporter = generate_project_files(resources, export_path, target, name, toolchain, ide, macros=macros) From c0fbe95d545f036b9930bb9ea3e18bd580e2209e Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Mon, 25 Feb 2019 13:57:20 -0600 Subject: [PATCH 2/4] Update tools/export/__init__.py Co-Authored-By: kegilbert --- tools/export/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/export/__init__.py b/tools/export/__init__.py index cf875dba387..9822537f8c0 100644 --- a/tools/export/__init__.py +++ b/tools/export/__init__.py @@ -276,7 +276,7 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None, if linker_script is not None: resources.linker_script = linker_script - if toolchain.config.app_config_data['artifact_name'] is not None: + if toolchain.config.name is not None: name = toolchain.config.app_config_data['artifact_name'] files, exporter = generate_project_files(resources, export_path, From da3eb5df473415dabab40ae883ac566278f6b94f Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Mon, 25 Feb 2019 13:57:26 -0600 Subject: [PATCH 3/4] Update tools/export/__init__.py Co-Authored-By: kegilbert --- tools/export/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/export/__init__.py b/tools/export/__init__.py index 9822537f8c0..82e2fa5604a 100644 --- a/tools/export/__init__.py +++ b/tools/export/__init__.py @@ -277,7 +277,7 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None, resources.linker_script = linker_script if toolchain.config.name is not None: - name = toolchain.config.app_config_data['artifact_name'] + name = toolchain.config.name files, exporter = generate_project_files(resources, export_path, target, name, toolchain, ide, From 22674a694d950638e1dbeca3c4d34912e8e72372 Mon Sep 17 00:00:00 2001 From: Cruz Monrreal Date: Mon, 25 Feb 2019 17:50:51 -0600 Subject: [PATCH 4/4] Update tools/export/__init__.py Co-Authored-By: kegilbert --- tools/export/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/export/__init__.py b/tools/export/__init__.py index 82e2fa5604a..ae3c463c999 100644 --- a/tools/export/__init__.py +++ b/tools/export/__init__.py @@ -276,7 +276,7 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None, if linker_script is not None: resources.linker_script = linker_script - if toolchain.config.name is not None: + if toolchain.config.name: name = toolchain.config.name files, exporter = generate_project_files(resources, export_path,