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

Add copied openssl 1.1.1l binaries to pyinstall binaries

Browse source 
Contributes to CURA-9342
This commit is contained in:
j.spijker@ultimaker.com 2022-07-14 10:38:59 +02:00 • committed by Jelle Spijker
parent 57a0c214d1
commit 7068c87130
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/cura-installer.yml vendored
View file

@ -175,13 +175,13 @@ jobs:
- name: Install OpenSSL shared - name: Install OpenSSL shared
run: conan install openssl/1.1.1l@_/_ --build=missing --update -o openssl:shared=True -g deploy run: conan install openssl/1.1.1l@_/_ --build=missing --update -o openssl:shared=True -g deploy
- name: Install OpenSSL shared (Bash) - name: Copy OpenSSL shared (Bash)
if: ${{ runner.os != 'Windows' }} if: ${{ runner.os != 'Windows' }}
run: | run: |
cp ./openssl/lib/*.so* ./cura_inst/bin/ || true cp ./openssl/lib/*.so* ./cura_inst/bin/ || true
cp ./openssl/lib/*.dylib* ./cura_inst/bin/ || true cp ./openssl/lib/*.dylib* ./cura_inst/bin/ || true
- name: Install OpenSSL shared (Powershell) - name: Copy OpenSSL shared (Powershell)
if: ${{ runner.os == 'Windows' }} if: ${{ runner.os == 'Windows' }}
run: | run: |
cp openssl/bin/*.dll ./cura_inst/Scripts/ cp openssl/bin/*.dll ./cura_inst/Scripts/

6
conanfile.py
View file

@ -171,6 +171,12 @@ 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"]))
# Add dynamic libs in the venv bin/Script and lib Path. This is needed because we might copy some additional libs
# e.q.: OpenSSL 1.1.1l in that directory with a separate:
# `conan install openssl@1.1.1l -g deploy && cp openssl/bin/*.so cura_inst/bin`
for bin in self._script_dir.glob("*.[so|dll|dylib]"):
binaries.append(str(bin), ".")
for _, dependency in self.dependencies.items(): for _, dependency in self.dependencies.items():
# if dependency.ref.name == "cpython": # if dependency.ref.name == "cpython":
# continue # continue