Skip to content

Commit b363d3f

Browse files
committed
CI: use default env vars on py35
Also make the batch file use local variables...
1 parent 1d1660f commit b363d3f

File tree

1 file changed

+44
-14
lines changed

1 file changed

+44
-14
lines changed

ci/appveyor/run_with_env.cmd

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,60 @@
1818
:: Author: Olivier Grisel
1919
:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
2020
@ECHO OFF
21-
21+
Setlocal EnableDelayedExpansion
2222
SET COMMAND_TO_RUN=%*
2323
SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
2424

25-
SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
26-
IF %MAJOR_PYTHON_VERSION% == "2" (
25+
SETLOCAL
26+
:: unquote
27+
call :unquote PYTHON_VERSION %PYTHON_VERSION%
28+
SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1%
29+
IF "%PYTHON_VERSION:~1,1%" == "." (
30+
:: CONDA_PY style, such as 27, 34 etc.
31+
SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~1,1%
32+
) ELSE (
33+
IF "%PYTHON_VERSION:~3,1%" == "." (
34+
SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
35+
) ELSE (
36+
SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,2%
37+
)
38+
)
39+
SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
40+
SET PYTHON_VERSION=%MAJOR_PYTHON_VERSION%%MINOR_PYTHON_VERSION%
41+
set USE_MS_SDK=N
42+
IF %MAJOR_PYTHON_VERSION% == 2 (
2743
SET WINDOWS_SDK_VERSION="v7.0"
28-
) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
29-
SET WINDOWS_SDK_VERSION="v7.1"
44+
set USE_MS_SDK=Y
45+
) ELSE IF %MAJOR_PYTHON_VERSION% == 3 (
46+
rem py3.5 does not need a sdk set...
47+
IF %MINOR_PYTHON_VERSION% LEQ 4 (
48+
SET WINDOWS_SDK_VERSION="v7.1"
49+
set USE_MS_SDK=Y
50+
)
3051
) ELSE (
3152
ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
3253
EXIT 1
3354
)
3455

56+
ENDLOCAL
57+
SET WINDOWS_SDK_VERSION=%WINDOWS_SDK_VERSION%
3558
IF "%PYTHON_ARCH%"=="64" (
36-
ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
37-
SET DISTUTILS_USE_SDK=1
38-
SET MSSdk=1
39-
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
40-
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
41-
ECHO Executing: %COMMAND_TO_RUN%
42-
call %COMMAND_TO_RUN% || EXIT 1
59+
IF "%USE_MS_SDK%" == "N" (
60+
echo Using the happy new world of py35+ auto configuring compilers....
61+
) ELSE (
62+
ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION%.%MINOR_PYTHON_VERSION% on a 64 bit architecture
63+
SET DISTUTILS_USE_SDK=1
64+
SET MSSdk=1
65+
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
66+
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
67+
)
4368
) ELSE (
4469
ECHO Using default MSVC build environment for 32 bit architecture
45-
ECHO Executing: %COMMAND_TO_RUN%
46-
call %COMMAND_TO_RUN% || EXIT 1
4770
)
71+
ECHO Executing: %COMMAND_TO_RUN%
72+
call %COMMAND_TO_RUN% || EXIT 1
73+
goto :EOF
74+
75+
:unquote
76+
set %1=%~2
77+
goto :EOF

0 commit comments

Comments
 (0)