Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updated cfg
  • Loading branch information
Panos committed Aug 22, 2020
commit 63b0985d00b2998d4e03bb6e761f70c24377f28c
17 changes: 5 additions & 12 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,9 @@ install:
- cp %VCLIBDIR%/msvcr*.dll ssh/
- cp %OPENSSL_DIR%/bin/*.dll ssh/

# Prepend newly installed Python to the PATH of this build (this cannot be
# done from inside the powershell script as it would require to restart
# the parent CMD process).
# - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"

# Check that we have the expected version and architecture for Python
- for %%I in (%PYTHONVERS%) do %%I\python.exe -V
- for %%I in (%PYTHONVERS%) do %%I\Scripts\pip install -U wheel setuptools twine cython

# - for %%PYTHONDIR in (%PYTHONVERS%) do %%PYTHONDIR\python.exe -V
# set pip=%python_dir\\Scripts\\pip
# %python% -V
# %pip% install -U wheel setuptools twine cython
# )

# .c files need to be generated on Windows to handle platform
# specific code.
# Fix version used by versioneer to current git tag so the generated .c files
Expand All @@ -86,8 +74,13 @@ install:
build_script:
# - ci\\appveyor\\build_krb.bat
- 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_ssh.bat
- ps: ls src/src/Release
- cp src/src/Release/ssh.dll ssh/
- for %%I in (%PYTHONVERS%) do cp src/src/Release/ssh.lib %%I/libs/
- rm -f ssh/*.c
- for %%I in (%PYTHONVERS%) do %%I\python.exe -V
- for %%I in (%PYTHONVERS%) do %%I\python.exe setup.py build_ext
Expand Down
2 changes: 0 additions & 2 deletions ci/appveyor/build_ssh.bat
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,3 @@ cp %OPENSSL_DIR%\lib\VC\libssl%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER%
cmake --build . --config Release

cd ..
cp src/src/Release/ssh.lib %PYTHON%/libs/
cp src/src/Release/ssh.dll ssh/
2 changes: 0 additions & 2 deletions ci/appveyor/build_zlib.bat
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,4 @@ IF "%MSVC%" == "Visual Studio 9" (
)

cmake --build . --config Release --target install
cp C:/zlib/lib/zlibstatic.lib %PYTHON%/libs/
cd ..
ls %PYTHON%/libs/