diff --git a/Ultimaker-Cura.spec.jinja b/Ultimaker-Cura.spec.jinja index f9f2c1d8d7..f7108d5aec 100644 --- a/Ultimaker-Cura.spec.jinja +++ b/Ultimaker-Cura.spec.jinja @@ -14,7 +14,7 @@ datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2] block_cipher = None a = Analysis( - [r'{{ entrypoint }}'], + ['{{ entrypoint }}'], pathex=[], binaries=binaries, datas=datas, @@ -46,7 +46,7 @@ exe = EXE( target_arch=None, codesign_identity=os.getenv('CODESIGN_IDENTITY', None), entitlements_file={{ entitlements_file }}, - icon=r'{{ icon }}' + icon='{{ icon }}' ) coll = COLLECT( exe, diff --git a/conanfile.py b/conanfile.py index 71d355f320..80df016d6f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -222,10 +222,11 @@ class CuraConan(ConanFile): vr.generate() if self.options.devtools: - self._generate_pyinstaller_spec(self.generators_folder, - Path(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"]), - Path(self.source_folder, "packaging", self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)]), - Path(self.source_folder, "packaging", "dmg", "cura.entitlements" if self.settings.os == "Macos" else None)) + entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "dmg", "cura.entitlements")) + self._generate_pyinstaller_spec(location = self.generators_folder, + entrypoint_location = str(Path(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"])), + 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): 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._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"]), - Path(self.cpp_info.res_paths[2], self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)]), - Path(self.cpp_info.res_paths[2], "packaging", "dmg", "cura.entitlements" if self.settings.os == "Macos" else None)) + + entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "packaging", "dmg", "cura.entitlements")) + 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"])), + 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): self.copy("cura_app.py", src = ".", dst = self.cpp.package.bindirs[0])