From cee46ae1ea7a30b3f06b431d54161efb506b88db Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 26 Sep 2024 12:58:35 +0200 Subject: [PATCH] Rename devtools option to pyinstaller --- conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index ee367a2c52c..21d55d4d2c1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -31,7 +31,7 @@ class CuraConan(ConanFile): options = { "enterprise": [True, False], "staging": [True, False], - "devtools": [True, False], # FIXME: Split this up in testing and (development / build (pyinstaller) / system installer) tools + "pyinstaller": [True, False], "cloud_api_version": ["ANY"], "display_name": ["ANY"], # TODO: should this be an option?? "cura_debug_mode": [True, False], # FIXME: Use profiles @@ -41,7 +41,7 @@ class CuraConan(ConanFile): default_options = { "enterprise": False, "staging": False, - "devtools": False, + "pyinstaller": False, "cloud_api_version": "1", "display_name": "UltiMaker Cura", "cura_debug_mode": False, # Not yet implemented @@ -373,7 +373,7 @@ def generate(self): cura_private_data = self.dependencies["cura_private_data"].cpp_info copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) - if self.options.devtools: + if self.options.pyinstaller: entitlements_file = "'{}'".format(str(Path(self.source_folder, "packaging", "MacOS", "cura.entitlements"))) self._generate_pyinstaller_spec( location=self.generators_folder, @@ -481,7 +481,7 @@ def package_id(self): # which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_` del self.info.options.enterprise del self.info.options.staging - del self.info.options.devtools + del self.info.options.pyinstaller del self.info.options.cloud_api_version del self.info.options.display_name del self.info.options.cura_debug_mode