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

Add conan binaries to binaries

Browse source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-07-01 05:12:57 +02:00 • committed by Jelle Spijker
parent e570e3bec6
commit cc8f0d3001
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ultimaker-Cura.spec.jinja
View file

@ -12,9 +12,6 @@ datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
block_cipher = None block_cipher = None
{% for conan_binary in conan_binaries %}binaries += {{ conan_binary }}
{% endfor %}
a = Analysis( a = Analysis(
[r'{{ entrypoint }}'], [r'{{ entrypoint }}'],
pathex=[], pathex=[],

8
conanfile.py
View file

@ -168,14 +168,13 @@ class CuraConan(ConanFile):
for bin in src_path.glob(binary["binary"]): for bin in src_path.glob(binary["binary"]):
binaries.append((str(bin), binary["dst"])) binaries.append((str(bin), binary["dst"]))
conan_binaries = []
for _, dependency in self.dependencies.host.items(): for _, dependency in self.dependencies.host.items():
if dependency.ref.name == "cpython": if dependency.ref.name == "cpython":
continue continue
for bin_paths in dependency.cpp_info.bindirs: for bin_paths in dependency.cpp_info.bindirs:
conan_binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dll")]) binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dll")])
conan_binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dylib")]) binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dylib")])
conan_binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.so")]) binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.so")])
with open(Path(__file__).parent.joinpath("Ultimaker-Cura.spec.jinja"), "r") as f: with open(Path(__file__).parent.joinpath("Ultimaker-Cura.spec.jinja"), "r") as f:
pyinstaller = Template(f.read()) pyinstaller = Template(f.read())
@ -186,7 +185,6 @@ class CuraConan(ConanFile):
entrypoint = entrypoint_location, entrypoint = entrypoint_location,
datas = datas, datas = datas,
binaries = binaries, binaries = binaries,
conan_binaries = conan_binaries,
hiddenimports = pyinstaller_metadata["hiddenimports"], hiddenimports = pyinstaller_metadata["hiddenimports"],
collect_all = pyinstaller_metadata["collect_all"], collect_all = pyinstaller_metadata["collect_all"],
icon = icon_path icon = icon_path