Commit bc4acfe0 authored by Stefan Behnel's avatar Stefan Behnel

Merge branch '0.23.x' of git+ssh://github.com/cython/cython into 0.23.x

parents f46e82cf c483c977
# https://ci.appveyor.com/project/cython/cython
version: {branch}-{build}
environment: environment:
global: global:
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
# /E:ON and /V:ON options are not enabled in the batch script intepreter # /E:ON and /V:ON options are not enabled in the batch script intepreter
# See: http://stackoverflow.com/a/13751649/163740 # See: http://stackoverflow.com/a/13751649/163740
WITH_COMPILER: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_compiler.cmd" WITH_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
matrix: matrix:
- PYTHON: "C:\\Python26" - PYTHON: "C:\\Python26"
...@@ -16,13 +20,17 @@ environment: ...@@ -16,13 +20,17 @@ environment:
PYTHON_ARCH: "32" PYTHON_ARCH: "32"
- PYTHON: "C:\\Python33" - PYTHON: "C:\\Python33"
PYTHON_VERSION: "3.3.6" PYTHON_VERSION: "3.3.5"
PYTHON_ARCH: "32" PYTHON_ARCH: "32"
- PYTHON: "C:\\Python34" - PYTHON: "C:\\Python34"
PYTHON_VERSION: "3.4.3" PYTHON_VERSION: "3.4.3"
PYTHON_ARCH: "32" PYTHON_ARCH: "32"
- PYTHON: "C:\\Python35"
PYTHON_VERSION: "3.5.0"
PYTHON_ARCH: "32"
- PYTHON: "C:\\Python26-x64" - PYTHON: "C:\\Python26-x64"
PYTHON_VERSION: "2.6.6" PYTHON_VERSION: "2.6.6"
PYTHON_ARCH: "64" PYTHON_ARCH: "64"
...@@ -30,27 +38,28 @@ environment: ...@@ -30,27 +38,28 @@ environment:
- PYTHON: "C:\\Python27-x64" - PYTHON: "C:\\Python27-x64"
PYTHON_VERSION: "2.7.9" PYTHON_VERSION: "2.7.9"
PYTHON_ARCH: "64" PYTHON_ARCH: "64"
WINDOWS_SDK_VERSION: "v7.0"
- PYTHON: "C:\\Python33-x64" - PYTHON: "C:\\Python33-x64"
PYTHON_VERSION: "3.3.6" PYTHON_VERSION: "3.3.5"
PYTHON_ARCH: "64" PYTHON_ARCH: "64"
WINDOWS_SDK_VERSION: "v7.1"
- PYTHON: "C:\\Python34-x64" - PYTHON: "C:\\Python34-x64"
PYTHON_VERSION: "3.4.3" PYTHON_VERSION: "3.4.3"
PYTHON_ARCH: "64" PYTHON_ARCH: "64"
WINDOWS_SDK_VERSION: "v7.1"
- PYTHON: "C:\\Python35-x64"
PYTHON_VERSION: "3.5.0"
PYTHON_ARCH: "64"
clone_depth: 5 clone_depth: 5
branches: branches:
only: only:
- master - master
- 0.22.x - 0.23.x
init: init:
- "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" - "ECHO Python %PYTHON_VERSION% (%PYTHON_ARCH%bit) from %PYTHON%"
install: install:
- "powershell appveyor\\install.ps1" - "powershell appveyor\\install.ps1"
...@@ -60,14 +69,14 @@ install: ...@@ -60,14 +69,14 @@ install:
build: off build: off
build_script: build_script:
- "%WITH_COMPILER% %PYTHON%\\python.exe setupegg.py build" - "%WITH_ENV% %PYTHON%\\python.exe setup.py build"
- "%WITH_COMPILER% %PYTHON%\\python.exe setupegg.py --quiet bdist_wheel" - "%WITH_ENV% %PYTHON%\\python.exe setup.py --quiet bdist_wheel"
- "%WITH_COMPILER% %PYTHON%\\python.exe setupegg.py --quiet bdist_msi" - "%WITH_ENV% %PYTHON%\\python.exe setup.py --quiet bdist_msi"
- "%WITH_COMPILER% %PYTHON%\\python.exe setupegg.py --quiet bdist_wininst" - "%WITH_ENV% %PYTHON%\\python.exe setup.py --quiet bdist_wininst"
test: off test: off
test_script: test_script:
- "%WITH_COMPILER% %PYTHON%\\python.exe setupegg.py test" - "%WITH_ENV% %PYTHON%\\python.exe setup.py test"
artifacts: artifacts:
- path: dist\* - path: dist\*
......
:: To build extensions for 64 bit Python 3, we need to configure environment
:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
::
:: To build extensions for 64 bit Python 2, we need to configure environment
:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
::
:: 32 bit builds do not require specific environment configurations.
::
:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
:: cmd interpreter, at least for (SDK v7.0)
::
:: More details at:
:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
:: http://stackoverflow.com/a/13751649/163740
::
:: Author: Olivier Grisel
:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
@ECHO OFF
SET COMMAND_TO_RUN=%*
SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
IF %MAJOR_PYTHON_VERSION% == "2" (
SET WINDOWS_SDK_VERSION="v7.0"
) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
SET WINDOWS_SDK_VERSION="v7.1"
) ELSE (
ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
EXIT 1
)
IF "%PYTHON_ARCH%"=="64" (
ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
SET DISTUTILS_USE_SDK=1
SET MSSdk=1
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
ECHO Executing: %COMMAND_TO_RUN%
call %COMMAND_TO_RUN% || EXIT 1
) ELSE (
ECHO Using default MSVC build environment for 32 bit architecture
ECHO Executing: %COMMAND_TO_RUN%
call %COMMAND_TO_RUN% || EXIT 1
)
:: Author: Lisandro Dalcin
:: Contact: dalcinl@gmail.com
:: Credits: Olivier Grisel and Kyle Kastner
@ECHO OFF
SET COMMAND_TO_RUN=%*
SET PYTHON_VERSION_MAJOR=%PYTHON_VERSION:~0,1%
SET PYTHON_VERSION_MINOR=%PYTHON_VERSION:~2,1%
SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
IF %PYTHON_VERSION_MAJOR% == 2 SET WIN_SDK_VERSION="v7.0"
IF %PYTHON_VERSION_MAJOR% == 3 SET WIN_SDK_VERSION="v7.1"
IF %PYTHON_ARCH% == 64 SET USE_WIN_SDK=1
IF %PYTHON_VERSION_MAJOR% EQU 3 IF %PYTHON_VERSION_MINOR% GEQ 5 SET USE_WIN_SDK=0
IF %PYTHON_VERSION_MAJOR% GTR 3 SET USE_WIN_SDK=0
if %PYTHON_ARCH% == 32 SET USE_WIN_SDK=0
IF %USE_WIN_SDK% == 1 (
ECHO Configuring Windows SDK %WIN_SDK_VERSION% for %PYTHON_ARCH% bit architecture
SET DISTUTILS_USE_SDK=1
SET MSSdk=1
"%WIN_SDK_ROOT%\%WIN_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WIN_SDK_VERSION%
"%WIN_SDK_ROOT%\%WIN_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
ECHO Executing: %COMMAND_TO_RUN%
CALL %COMMAND_TO_RUN% || EXIT 1
) ELSE (
ECHO Using default MSVC build environment for %PYTHON_ARCH% bit architecture
ECHO Executing: %COMMAND_TO_RUN%
CALL %COMMAND_TO_RUN% || EXIT 1
)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment