From 46088cc472018d49f375336313e221b4fe6a3681 Mon Sep 17 00:00:00 2001
From: Panos <pkittenis@users.noreply.github.com>
Date: Sun, 12 Jan 2025 21:17:16 +0000
Subject: [PATCH] Appveyor (#210)

* Fix broken openssl library names on appveyor builds
---
 .appveyor.yml                 |  4 +++-
 ci/appveyor/build_package.bat |  2 --
 ci/appveyor/build_ssh2.bat    | 12 ++++++++----
 ci/appveyor/fix_version.py    |  4 +++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 1dfa5981..487bf0a1 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -67,11 +67,13 @@ install:
 
 build_script:
   - dir %OPENSSL_DIR%\lib\VC\x64\MD\
+  - for %%I in (%PYTHONVERS%) do cp %OPENSSL_DIR%/lib/VC/x64/MD/libcrypto.lib %%I/libs/libcrypto64MD.lib
+  - for %%I in (%PYTHONVERS%) do cp %OPENSSL_DIR%/lib/VC/x64/MD/libssl.lib %%I/libs/libssl64MD.lib
   - ci\\appveyor\\build_zlib.bat
   - for %%I in (%PYTHONVERS%) do cp C:/zlib/lib/zlibstatic.lib %%I/libs/
   - for %%I in (%PYTHONVERS%) do ls %%I/libs/
   - ci\\appveyor\\build_ssh2.bat
-  - for %%I in (%PYTHONVERS%) do cp build_dir/src/libssh2.lib %%I/libs/ || cp build_dir/src/Release/libssh2.lib %%I/libs/
+  - for %%I in (%PYTHONVERS%) do cp build_dir/src/Release/libssh2.lib %%I/libs/
   - for %%I in (%PYTHONVERS%) do ls %%I/libs/
   - rm -f ssh2/*.c
 
diff --git a/ci/appveyor/build_package.bat b/ci/appveyor/build_package.bat
index fb0d347f..b2742136 100755
--- a/ci/appveyor/build_package.bat
+++ b/ci/appveyor/build_package.bat
@@ -1,5 +1,3 @@
-IF NOT "%APPVEYOR_REPO_TAG%" == "true" (exit 0)
-
 dir ssh2/
 
 for %%I in (%PYTHONVERS%) do %%I\python.exe -V
diff --git a/ci/appveyor/build_ssh2.bat b/ci/appveyor/build_ssh2.bat
index 79490c2e..2ac60521 100755
--- a/ci/appveyor/build_ssh2.bat
+++ b/ci/appveyor/build_ssh2.bat
@@ -13,11 +13,15 @@ cmake ..\libssh2 -G "NMake Makefiles" ^
        -DENABLE_MAC_NONE=ON                   ^
        -DZLIB_LIBRARY=C:/zlib/lib/zlib.lib    ^
        -DZLIB_INCLUDE_DIR=C:/zlib/include     ^
-       -DOPENSSL_ROOT_DIR=%OPENSSL_DIR%
-)
+       -DBUILD_EXAMPLES=OFF                   ^
+       -DBUILD_TESTING=OFF                    ^
+       -DOPENSSL_ROOT_DIR=%OPENSSL_DIR%       ^
+       -DOPENSSL_LIBRARIES=%OPENSSL_DIR%/lib/VC/x64/MD
 
-cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto*.lib %APPVEYOR_BUILD_FOLDER%
-cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl*.lib %APPVEYOR_BUILD_FOLDER%
+
+dir %OPENSSL_DIR%\lib\VC\x64\MD\
+cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto.lib %APPVEYOR_BUILD_FOLDER%\libcrypto64MD.lib
+cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl.lib %APPVEYOR_BUILD_FOLDER%\libssl64MD.lib
 
 dir %APPVEYOR_BUILD_FOLDER%\
 
diff --git a/ci/appveyor/fix_version.py b/ci/appveyor/fix_version.py
index 0f8e484a..8e4aa901 100644
--- a/ci/appveyor/fix_version.py
+++ b/ci/appveyor/fix_version.py
@@ -4,8 +4,10 @@
 import json
 import sys
 
+
 def get_describe_tag():
-    return subprocess.check_output(['git', 'describe', '--tags']).strip().decode('utf-8')
+    return subprocess.check_output(['git', 'describe', '--tags']).strip().decode('utf-8').split('-')[0]
+
 
 def make_version_file(basedir):
     rev = os.environ.get('APPVEYOR_REPO_COMMIT',