fix error while updating to 3.2.1

cpvrlab · Mar 18, 2024 · 59427de · 59427de
1 parent 2d7784b
commit 59427de
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 23 deletions.
diff --git a/.github/workflows/build-dep-openssl.yml b/.github/workflows/build-dep-openssl.yml
@@ -51,7 +51,7 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: prebuilt-openssl-linux
-        path: ${{ github.workspace }}/externals/prebuilt/linux_openssl_1.1.1h
+        path: ${{ github.workspace }}/externals/prebuilt/linux_openssl_3.2.1
   build-macos:
     runs-on: macos-13
     steps:
@@ -71,3 +71,4 @@ jobs:
       with:
         name: prebuilt-openssl-ios
         path: ${{ github.workspace }}/externals/prebuilt/iosV8_openssl_3.2.1
+
diff --git a/externals/prebuild_scripts/build_openssl_for_win64.bat b/externals/prebuild_scripts/build_openssl_for_win64.bat
@@ -5,12 +5,11 @@
 
 @echo off
 
-::set OPENSSL_VERSION="OpenSSL_3_2_1"
-set VERSION="3.2.1"
+set OPENSSL_VERSION="openssl-3.2.1"
+::set VERSION="3.2.1"
 
 if "%1" == "" (
-    set VERSION="%1"
-    ::set OPENSSL_VERSION="%1"
+    set OPENSSL_VERSION="%1"
 )
 
 :: To enable downloading prebuilds copy 
@@ -19,28 +18,21 @@ set MAX_NUM_CPU_CORES=6
 set SLPROJECT_ROOT=%2
 set PREFIX=%cd%\..\prebuilt\win64_openssl
 
-::echo Building OpenSSL Version: %OPENSSL_VERSION%
-echo Building OpenSSL Version: %VERSION%
+echo Building OpenSSL Version: %OPENSSL_VERSION%
 echo Installation directory: %PREFIX%
 echo Using %MAX_NUM_CPU_CORES% cpu cores for build.
 
-::-----------------------------------------------------------------::
-::if not exist openssl (
-::    git clone https://github.com/openssl/openssl.git
-::) else (
-::    echo openssl already exists
-::)
-::cd openssl 
-::git checkout %OPENSSL_VERSION%
-::git pull origin %OPENSSL_VERSION%
-::
-::perl Configure VC-WIN64A --prefix=%PREFIX% --openssldir=%PREFIX%
-
-if [ ! -d "openssl-${VERSION}" ]; then
-    curl https://www.openssl.org/source/openssl-${VERSION}.tar.gz
-    tar -zxf openssl-${VERSION}.tar.gz
-fi
+-----------------------------------------------------------------::
+if not exist openssl (
+    git clone https://github.com/openssl/openssl.git
+) else (
+    echo openssl already exists
+)
+cd openssl 
+git checkout %OPENSSL_VERSION%
+git pull origin %OPENSSL_VERSION%
 
+perl Configure VC-WIN64A --prefix=%PREFIX% --openssldir=%PREFIX%
 
 nmake clean
 nmake