Fix windows .bat launchers (emscripten-core#10743)

sbc100 · web-flow · commit 3e52dcc2b608 · 2020-03-20T18:39:06.000-07:00
The non-py version of these scripts were converted to shell scripts in emscripten-core#10729. The .bat files run python explicitly so can directly reference .py versions of these scripts. Also, move em-config to em-config.py to match all the others.
diff --git a/em++.bat b/em++.bat
@@ -1,2 +1,2 @@
 @echo off
-python "%~dp0\em++" %*
+python "%~dp0\em++.py" %*
diff --git a/em-config.bat b/em-config.bat
@@ -1,2 +1,2 @@
 @echo off
-python "%~dp0\em-config" %*
+python "%~dp0\em-config.py" %*
diff --git a/em-config.py b/em-config.py
@@ -12,7 +12,8 @@
 '''
 
 from __future__ import print_function
-import os, sys, re
+import sys
+import re
 from tools import shared
 
 if len(sys.argv) != 2 or \
@@ -22,4 +23,3 @@
   exit(1)
 
 print(getattr(shared, sys.argv[1]))
-
diff --git a/emar.bat b/emar.bat
@@ -1,2 +1,2 @@
 @echo off
-python "%~dp0\emar" %*
+python "%~dp0\emar.py" %*
diff --git a/emcc.bat b/emcc.bat
@@ -1,2 +1,2 @@
 @echo off
-python "%~dp0\emcc" %*
+python "%~dp0\emcc.py" %*
diff --git a/emcmake.bat b/emcmake.bat
@@ -1,2 +1,2 @@
 @echo off
-python "%~dp0\emcmake" %*
+python "%~dp0\emcmake.py" %*
diff --git a/emconfigure.bat b/emconfigure.bat
@@ -1,2 +1,2 @@
 @echo off
-python "%~dp0\emconfigure" %*
+python "%~dp0\emconfigure.py" %*
diff --git a/emmake.bat b/emmake.bat
@@ -1,2 +1,2 @@
 @echo off
-python "%~dp0\emmake" %*
+python "%~dp0\emmake.py" %*
diff --git a/emranlib.bat b/emranlib.bat
@@ -1,2 +1,2 @@
 @echo off
-python "%~dp0\emranlib" %*
+python "%~dp0\emranlib.py" %*
diff --git a/emrun.bat b/emrun.bat
@@ -1,2 +1,2 @@
 @echo off
-python "%~dp0\emrun" %*
+python "%~dp0\emrun.py" %*
diff --git a/tools/shared.py b/tools/shared.py
@@ -711,7 +711,7 @@ def replace_or_append_suffix(filename, new_suffix):
 EMXX = path_from_root('em++.py')
 EMAR = path_from_root('emar.py')
 EMRANLIB = path_from_root('emranlib.py')
-EMCONFIG = path_from_root('em-config')
+EMCONFIG = path_from_root('em-config.py')
 EMLINK = path_from_root('emlink.py')
 EMCONFIGURE = path_from_root('emconfigure.py')
 EMMAKE = path_from_root('emmake.py')

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`@echo off`
`2`		`-python "%~dp0\em++" %*`
	`2`	`+python "%~dp0\em++.py" %*`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`@echo off`
`2`		`-python "%~dp0\em-config" %*`
	`2`	`+python "%~dp0\em-config.py" %*`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`@echo off`
`2`		`-python "%~dp0\emar" %*`
	`2`	`+python "%~dp0\emar.py" %*`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`@echo off`
`2`		`-python "%~dp0\emcc" %*`
	`2`	`+python "%~dp0\emcc.py" %*`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`@echo off`
`2`		`-python "%~dp0\emcmake" %*`
	`2`	`+python "%~dp0\emcmake.py" %*`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`@echo off`
`2`		`-python "%~dp0\emconfigure" %*`
	`2`	`+python "%~dp0\emconfigure.py" %*`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`@echo off`
`2`		`-python "%~dp0\emmake" %*`
	`2`	`+python "%~dp0\emmake.py" %*`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`@echo off`
`2`		`-python "%~dp0\emranlib" %*`
	`2`	`+python "%~dp0\emranlib.py" %*`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`@echo off`
`2`		`-python "%~dp0\emrun" %*`
	`2`	`+python "%~dp0\emrun.py" %*`