File tree Expand file tree Collapse file tree 4 files changed +14
-8
lines changed Expand file tree Collapse file tree 4 files changed +14
-8
lines changed Original file line number Diff line number Diff line change @@ -67,11 +67,13 @@ install:
67
67
68
68
build_script :
69
69
- dir %OPENSSL_DIR%\lib\VC\x64\MD\
70
+ - for %%I in (%PYTHONVERS%) do cp %OPENSSL_DIR%/lib/VC/x64/MD/libcrypto.lib %%I/libs/libcrypto64MD.lib
71
+ - for %%I in (%PYTHONVERS%) do cp %OPENSSL_DIR%/lib/VC/x64/MD/libssl.lib %%I/libs/libssl64MD.lib
70
72
- ci\\appveyor\\build_zlib.bat
71
73
- for %%I in (%PYTHONVERS%) do cp C:/zlib/lib/zlibstatic.lib %%I/libs/
72
74
- for %%I in (%PYTHONVERS%) do ls %%I/libs/
73
75
- ci\\appveyor\\build_ssh2.bat
74
- - for %%I in (%PYTHONVERS%) do cp build_dir/src/libssh2.lib %%I/libs/ || cp build_dir/src/ Release/libssh2.lib %%I/libs/
76
+ - for %%I in (%PYTHONVERS%) do cp build_dir/src/Release/libssh2.lib %%I/libs/
75
77
- for %%I in (%PYTHONVERS%) do ls %%I/libs/
76
78
- rm -f ssh2/*.c
77
79
Original file line number Diff line number Diff line change 1
- IF NOT " %APPVEYOR_REPO_TAG% " == " true" (exit 0)
2
-
3
1
dir ssh2/
4
2
5
3
for %%I in (%PYTHONVERS% ) do %%I \python.exe -V
Original file line number Diff line number Diff line change @@ -13,11 +13,15 @@ cmake ..\libssh2 -G "NMake Makefiles" ^
13
13
-DENABLE_MAC_NONE=ON ^
14
14
-DZLIB_LIBRARY=C:/zlib/lib/zlib.lib ^
15
15
-DZLIB_INCLUDE_DIR=C:/zlib/include ^
16
- -DOPENSSL_ROOT_DIR=%OPENSSL_DIR%
17
- )
16
+ -DBUILD_EXAMPLES=OFF ^
17
+ -DBUILD_TESTING=OFF ^
18
+ -DOPENSSL_ROOT_DIR=%OPENSSL_DIR% ^
19
+ -DOPENSSL_LIBRARIES=%OPENSSL_DIR% /lib/VC/x64/MD
18
20
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 %OPENSSL_DIR% \lib\VC\x64\MD\
23
+ cp %OPENSSL_DIR% \lib\VC\x64\MD\libcrypto.lib %APPVEYOR_BUILD_FOLDER% \libcrypto64MD.lib
24
+ cp %OPENSSL_DIR% \lib\VC\x64\MD\libssl.lib %APPVEYOR_BUILD_FOLDER% \libssl64MD.lib
21
25
22
26
dir %APPVEYOR_BUILD_FOLDER% \
23
27
Original file line number Diff line number Diff line change 4
4
import json
5
5
import sys
6
6
7
+
7
8
def get_describe_tag ():
8
- return subprocess .check_output (['git' , 'describe' , '--tags' ]).strip ().decode ('utf-8' )
9
+ return subprocess .check_output (['git' , 'describe' , '--tags' ]).strip ().decode ('utf-8' ).split ('-' )[0 ]
10
+
9
11
10
12
def make_version_file (basedir ):
11
13
rev = os .environ .get ('APPVEYOR_REPO_COMMIT' ,
You can’t perform that action at this time.
0 commit comments