Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 14fcb76

Browse files
jankatinsjankatins
committed
CI: use default env vars on py35
3.5 does not need a sdk, so don't set the variables in that case...
1 parent 1d1660f commit 14fcb76

File tree

1 file changed

+42
-15
lines changed

1 file changed

+42
-15
lines changed

‎ci/appveyor/run_with_env.cmd

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,58 @@
1717
::
1818
:: Author: Olivier Grisel
1919
:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
20-
@ECHO OFF
20+
::@ECHO OFF
2121

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" (
27-
SET WINDOWS_SDK_VERSION="v7.0"
28-
) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
29-
SET WINDOWS_SDK_VERSION="v7.1"
25+
:: unquote
26+
call :unquote PYTHON_VERSION %PYTHON_VERSION%
27+
SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1%
28+
IF "%PYTHON_VERSION:~1,1%" == "." (
29+
:: CONDA_PY style, such as 27, 34 etc.
30+
SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~1,1%
31+
) ELSE (
32+
IF "%PYTHON_VERSION:~3,1%" == "." (
33+
SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
34+
) ELSE (
35+
SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,2%
36+
)
37+
)
38+
SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
39+
set USE_MS_SDK=N
40+
IF %MAJOR_PYTHON_VERSION% == 2 (
41+
SET WINDOWS_SDK_VERSION=v7.0
42+
set USE_MS_SDK=Y
43+
) ELSE IF %MAJOR_PYTHON_VERSION% == 3 (
44+
rem py3.5 does not need a sdk set...
45+
IF %MINOR_PYTHON_VERSION% LEQ 4 (
46+
SET WINDOWS_SDK_VERSION=v7.1
47+
set USE_MS_SDK=Y
48+
)
3049
) ELSE (
3150
ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
3251
EXIT 1
3352
)
3453

54+
SET WINDOWS_SDK_VERSION=%WINDOWS_SDK_VERSION%
3555
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
56+
IF "%USE_MS_SDK%" == "N" (
57+
echo Using the happy new world of py35+ auto configuring compilers....
58+
) ELSE (
59+
ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION%.%MINOR_PYTHON_VERSION% on a 64 bit architecture
60+
SET DISTUTILS_USE_SDK=1
61+
SET MSSdk=1
62+
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
63+
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
64+
)
4365
) ELSE (
4466
ECHO Using default MSVC build environment for 32 bit architecture
45-
ECHO Executing: %COMMAND_TO_RUN%
46-
call %COMMAND_TO_RUN% || EXIT 1
4767
)
68+
ECHO Executing: %COMMAND_TO_RUN%
69+
call %COMMAND_TO_RUN% || EXIT 1
70+
goto :EOF
71+
72+
:unquote
73+
set %1=%~2
74+
goto :EOF

0 commit comments

Comments
 (0)