diff options
| author | Steve Dower <steve.dower@python.org> | 2019-12-17 22:14:13 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 22:14:13 (GMT) |
| commit | a9d0a6a1b932752873e04714c5dda707729078e4 (patch) | |
| tree | eedcf638c3722effd86b8196a4f279e8707436cd /PCbuild | |
| parent | 9e36589d49c1d6b06c0239fa69e8274d7e89e375 (diff) | |
| download | cpython-a9d0a6a1b932752873e04714c5dda707729078e4.zip cpython-a9d0a6a1b932752873e04714c5dda707729078e4.tar.gz cpython-a9d0a6a1b932752873e04714c5dda707729078e4.tar.bz2 | |
bpo-36500: Simplify PCbuild/build.bat and prevent path separator changing in comments (GH-17644)
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/build.bat | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/PCbuild/build.bat b/PCbuild/build.bat index 5bc5da9..7c24e0b 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -156,21 +156,16 @@ echo on /p:UseTestMarker=%UseTestMarker% %GITProperty%^ %1 %2 %3 %4 %5 %6 %7 %8 %9 -if "%Regen%"=="true" call :Regen -@echo off -exit /b %ERRORLEVEL% - -:Regen -echo on -call "%dir%find_msbuild.bat" %MSBUILD% -if not ERRORLEVEL 1 %MSBUILD% "%dir%regen.vcxproj" /t:%target% %parallel% %verbose%^ - /p:IncludeExternals=%IncludeExternals%^ - /p:Configuration=%conf% /p:Platform=%platf%^ - /p:UseTestMarker=%UseTestMarker% %GITProperty%^ - %1 %2 %3 %4 %5 %6 %7 %8 %9 +@if not ERRORLEVEL 1 @if "%Regen%"=="true" ( + %MSBUILD% "%dir%regen.vcxproj" /t:%target% %parallel% %verbose%^ + /p:IncludeExternals=%IncludeExternals%^ + /p:Configuration=%conf% /p:Platform=%platf%^ + /p:UseTestMarker=%UseTestMarker% %GITProperty%^ + %1 %2 %3 %4 %5 %6 %7 %8 %9 +) @echo off -goto :eof +exit /b %ERRORLEVEL% :Version rem Display the current build version information |