Skip to content

Commit 2929075

Browse files
authored
Arm wheel (#209)
* Updated arm manylinux file * Updated appveyor cfg
1 parent 696da0c commit 2929075

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.appveyor.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ install:
5252
- cp %VCLIBDIR%/msvcp*.dll ssh2/
5353
- cp %VCLIBDIR%/msvcr*.dll ssh2/
5454
- cp %OPENSSL_DIR%/bin/*.dll ssh2/
55+
- ps: ls ssh2/*.dll
5556

5657
- for %%I in (%PYTHONVERS%) do %%I\python.exe -V
5758
- for %%I in (%PYTHONVERS%) do %%I\Scripts\pip install -U wheel setuptools twine cython
@@ -65,12 +66,13 @@ install:
6566
- 7z x ci\appveyor\zlib1211.zip
6667

6768
build_script:
68-
- dir %OPENSSL_DIR%\lib\VC\x64\MD
69+
- dir %OPENSSL_DIR%\lib\VC\x64\MD\
6970
- ci\\appveyor\\build_zlib.bat
7071
- for %%I in (%PYTHONVERS%) do cp C:/zlib/lib/zlibstatic.lib %%I/libs/
7172
- for %%I in (%PYTHONVERS%) do ls %%I/libs/
7273
- ci\\appveyor\\build_ssh2.bat
7374
- for %%I in (%PYTHONVERS%) do cp build_dir/src/libssh2.lib %%I/libs/ || cp build_dir/src/Release/libssh2.lib %%I/libs/
75+
- for %%I in (%PYTHONVERS%) do ls %%I/libs/
7476
- rm -f ssh2/*.c
7577

7678
test_script:

ci/appveyor/build_ssh2.bat

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ cmake ..\libssh2 -G "NMake Makefiles" ^
1616
-DOPENSSL_ROOT_DIR=%OPENSSL_DIR%
1717
)
1818

19-
cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto.lib %APPVEYOR_BUILD_FOLDER%
20-
cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl.lib %APPVEYOR_BUILD_FOLDER%
19+
cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto*.lib %APPVEYOR_BUILD_FOLDER%
20+
cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl*.lib %APPVEYOR_BUILD_FOLDER%
21+
22+
dir %APPVEYOR_BUILD_FOLDER%\
2123

2224
cmake --build . --config Release
2325
cd ..

ci/docker/manylinux/Dockerfile.aarch64

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ENV OPENSSL openssl-3.4.0
1919
ENV SYSTEM_LIBSSH2 1
2020
ENV LIBSSH2_VERSION 1.11.1
2121

22-
RUN yum install zlib-devel -y
22+
RUN yum install zlib-devel perl-IPC-Cmd -y
2323

2424
ADD libssh2-${LIBSSH2_VERSION}.tar.gz libssh2-${LIBSSH2_VERSION}.tar.gz
2525
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz

0 commit comments

Comments
 (0)