| @@ -34,7 +34,7 @@ |
|
|
| 34 |
34 |
@if NOT "%HOST_PYTHON%"=="" @%HOST_PYTHON% -Ec "import sys; assert sys.version_info[:2] >= (3, 6)" >nul 2>nul && (set PYTHON="%HOST_PYTHON%") && (set _Py_Python_Source=found as HOST_PYTHON) && goto :found |
| 35 |
35 |
|
| 36 |
36 |
@rem If py.exe finds a recent enough version, use that one |
| 37 |
|
-@py -3.6 -EV >nul 2>&1 && (set PYTHON=py -3.6) && (set _Py_Python_Source=found with py.exe) && goto :found |
|
37 |
+@for %%p in (3.7 3.6) do @py -%%p -EV >nul 2>&1 && (set PYTHON=py -%%p) && (set _Py_Python_Source=found %%p with py.exe) && goto :found |
| 38 |
38 |
|
| 39 |
39 |
@if NOT exist "%_Py_EXTERNALS_DIR%" mkdir "%_Py_EXTERNALS_DIR%" |
| 40 |
40 |
@set _Py_NUGET=%NUGET% |
| @@ -55,7 +55,7 @@ |
|
|
| 55 |
55 |
) |
| 56 |
56 |
@echo Installing Python via nuget... |
| 57 |
57 |
@"%_Py_NUGET%" install pythonx86 -ExcludeVersion -OutputDirectory "%_Py_EXTERNALS_DIR%" |
| 58 |
|
-@rem Quote it here; it's not quoted later because "py -3.6" wouldn't work |
|
58 |
+@rem Quote it here; it's not quoted later because "py -x.y" wouldn't work |
| 59 |
59 |
@if not errorlevel 1 (set PYTHON="%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe") & (set _Py_Python_Source=found on nuget.org) & goto :found |
| 60 |
60 |
|
| 61 |
61 |
|