Skip to content

Commit

Permalink
bpo-30450: Fall back to git.exe if no Python is found. (#2739)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
zooba authored Jul 17, 2017
1 parent 588836d commit efa26bc
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions PCbuild/get_externals.bat
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ if "%DO_FETCH%"=="false" goto end
if "%ORG%"=="" (set ORG=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...

set libraries=
Expand All @@ -55,6 +59,9 @@ set libraries=%libraries% xz-5.2.2
for %%e in (%libraries%) do (
if exist "%EXTERNALS_DIR%\%%e" (
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 (
echo.Fetching %%e...
%PYTHON% "%PCBUILD%get_external.py" -O %ORG% %%e
Expand All @@ -71,6 +78,9 @@ if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
for %%b in (%binaries%) do (
if exist "%EXTERNALS_DIR%\%%b" (
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 (
echo.Fetching %%b...
%PYTHON% "%PCBUILD%get_external.py" -b -O %ORG% %%b
Expand Down

0 comments on commit efa26bc

Please sign in to comment.