Browse Source

Add copied openssl 1.1.1l binaries to pyinstall binaries

Contributes to CURA-9342
j.spijker@ultimaker.com 2 years ago
parent
commit
7068c87130
2 changed files with 8 additions and 2 deletions
  1. 2 2
      .github/workflows/cura-installer.yml
  2. 6 0
      conanfile.py

+ 2 - 2
.github/workflows/cura-installer.yml

@@ -175,13 +175,13 @@ jobs:
             -   name: Install OpenSSL shared
                 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' }}
                 run: |
                     cp ./openssl/lib/*.so* ./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' }}
                 run: |
                     cp openssl/bin/*.dll ./cura_inst/Scripts/

+ 6 - 0
conanfile.py

@@ -171,6 +171,12 @@ class CuraConan(ConanFile):
             for bin in src_path.glob(binary["binary"]):
                 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():
             # if dependency.ref.name == "cpython":
             #     continue