Commit f26b1f80 authored by Alex Brainman's avatar Alex Brainman

make.bat: properly handle directories with spaces

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/5797079
parent 4ca59a01
...@@ -46,8 +46,8 @@ if x%1==x--no-clean set buildall= ...@@ -46,8 +46,8 @@ if x%1==x--no-clean set buildall=
.\cmd\dist\dist bootstrap %buildall% -v .\cmd\dist\dist bootstrap %buildall% -v
if errorlevel 1 goto fail if errorlevel 1 goto fail
:: Delay move of dist tool to now, because bootstrap cleared tool directory. :: Delay move of dist tool to now, because bootstrap cleared tool directory.
move .\cmd\dist\dist.exe %GOTOOLDIR%\dist.exe move .\cmd\dist\dist.exe "%GOTOOLDIR%\dist.exe"
%GOTOOLDIR%\go_bootstrap clean -i std "%GOTOOLDIR%\go_bootstrap" clean -i std
echo. echo.
if not %GOHOSTARCH% == %GOARCH% goto localbuild if not %GOHOSTARCH% == %GOARCH% goto localbuild
...@@ -59,20 +59,20 @@ echo # Building tools for local system. %GOHOSTOS%/%GOHOSTARCH% ...@@ -59,20 +59,20 @@ echo # Building tools for local system. %GOHOSTOS%/%GOHOSTARCH%
setlocal setlocal
set GOOS=%GOHOSTOS% set GOOS=%GOHOSTOS%
set GOARCH=%GOHOSTARCH% set GOARCH=%GOHOSTARCH%
%GOTOOLDIR%\go_bootstrap install -v std "%GOTOOLDIR%\go_bootstrap" install -v std
endlocal endlocal
if errorlevel 1 goto fail if errorlevel 1 goto fail
echo. echo.
:mainbuild :mainbuild
echo # Building packages and commands. echo # Building packages and commands.
%GOTOOLDIR%\go_bootstrap install -a -v std "%GOTOOLDIR%\go_bootstrap" install -a -v std
if errorlevel 1 goto fail if errorlevel 1 goto fail
del %GOTOOLDIR%\go_bootstrap.exe del "%GOTOOLDIR%\go_bootstrap.exe"
echo. echo.
if x%1==x--no-banner goto nobanner if x%1==x--no-banner goto nobanner
%GOTOOLDIR%\dist banner "%GOTOOLDIR%\dist" banner
:nobanner :nobanner
goto end goto end
......
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