3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use correct paths

Browse source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-06-30 16:40:24 +02:00 • committed by Jelle Spijker
parent 2739057a97
commit b4f3d5cbab
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ultimaker-Cura.spec.jinja
View file

@ -26,7 +26,7 @@ a = Analysis(
win_no_prefer_redirects=False, win_no_prefer_redirects=False,
win_private_assemblies=False, win_private_assemblies=False,
cipher=block_cipher, cipher=block_cipher,
noarchive=False, noarchive=False
) )
pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher) pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
@ -46,7 +46,7 @@ exe = EXE(
target_arch=None, target_arch=None,
codesign_identity=None, codesign_identity=None,
entitlements_file=None, entitlements_file=None,
icon='{{ icon }}', icon='{{ icon }}'
) )
coll = COLLECT( coll = COLLECT(
exe, exe,
@ -56,5 +56,5 @@ coll = COLLECT(
strip=False, strip=False,
upx=True, upx=True,
upx_exclude=[], upx_exclude=[],
name='{{ name }}', name='{{ name }}'
) )

8
conanfile.py
View file

@ -214,8 +214,8 @@ class CuraConan(ConanFile):
if self.options.devtools: if self.options.devtools:
self._generate_pyinstaller_spec(self.generators_folder, self._generate_pyinstaller_spec(self.generators_folder,
os.path.join(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"]), Path(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, "packaging", self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)]))
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)
@ -289,8 +289,8 @@ class CuraConan(ConanFile):
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, self._generate_pyinstaller_spec(self._base_dir,
os.path.join(self.cpp_info.bindirs[0], self._um_data(self.version)["runinfo"]["entrypoint"]), Path(self.cpp_info.bin_paths[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.res_paths[2], self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)]))
def package(self): def package(self):