mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-12 21:58:59 +08:00
Rename devtools option to pyinstaller
This commit is contained in:
parent
961862bb2b
commit
cee46ae1ea
@ -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 @@ class CuraConan(ConanFile):
|
||||
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 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV
|
||||
# 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
|
||||
|
Loading…
x
Reference in New Issue
Block a user