From b4f3d5cbab87fb5d8ba40d353ae4cddda6d7080a Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 30 Jun 2022 16:40:24 +0200 Subject: [PATCH] Use correct paths Contributes to CURA-9365 --- Ultimaker-Cura.spec.jinja | 6 +++--- conanfile.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Ultimaker-Cura.spec.jinja b/Ultimaker-Cura.spec.jinja index a4424f23c1..ae0636a4cf 100644 --- a/Ultimaker-Cura.spec.jinja +++ b/Ultimaker-Cura.spec.jinja @@ -26,7 +26,7 @@ a = Analysis( win_no_prefer_redirects=False, win_private_assemblies=False, cipher=block_cipher, - noarchive=False, + noarchive=False ) pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) @@ -46,7 +46,7 @@ exe = EXE( target_arch=None, codesign_identity=None, entitlements_file=None, - icon='{{ icon }}', + icon='{{ icon }}' ) coll = COLLECT( exe, @@ -56,5 +56,5 @@ coll = COLLECT( strip=False, upx=True, upx_exclude=[], - name='{{ name }}', + name='{{ name }}' ) diff --git a/conanfile.py b/conanfile.py index 55cd662214..7f02db2729 100644 --- a/conanfile.py +++ b/conanfile.py @@ -214,8 +214,8 @@ class CuraConan(ConanFile): if self.options.devtools: self._generate_pyinstaller_spec(self.generators_folder, - os.path.join(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"]), - os.path.join(self.source_folder, "packaging", self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])) + 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)])) def imports(self): self.copy("CuraEngine.exe", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False) @@ -289,8 +289,8 @@ class CuraConan(ConanFile): self._generate_cura_version(Path(self._site_packages, "cura")) self._generate_pyinstaller_spec(self._base_dir, - os.path.join(self.cpp_info.bindirs[0], self._um_data(self.version)["runinfo"]["entrypoint"]), - os.path.join(self.cpp_info.resdirs[2], self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])) + 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)])) def package(self):