GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-15 20:53:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove pyinstaller spec generation at generate() time

Browse Source
This commit is contained in:
Erwan MATHIEU 2024-11-21 11:15:31 +01:00
parent f2343e98ce
commit b8fd3d7ab0
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
conanfile.py
View File

@ -32,7 +32,6 @@ class CuraConan(ConanFile):
options = { options = {
"enterprise": [True, False], "enterprise": [True, False],
"staging": [True, False], "staging": [True, False],
"pyinstaller": [True, False],
"cloud_api_version": ["ANY"], "cloud_api_version": ["ANY"],
"display_name": ["ANY"], # TODO: should this be an option?? "display_name": ["ANY"], # TODO: should this be an option??
"cura_debug_mode": [True, False], # FIXME: Use profiles "cura_debug_mode": [True, False], # FIXME: Use profiles
@ -42,7 +41,6 @@ class CuraConan(ConanFile):
default_options = { default_options = {
"enterprise": False, "enterprise": False,
"staging": False, "staging": False,
"pyinstaller": False,
"cloud_api_version": "1", "cloud_api_version": "1",
"display_name": "UltiMaker Cura", "display_name": "UltiMaker Cura",
"cura_debug_mode": False, # Not yet implemented "cura_debug_mode": False, # Not yet implemented
@ -355,20 +353,6 @@ class CuraConan(ConanFile):
cura_private_data = self.dependencies["cura_private_data"].cpp_info cura_private_data = self.dependencies["cura_private_data"].cpp_info
copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura")))
if self.options.pyinstaller:
entitlements_file = "'{}'".format(str(Path(self.source_folder, "packaging", "MacOS", "cura.entitlements")))
self._generate_pyinstaller_spec(
location=self.generators_folder,
entrypoint_location="'{}'".format(
os.path.join(self.source_folder, self.conan_data["pyinstaller"]["runinfo"]["entrypoint"])).replace(
"\\", "\\\\"),
icon_path="'{}'".format(os.path.join(self.source_folder, "packaging",
self.conan_data["pyinstaller"]["icon"][
str(self.settings.os)])).replace("\\", "\\\\"),
entitlements_file=entitlements_file if self.settings.os == "Macos" else "None",
cura_source_folder=self.source_folder
)
if self.options.get_safe("enable_i18n", False) and self._i18n_options["extract"]: if self.options.get_safe("enable_i18n", False) and self._i18n_options["extract"]:
vb = VirtualBuildEnv(self) vb = VirtualBuildEnv(self)
vb.generate() vb.generate()