Kaydet (Commit) efa26bcd authored tarafından Steve Dower's avatar Steve Dower Kaydeden (comit) GitHub

bpo-30450: Fall back to git.exe if no Python is found. (#2739)

* bpo-30450: Fall back to git.exe if no Python is found.

* Also check whether git.exe is on PATH if it will be used.
üst 588836d3
...@@ -41,6 +41,10 @@ if "%DO_FETCH%"=="false" goto end ...@@ -41,6 +41,10 @@ if "%DO_FETCH%"=="false" goto end
if "%ORG%"=="" (set ORG=python) if "%ORG%"=="" (set ORG=python)
call "%PCBUILD%find_python.bat" "%PYTHON%" call "%PCBUILD%find_python.bat" "%PYTHON%"
if "%PYTHON%"=="" (
where /Q git || echo Python 3.6 could not be found or installed, and git.exe is not on your PATH && exit /B 1
)
echo.Fetching external libraries... echo.Fetching external libraries...
set libraries= set libraries=
...@@ -55,6 +59,9 @@ set libraries=%libraries% xz-5.2.2 ...@@ -55,6 +59,9 @@ set libraries=%libraries% xz-5.2.2
for %%e in (%libraries%) do ( for %%e in (%libraries%) do (
if exist "%EXTERNALS_DIR%\%%e" ( if exist "%EXTERNALS_DIR%\%%e" (
echo.%%e already exists, skipping. echo.%%e already exists, skipping.
) else if "%PYTHON%"=="" (
echo.Fetching %%e with git...
git clone --depth 1 https://github.com/%ORG%/cpython-source-deps --branch %%e "%EXTERNALS_DIR%\%%e"
) else ( ) else (
echo.Fetching %%e... echo.Fetching %%e...
%PYTHON% "%PCBUILD%get_external.py" -O %ORG% %%e %PYTHON% "%PCBUILD%get_external.py" -O %ORG% %%e
...@@ -71,6 +78,9 @@ if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 ...@@ -71,6 +78,9 @@ if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
for %%b in (%binaries%) do ( for %%b in (%binaries%) do (
if exist "%EXTERNALS_DIR%\%%b" ( if exist "%EXTERNALS_DIR%\%%b" (
echo.%%b already exists, skipping. echo.%%b already exists, skipping.
) else if "%PYTHON%"=="" (
echo.Fetching %%b with git...
git clone --depth 1 https://github.com/%ORG%/cpython-bin-deps --branch %%b "%EXTERNALS_DIR%\%%b"
) else ( ) else (
echo.Fetching %%b... echo.Fetching %%b...
%PYTHON% "%PCBUILD%get_external.py" -b -O %ORG% %%b %PYTHON% "%PCBUILD%get_external.py" -b -O %ORG% %%b
......
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