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

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 5bc5da9e1c9ea49cdd7b6591bd04c8bd3b98031b..7c24e0b155578138d2f66f10773ec13a9590da0e 100644 (file)
--- 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
index 52495e9b451c1d1ac7bb800ef786437acb7a6300..daac0966f564a42c6767b56e4855a6cd61930123 100755 (executable)
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -1331,7 +1331,8 @@ common_msg = "/* File automatically generated by %s. */\n\n"
 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: