3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 02:07:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

explicit cast from Path to str

Browse source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-07-01 06:33:50 +02:00 • committed by Jelle Spijker
parent 2ea78a3ef6
commit 3fe0f26e94
2 changed files with 13 additions and 10 deletions
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(
[r'{{ entrypoint }}'], ['{{ entrypoint }}'],
pathex=[], pathex=[],
binaries=binaries, binaries=binaries,
datas=datas, datas=datas,
@ -46,7 +46,7 @@ exe = EXE(
target_arch=None, target_arch=None,
codesign_identity=os.getenv('CODESIGN_IDENTITY', None), codesign_identity=os.getenv('CODESIGN_IDENTITY', None),
entitlements_file={{ entitlements_file }}, entitlements_file={{ entitlements_file }},
icon=r'{{ icon }}' icon='{{ icon }}'
) )
coll = COLLECT( coll = COLLECT(
exe, exe,

19
conanfile.py
View file

@ -222,10 +222,11 @@ class CuraConan(ConanFile):
vr.generate() vr.generate()
if self.options.devtools: if self.options.devtools:
self._generate_pyinstaller_spec(self.generators_folder, entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "dmg", "cura.entitlements"))
Path(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"]), self._generate_pyinstaller_spec(location = self.generators_folder,
Path(self.source_folder, "packaging", self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)]), entrypoint_location = str(Path(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"])),
Path(self.source_folder, "packaging", "dmg", "cura.entitlements" if self.settings.os == "Macos" else None)) icon_path = str(Path(self.source_folder, "packaging", self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])),
entitlements_file = entitlements_file if self.settings.os == "Macos" else "None")
def imports(self): def imports(self):
self.copy("CuraEngine.exe", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False) self.copy("CuraEngine.exe", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False)
@ -297,10 +298,12 @@ class CuraConan(ConanFile):
self.copy("*.txt", src = self.cpp_info.resdirs[-1], dst = self._base_dir.joinpath("pip_requirements")) self.copy("*.txt", src = self.cpp_info.resdirs[-1], dst = self._base_dir.joinpath("pip_requirements"))
self._generate_cura_version(Path(self._site_packages, "cura")) self._generate_cura_version(Path(self._site_packages, "cura"))
self._generate_pyinstaller_spec(self._base_dir,
Path(self.cpp_info.bin_paths[0], self._um_data(self.version)["runinfo"]["entrypoint"]), entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "packaging", "dmg", "cura.entitlements"))
Path(self.cpp_info.res_paths[2], self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)]), self._generate_pyinstaller_spec(location = self._base_dir,
Path(self.cpp_info.res_paths[2], "packaging", "dmg", "cura.entitlements" if self.settings.os == "Macos" else None)) entrypoint_location = str(Path(self.cpp_info.bin_paths[0], self._um_data(self.version)["runinfo"]["entrypoint"])),
icon_path = str(Path(self.cpp_info.res_paths[2], self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])),
entitlements_file = entitlements_file if self.settings.os == "Macos" else "None")
def package(self): def package(self):
self.copy("cura_app.py", src = ".", dst = self.cpp.package.bindirs[0]) self.copy("cura_app.py", src = ".", dst = self.cpp.package.bindirs[0])