traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-36500: Simplify PCbuild/build.bat and prevent path separator changing in comments (GH-17644)

This commit is contained in:
Steve Dower 2019-12-17 14:14:13 -08:00 committed by GitHub
parent 9e36589d49
commit a9d0a6a1b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
PCbuild/build.bat
View File

@ -156,22 +156,17 @@ echo on
/p:UseTestMarker=%UseTestMarker% %GITProperty%^ /p:UseTestMarker=%UseTestMarker% %GITProperty%^
%1 %2 %3 %4 %5 %6 %7 %8 %9 %1 %2 %3 %4 %5 %6 %7 %8 %9
if "%Regen%"=="true" call :Regen @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 @echo off
exit /b %ERRORLEVEL% 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
@echo off
goto :eof
:Version :Version
rem Display the current build version information rem Display the current build version information
call "%dir%find_msbuild.bat" %MSBUILD% call "%dir%find_msbuild.bat" %MSBUILD%

3
Parser/asdl_c.py
View File

@ -1331,7 +1331,8 @@ common_msg = "/* File automatically generated by %s. */\n\n"
def main(srcfile, dump_module=False): def main(srcfile, dump_module=False):
argv0 = sys.argv[0] argv0 = sys.argv[0]
components = argv0.split(os.sep) components = argv0.split(os.sep)
argv0 = os.sep.join(components[-2:]) # Always join with '/' so different OS does not keep changing the file
argv0 = '/'.join(components[-2:])
auto_gen_msg = common_msg % argv0 auto_gen_msg = common_msg % argv0
mod = asdl.parse(srcfile) mod = asdl.parse(srcfile)
if dump_module: if dump_module: