Skip to content

bpo-30450: Pull Windows dependencies from GitHub rather than svn #1783

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
zware merged 18 commits into from
Jun 16, 2017
Merged

bpo-30450: Pull Windows dependencies from GitHub rather than svn #1783

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
49e6717
Pull Windows dependencies from GitHub rather than svn
zware May 24, 2017
8e3c238
Use quotes around an envvar
zware May 24, 2017
b9993bb
Use 32-bit python from Nuget; exclude version
zware May 24, 2017
e95433a
Use pathlib, leave directory creation to Python if possible
zware May 24, 2017
e0bd20d
Rewrite Tools/msi/get_externals.bat
zware May 24, 2017
c304ea6
Fix Tools/msi/get_externals.bat
zware May 24, 2017
ffb3f71
Be more consistent in quoting and capitalization
zware May 28, 2017
99063c0
Be more consistent in quoting and capitalization
zware May 28, 2017
b7766fa
Remove SVN mentions from readme.txt
zware May 28, 2017
2bc26ce
Fix capitalization of NuGet
zware May 28, 2017
3d2545e
Hope this isn't what broke AppVeyor...
zware May 28, 2017
27441cb
Can NuGet handle dirs with spaces in them?
zware May 28, 2017
e18a852
Fix support for dirs with spaces
zware May 28, 2017
1c820dd
Allow a bit more environmental configurability
zware May 28, 2017
9f6f471
Don't add trailing slash to EXTERNALS_DIR
zware May 28, 2017
26308cf
Update Tools/msi/get_externals.bat
zware Jun 3, 2017
e6830ae
Merge branch 'master' into goodbye_svn
zware Jun 11, 2017
db974fd
66s/binaries/tools/, add comment
zware Jun 16, 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
Be more consistent in quoting and capitalization
  • Loading branch information
@zware
zware authored May 28, 2017
commit 99063c08aaec2928540e79522e49a09b39f36a64
21 changes: 11 additions & 10 deletions Tools/msi/get_externals.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if exist "%EXTERNALS_DIR%" (
rmdir /s /q "%EXTERNALS_DIR%" || rmdir /s /q "%EXTERNALS_DIR%"
)

if %DO_FETCH%==false goto end
if "%DO_FETCH%"=="false" goto end
:fetch


Expand All @@ -38,26 +38,27 @@ if "%PYTHON_FOR_BUILD%"=="" (
py -3.6 -V >nul 2>&1 && (set PYTHON_FOR_BUILD=py -3.6)
)
if "%PYTHON_FOR_BUILD%"=="" (
if not exist "%EXTERNALS_DIR%" mkdir "%EXTERNALS_DIR%"
if NOT exist %NUGET% (
if NOT exist "%EXTERNALS_DIR%" mkdir "%EXTERNALS_DIR%"
if NOT exist "%NUGET%" (
echo Downloading nuget...
powershell.exe -Command Invoke-WebRequest %NUGET_URL% -OutFile %NUGET%
powershell.exe -Command Invoke-WebRequest %NUGET_URL% -OutFile "%NUGET%"
)
echo Installing Python via nuget...
%NUGET% install pythonx86 -OutputDirectory %EXTERNALS_DIR%..\ -ExcludeVersion
set PYTHON_FOR_BUILD=%EXTERNALS_DIR%..\pythonx86\tools\python.exe
"%NUGET%" install pythonx86 -OutputDirectory "%EXTERNALS_DIR%..\" -ExcludeVersion
rem Quote it here; it's not quoted later because it's usually a command and arg
set PYTHON_FOR_BUILD="%EXTERNALS_DIR%..\pythonx86\tools\python.exe"
)

echo.Fetching external libraries...

set libraries=

for %%e in (%libraries%) do (
if exist %EXTERNALS_DIR%%%e (
if exist "%EXTERNALS_DIR%%%e" (
echo.%%e already exists, skipping.
) else (
echo.Fetching %%e...
%PYTHON_FOR_BUILD% %PCBUILD%get_external.py -e %EXTERNALS_DIR% -O %ORG% %%e
%PYTHON_FOR_BUILD% "%PCBUILD%get_external.py" -e "%EXTERNALS_DIR%" -O %ORG% %%e
)
)

Expand All @@ -72,11 +73,11 @@ set binaries=%binaries% redist
set binaries=%binaries% wix

for %%b in (%binaries%) do (
if exist %EXTERNALS_DIR%%%b (
if exist "%EXTERNALS_DIR%%%b" (
echo.%%b already exists, skipping.
) else (
echo.Fetching %%b...
%PYTHON_FOR_BUILD% %PCBUILD%get_external.py -e %EXTERNALS_DIR% -b -O %ORG% %%b
%PYTHON_FOR_BUILD% "%PCBUILD%get_external.py" -e "%EXTERNALS_DIR%" -b -O %ORG% %%b
)
)

Expand Down