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

zooba · web-flow · commit a9d0a6a1b932 · 2019-12-17T14:14:13.000-08:00
diff --git 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
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
@@ -1331,7 +1331,8 @@ def generate_module_def(f, mod):
 def main(srcfile, dump_module=False):
     argv0 = sys.argv[0]
     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
     mod = asdl.parse(srcfile)
     if dump_module:

Original file line number	Diff line number	Diff line change
`@@ -1331,7 +1331,8 @@ def generate_module_def(f, mod):`
`1331`	`1331`	`def main(srcfile, dump_module=False):`
`1332`	`1332`	`argv0 = sys.argv[0]`
`1333`	`1333`	`components = argv0.split(os.sep)`
`1334`		`- argv0 = os.sep.join(components[-2:])`
	`1334`	`+ # Always join with '/' so different OS does not keep changing the file`
	`1335`	`+ argv0 = '/'.join(components[-2:])`
`1335`	`1336`	`auto_gen_msg = common_msg % argv0`
`1336`	`1337`	`mod = asdl.parse(srcfile)`
`1337`	`1338`	`if dump_module:`