Skip to content

[3.6] bpo-30450: Improved logic for obtaining dependencies #2751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 5 commits into from
Jul 19, 2017
Merged

[3.6] bpo-30450: Improved logic for obtaining dependencies #2751

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7195303
bpo-30450: Adds alternate download approach for nuget.exe (#2737)
zooba Jul 17, 2017
c0b4c82
bpo-30450: Fall back to git.exe if no Python is found. (#2739)
zooba Jul 17, 2017
e28d42a
bpo-30450: Fix logic for retrying nuget.exe download (#2744)
zooba Jul 18, 2017
552ac67
Backport changes to batch files
zooba Jul 18, 2017
80dd5a5
Fixes lingering old variable
zooba Jul 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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.
  • Loading branch information
@zooba
zooba committed Jul 18, 2017
commit c0b4c8255ab9c7ef109eff12c5e6378ba4063abb
10 changes: 10 additions & 0 deletions PCbuild/get_externals.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ if "%PYTHON_FOR_BUILD%"=="" (
set PYTHON_FOR_BUILD="%EXTERNALS_DIR%\pythonx86\tools\python.exe"
)

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 @@ -65,6 +69,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_FOR_BUILD% "%PCBUILD%get_external.py" -O %ORG% %%e
Expand All @@ -80,6 +87,9 @@ if NOT "%IncludeSSL%"=="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_FOR_BUILD% "%PCBUILD%get_external.py" -b -O %ORG% %%b
Expand Down