Kaydet (Commit) 7ee88bf3 authored tarafından Jess's avatar Jess Kaydeden (comit) Steve Dower

bpo-36245: Avoid problems when building in a directory containing spaces. (GH-12241)

üst 14e3c447
...@@ -41,7 +41,7 @@ if "%DO_FETCH%"=="false" goto end ...@@ -41,7 +41,7 @@ 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%"=="" ( if NOT DEFINED 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 where /Q git || echo Python 3.6 could not be found or installed, and git.exe is not on your PATH && exit /B 1
) )
...@@ -60,7 +60,7 @@ set libraries=%libraries% zlib-1.2.11 ...@@ -60,7 +60,7 @@ set libraries=%libraries% zlib-1.2.11
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%"=="" ( ) else if NOT DEFINED PYTHON (
echo.Fetching %%e with git... echo.Fetching %%e with git...
git clone --depth 1 https://github.com/%ORG%/cpython-source-deps --branch %%e "%EXTERNALS_DIR%\%%e" git clone --depth 1 https://github.com/%ORG%/cpython-source-deps --branch %%e "%EXTERNALS_DIR%\%%e"
) else ( ) else (
...@@ -79,7 +79,7 @@ if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 ...@@ -79,7 +79,7 @@ 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%"=="" ( ) else if NOT DEFINED PYTHON (
echo.Fetching %%b with git... echo.Fetching %%b with git...
git clone --depth 1 https://github.com/%ORG%/cpython-bin-deps --branch %%b "%EXTERNALS_DIR%\%%b" git clone --depth 1 https://github.com/%ORG%/cpython-bin-deps --branch %%b "%EXTERNALS_DIR%\%%b"
) else ( ) else (
......
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