From cc8f0d30014be9650e79675e2f92dd286dbe19e4 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 1 Jul 2022 05:12:57 +0200 Subject: [PATCH] Add conan binaries to binaries Contributes to CURA-9365 --- Ultimaker-Cura.spec.jinja | 3 --- conanfile.py | 8 +++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Ultimaker-Cura.spec.jinja b/Ultimaker-Cura.spec.jinja index 7afaa11402..c3295eccd4 100644 --- a/Ultimaker-Cura.spec.jinja +++ b/Ultimaker-Cura.spec.jinja @@ -12,9 +12,6 @@ datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2] block_cipher = None -{% for conan_binary in conan_binaries %}binaries += {{ conan_binary }} -{% endfor %} - a = Analysis( [r'{{ entrypoint }}'], pathex=[], diff --git a/conanfile.py b/conanfile.py index 80917e504e..38228aeddc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -168,14 +168,13 @@ class CuraConan(ConanFile): for bin in src_path.glob(binary["binary"]): binaries.append((str(bin), binary["dst"])) - conan_binaries = [] for _, dependency in self.dependencies.host.items(): if dependency.ref.name == "cpython": continue for bin_paths in dependency.cpp_info.bindirs: - conan_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")]) - conan_binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.so")]) + binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dll")]) + binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dylib")]) + 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: pyinstaller = Template(f.read()) @@ -186,7 +185,6 @@ class CuraConan(ConanFile): entrypoint = entrypoint_location, datas = datas, binaries = binaries, - conan_binaries = conan_binaries, hiddenimports = pyinstaller_metadata["hiddenimports"], collect_all = pyinstaller_metadata["collect_all"], icon = icon_path