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

Fixes escaped path's on Windows

Browse Source 
Why is it that the Path is converted to single \
for the icon and entry_point but not for the binaries?

Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-07-01 07:43:11 +02:00 committed by Jelle Spijker
parent e90f75174e
commit 1f629b9e48
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ultimaker-Cura.spec.jinja
View File

@ -14,7 +14,7 @@ datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
block_cipher = None block_cipher = None
a = Analysis( a = Analysis(
['{{ entrypoint }}'], [{{ entrypoint }}],
pathex=[], pathex=[],
binaries=binaries, binaries=binaries,
datas=datas, datas=datas,
@ -47,7 +47,7 @@ exe = EXE(
codesign_identity=os.getenv('CODESIGN_IDENTITY', None), codesign_identity=os.getenv('CODESIGN_IDENTITY', None),
entitlements_file={{ entitlements_file }}, entitlements_file={{ entitlements_file }},
bundle_identifier={{ osx_bundle_identifier }}, bundle_identifier={{ osx_bundle_identifier }},
icon='{{ icon }}' icon={{ icon }}
) )
coll = COLLECT( coll = COLLECT(
exe, exe,

8
conanfile.py
View File

@ -228,8 +228,8 @@ class CuraConan(ConanFile):
if self.options.devtools: if self.options.devtools:
entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "dmg", "cura.entitlements")) entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "dmg", "cura.entitlements"))
self._generate_pyinstaller_spec(location = self.generators_folder, self._generate_pyinstaller_spec(location = self.generators_folder,
entrypoint_location = str(Path(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"])), entrypoint_location = "'{}'".format(Path(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"])).replace("\\", "\\\\"),
icon_path = str(Path(self.source_folder, "packaging", self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])), icon_path = "'{}'".format(Path(self.source_folder, "packaging", self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") entitlements_file = entitlements_file if self.settings.os == "Macos" else "None")
def imports(self): def imports(self):
@ -305,8 +305,8 @@ class CuraConan(ConanFile):
entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "packaging", "dmg", "cura.entitlements")) entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "packaging", "dmg", "cura.entitlements"))
self._generate_pyinstaller_spec(location = self._base_dir, self._generate_pyinstaller_spec(location = self._base_dir,
entrypoint_location = str(Path(self.cpp_info.bin_paths[0], self._um_data(self.version)["runinfo"]["entrypoint"])), entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self._um_data(self.version)["runinfo"]["entrypoint"])).replace("\\", "\\\\"),
icon_path = str(Path(self.cpp_info.res_paths[2], self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])), icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") entitlements_file = entitlements_file if self.settings.os == "Macos" else "None")
def package(self): def package(self):