-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Libssh2 implementation and OSX/Windows packaging changes (#108)
Added get and set agent identity path functions. Added agent tests and agent object initialisation from python. Updated OSX wheel building Updated Windows wheel building
- Loading branch information
Showing
13 changed files
with
561 additions
and
321 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,55 +1,23 @@ | ||
mkdir src | ||
cd src | ||
|
||
IF "%PYTHON_ARCH%" == "32" ( | ||
set OPENSSL_DIR="C:\OpenSSL-v11-Win32" | ||
) ELSE ( | ||
set OPENSSL_DIR="C:\OpenSSL-v11-Win64" | ||
ECHO "Building with platform %MSVC%" | ||
cmake ..\libssh2 -G "NMake Makefiles" ^ | ||
-DCMAKE_BUILD_TYPE=Release ^ | ||
-DCRYPTO_BACKEND=OpenSSL ^ | ||
-G"%MSVC%" ^ | ||
-DBUILD_SHARED_LIBS=OFF ^ | ||
-DENABLE_ZLIB_COMPRESSION=ON ^ | ||
-DENABLE_CRYPT_NONE=ON ^ | ||
-DENABLE_MAC_NONE=ON ^ | ||
-DZLIB_LIBRARY=C:/zlib/lib/zlib.lib ^ | ||
-DZLIB_INCLUDE_DIR=C:/zlib/include ^ | ||
-DOPENSSL_ROOT_DIR=%OPENSSL_DIR% | ||
) | ||
|
||
ls %OPENSSL_DIR%\lib | ||
ls %OPENSSL_DIR%\lib\VC | ||
ls %OPENSSL_DIR%\lib\VC\static | ||
|
||
IF "%MSVC%" == "Visual Studio 9" ( | ||
ECHO "Building without platform set" | ||
cmake ..\libssh2 -G "NMake Makefiles" ^ | ||
-DCMAKE_BUILD_TYPE=Release ^ | ||
-DCRYPTO_BACKEND=OpenSSL ^ | ||
-DBUILD_SHARED_LIBS=OFF ^ | ||
-DENABLE_ZLIB_COMPRESSION=ON ^ | ||
-DENABLE_CRYPT_NONE=ON ^ | ||
-DENABLE_MAC_NONE=ON ^ | ||
-DZLIB_LIBRARY=C:/zlib/lib/zlib.lib ^ | ||
-DZLIB_INCLUDE_DIR=C:/zlib/include ^ | ||
-DOPENSSL_ROOT_DIR=%OPENSSL_DIR% | ||
REM -DOPENSSL_MSVC_STATIC_RT=TRUE | ||
REM -DOPENSSL_USE_STATIC_LIBS=TRUE | ||
) ELSE ( | ||
ECHO "Building with platform %MSVC%" | ||
cmake ..\libssh2 -G "NMake Makefiles" ^ | ||
-DCMAKE_BUILD_TYPE=Release ^ | ||
-DCRYPTO_BACKEND=OpenSSL ^ | ||
-G"%MSVC%" ^ | ||
-DBUILD_SHARED_LIBS=OFF ^ | ||
-DENABLE_ZLIB_COMPRESSION=ON ^ | ||
-DENABLE_CRYPT_NONE=ON ^ | ||
-DENABLE_MAC_NONE=ON ^ | ||
-DZLIB_LIBRARY=C:/zlib/lib/zlib.lib ^ | ||
-DZLIB_INCLUDE_DIR=C:/zlib/include ^ | ||
-DOPENSSL_ROOT_DIR=%OPENSSL_DIR% | ||
REM -DOPENSSL_MSVC_STATIC_RT=TRUE | ||
REM -DOPENSSL_USE_STATIC_LIBS=TRUE | ||
) | ||
|
||
|
||
cp %OPENSSL_DIR%\lib\VC\libcrypto%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER% | ||
cp %OPENSSL_DIR%\lib\VC\libssl%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER% | ||
|
||
cmake --build . --config Release | ||
cd .. | ||
ls | ||
ls ssh2 | ||
ls src/src | ||
cp src/src/libssh2.lib %PYTHON%/libs/ || cp src/src/Release/libssh2.lib %PYTHON%/libs/ | ||
ls %PYTHON%/libs/ |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.