Skip to content

Commit

Permalink
Rename devtools option to pyinstaller
Browse files Browse the repository at this point in the history
  • Loading branch information
wawanbreton committed Sep 26, 2024
1 parent 961862b commit cee46ae
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit cee46ae

Please sign in to comment.