Support spaces in python executable in .bat launcher scripts (emscrip…

…ten-core#11691) Fixes: emscripten-core#11638
Y2023Y · Jul 23, 2020 · 0cddccb · 0cddccb
1 parent 2033379
commit 0cddccb
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 92 deletions.
diff --git a/em++.bat b/em++.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/em-config.bat b/em-config.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/emar.bat b/emar.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/embuilder.bat b/embuilder.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/emcc.bat b/emcc.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/emcmake.bat b/emcmake.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/emconfigure.bat b/emconfigure.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/emmake.bat b/emmake.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/emranlib.bat b/emranlib.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/emrun.bat b/emrun.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/emscons.bat b/emscons.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/emsize.bat b/emsize.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/tools/run_python.bat b/tools/run_python.bat
@@ -3,12 +3,9 @@
 :: To modify this file, edit `tools/run_python.bat` and then run
 :: `tools/create_entry_points.py`
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=%EMSDK_PYTHON%
+set EM_PY=%EMSDK_PYTHON%
+if "%EM_PY%"=="" (
+  set EM_PY=python
 )
 
-@IF "%PYTHON%"=="" (
-  @SET PYTHON=python
-)
-
-%PYTHON% "%~dp0\%~n0.py" %*
+"%EM_PY%" "%~dp0\%~n0.py" %*
diff --git a/tools/system_libs.py b/tools/system_libs.py
@@ -68,7 +68,7 @@ def get_cflags(force_object_files=False):
 def run_one_command(cmd):
   # Helper function used by run_build_commands.
   if shared.EM_BUILD_VERBOSE:
-    print(' '.join(cmd))
+    print(shared.shlex_join(cmd))
   # building system libraries and ports should be hermetic in that it is not
   # affected by things like EMMAKEN_CFLAGS which the user may have set
   safe_env = os.environ.copy()