Rename internal environment variables 'PYTHON' and 'EM_PY' in launcher scripts. (#25867)

Rename internal environment variables 'PYTHON' and 'EM_PY' used by
Linux/macOS and Windows launcher scripts to a underscore-prefixed
'_EM_PY' variable, to make it clear these are internal variable names,
and not meant to be defined from the outside. Also clean up a couple of
comment typos.

Author: juj

bootstrap

@@ -11,25 +11,23 @@
 # To make modifications to this file, edit `tools/run_python.sh` and then run
 # `tools/maint/create_entry_points.py`
 
-# $PYTHON -E does not ignore _PYTHON_SYSCONFIGDATA_NAME, an internal of cpython
+# $_EM_PY -E does not ignore _PYTHON_SYSCONFIGDATA_NAME, an internal of cpython
 # used in cross compilation via setup.py, so we unset it explicitly here.
 unset _PYTHON_SYSCONFIGDATA_NAME
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$EMSDK_PYTHON
-fi
+_EM_PY=$EMSDK_PYTHON
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$(command -v python3 2> /dev/null)
+if [ -z "$_EM_PY" ]; then
+  _EM_PY=$(command -v python3 2> /dev/null)
 fi
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$(command -v python 2> /dev/null)
+if [ -z "$_EM_PY" ]; then
+  _EM_PY=$(command -v python 2> /dev/null)
 fi
 
-if [ -z "$PYTHON" ]; then
+if [ -z "$_EM_PY" ]; then
   echo 'unable to find python in $PATH'
   exit 1
 fi
 
-exec "$PYTHON" -E "$0.py" "$@"
+exec "$_EM_PY" -E "$0.py" "$@"

bootstrap.bat

@@ -2,8 +2,8 @@
 ::
 :: Automatically generated by `create_entry_points.py`; DO NOT EDIT.
 ::
-:: To make modifications to this file, edit `tools/run_python.bat` and then run
-:: `tools/maint/create_entry_points.py`
+:: To make modifications to this file, edit `tools\run_python.bat` and then run
+:: `tools\maint\create_entry_points.py`
 
 :: N.b. In Windows .bat scripts, the ':' character cannot appear inside any if () blocks,
 :: or there will be a parsing error.
@@ -13,9 +13,9 @@
 :: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
 :: of cpython used in cross compilation via setup.py.
 @set _PYTHON_SYSCONFIGDATA_NAME=
-@set EM_PY=%EMSDK_PYTHON%
-@if "%EM_PY%"=="" (
-  set EM_PY=python
+@set _EM_PY=%EMSDK_PYTHON%
+@if "%_EM_PY%"=="" (
+  set _EM_PY=python
 )
 
 :: Work around Windows bug https://github.com/microsoft/terminal/issues/15212 : If this
@@ -71,16 +71,16 @@
 )
 
 :NORMAL_EXIT
-@"%EM_PY%" -E "%MYDIR%%~n0.py" %*
+@"%_EM_PY%" -E "%MYDIR%%~n0.py" %*
 @exit %ERRORLEVEL%
 
 :MUTE_STDIN
-@"%EM_PY%" -E "%MYDIR%%~n0.py" %* < NUL
+@"%_EM_PY%" -E "%MYDIR%%~n0.py" %* < NUL
 @exit /b %ERRORLEVEL%
 
 :MUTE_STDIN_EXIT
-@"%EM_PY%" -E "%MYDIR%%~n0.py" %* < NUL
+@"%_EM_PY%" -E "%MYDIR%%~n0.py" %* < NUL
 @exit %ERRORLEVEL%
 
 :NORMAL
-@"%EM_PY%" -E "%MYDIR%%~n0.py" %*
+@"%_EM_PY%" -E "%MYDIR%%~n0.py" %*

em++

@@ -8,32 +8,30 @@
 #
 # Automatically generated by `create_entry_points.py`; DO NOT EDIT.
 #
-# To make modifications to this file, edit `tools/run_python_compiler.sh` and
-# then run `tools/create_entry_points.py`
+# To make modifications to this file, edit `tools/maint/run_python_compiler.sh` and
+# then run `tools/maint/create_entry_points.py`
 
-# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
+# $_EM_PY -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
 # of cpython used in cross compilation via setup.py.
 unset _PYTHON_SYSCONFIGDATA_NAME
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$EMSDK_PYTHON
-fi
+_EM_PY=$EMSDK_PYTHON
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$(command -v python3 2> /dev/null)
+if [ -z "$_EM_PY" ]; then
+  _EM_PY=$(command -v python3 2> /dev/null)
 fi
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$(command -v python 2> /dev/null)
+if [ -z "$_EM_PY" ]; then
+  _EM_PY=$(command -v python 2> /dev/null)
 fi
 
-if [ -z "$PYTHON" ]; then
+if [ -z "$_EM_PY" ]; then
   echo 'unable to find python in $PATH'
   exit 1
 fi
 
 if [ -z "$_EMCC_CCACHE" ]; then
-  exec "$PYTHON" -E "$0.py" "$@"
+  exec "$_EM_PY" -E "$0.py" "$@"
 else
   unset _EMCC_CCACHE
   exec ccache "$0" "$@"

em++.bat

@@ -2,8 +2,8 @@
 ::
 :: Automatically generated by `create_entry_points.py`; DO NOT EDIT.
 ::
-:: To make modifications to this file, edit `tools/run_python_compiler.bat` and
-:: then run `tools/create_entry_points.py`
+:: To make modifications to this file, edit `tools\maint\run_python_compiler.bat` and
+:: then run `tools\maint\create_entry_points.py`
 
 :: N.b. In Windows .bat scripts, the ':' character cannot appear inside any if () blocks,
 :: or there will be a parsing error.
@@ -13,9 +13,9 @@
 :: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
 :: of cpython used in cross compilation via setup.py.
 @set _PYTHON_SYSCONFIGDATA_NAME=
-@set EM_PY=%EMSDK_PYTHON%
-@if "%EM_PY%"=="" (
-  set EM_PY=python
+@set _EM_PY=%EMSDK_PYTHON%
+@if "%_EM_PY%"=="" (
+  set _EM_PY=python
 )
 
 :: Work around Windows bug https://github.com/microsoft/terminal/issues/15212 : If this
@@ -42,7 +42,7 @@
 :: If _EMCC_CCACHE is not set, do a regular invocation of the python compiler driver.
 :: Otherwise remove the ccache env. var, and then reinvoke this script with ccache enabled.
 @if "%_EMCC_CCACHE%"=="" (
-  set CMD="%EM_PY%" -E "%MYDIR%%~n0.py"
+  set CMD="%_EM_PY%" -E "%MYDIR%%~n0.py"
 ) else (
   set _EMCC_CCACHE=
   set CMD=ccache "%MYDIR%%~n0.bat"

emcc

@@ -8,32 +8,30 @@
 #
 # Automatically generated by `create_entry_points.py`; DO NOT EDIT.
 #
-# To make modifications to this file, edit `tools/run_python_compiler.sh` and
-# then run `tools/create_entry_points.py`
+# To make modifications to this file, edit `tools/maint/run_python_compiler.sh` and
+# then run `tools/maint/create_entry_points.py`
 
-# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
+# $_EM_PY -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
 # of cpython used in cross compilation via setup.py.
 unset _PYTHON_SYSCONFIGDATA_NAME
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$EMSDK_PYTHON
-fi
+_EM_PY=$EMSDK_PYTHON
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$(command -v python3 2> /dev/null)
+if [ -z "$_EM_PY" ]; then
+  _EM_PY=$(command -v python3 2> /dev/null)
 fi
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$(command -v python 2> /dev/null)
+if [ -z "$_EM_PY" ]; then
+  _EM_PY=$(command -v python 2> /dev/null)
 fi
 
-if [ -z "$PYTHON" ]; then
+if [ -z "$_EM_PY" ]; then
   echo 'unable to find python in $PATH'
   exit 1
 fi
 
 if [ -z "$_EMCC_CCACHE" ]; then
-  exec "$PYTHON" -E "$0.py" "$@"
+  exec "$_EM_PY" -E "$0.py" "$@"
 else
   unset _EMCC_CCACHE
   exec ccache "$0" "$@"

emcc.bat

@@ -2,8 +2,8 @@
 ::
 :: Automatically generated by `create_entry_points.py`; DO NOT EDIT.
 ::
-:: To make modifications to this file, edit `tools/run_python_compiler.bat` and
-:: then run `tools/create_entry_points.py`
+:: To make modifications to this file, edit `tools\maint\run_python_compiler.bat` and
+:: then run `tools\maint\create_entry_points.py`
 
 :: N.b. In Windows .bat scripts, the ':' character cannot appear inside any if () blocks,
 :: or there will be a parsing error.
@@ -13,9 +13,9 @@
 :: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
 :: of cpython used in cross compilation via setup.py.
 @set _PYTHON_SYSCONFIGDATA_NAME=
-@set EM_PY=%EMSDK_PYTHON%
-@if "%EM_PY%"=="" (
-  set EM_PY=python
+@set _EM_PY=%EMSDK_PYTHON%
+@if "%_EM_PY%"=="" (
+  set _EM_PY=python
 )
 
 :: Work around Windows bug https://github.com/microsoft/terminal/issues/15212 : If this
@@ -42,7 +42,7 @@
 :: If _EMCC_CCACHE is not set, do a regular invocation of the python compiler driver.
 :: Otherwise remove the ccache env. var, and then reinvoke this script with ccache enabled.
 @if "%_EMCC_CCACHE%"=="" (
-  set CMD="%EM_PY%" -E "%MYDIR%%~n0.py"
+  set CMD="%_EM_PY%" -E "%MYDIR%%~n0.py"
 ) else (
   set _EMCC_CCACHE=
   set CMD=ccache "%MYDIR%%~n0.bat"

test/runner

@@ -11,25 +11,23 @@
 # To make modifications to this file, edit `tools/run_python.sh` and then run
 # `tools/maint/create_entry_points.py`
 
-# $PYTHON -E does not ignore _PYTHON_SYSCONFIGDATA_NAME, an internal of cpython
+# $_EM_PY -E does not ignore _PYTHON_SYSCONFIGDATA_NAME, an internal of cpython
 # used in cross compilation via setup.py, so we unset it explicitly here.
 unset _PYTHON_SYSCONFIGDATA_NAME
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$EMSDK_PYTHON
-fi
+_EM_PY=$EMSDK_PYTHON
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$(command -v python3 2> /dev/null)
+if [ -z "$_EM_PY" ]; then
+  _EM_PY=$(command -v python3 2> /dev/null)
 fi
 
-if [ -z "$PYTHON" ]; then
-  PYTHON=$(command -v python 2> /dev/null)
+if [ -z "$_EM_PY" ]; then
+  _EM_PY=$(command -v python 2> /dev/null)
 fi
 
-if [ -z "$PYTHON" ]; then
+if [ -z "$_EM_PY" ]; then
   echo 'unable to find python in $PATH'
   exit 1
 fi
 
-exec "$PYTHON" -E "$0.py" "$@"
+exec "$_EM_PY" -E "$0.py" "$@"

test/runner.bat

@@ -2,8 +2,8 @@
 ::
 :: Automatically generated by `create_entry_points.py`; DO NOT EDIT.
 ::
-:: To make modifications to this file, edit `tools/run_python.bat` and then run
-:: `tools/maint/create_entry_points.py`
+:: To make modifications to this file, edit `tools\run_python.bat` and then run
+:: `tools\maint\create_entry_points.py`
 
 :: N.b. In Windows .bat scripts, the ':' character cannot appear inside any if () blocks,
 :: or there will be a parsing error.
@@ -13,9 +13,9 @@
 :: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
 :: of cpython used in cross compilation via setup.py.
 @set _PYTHON_SYSCONFIGDATA_NAME=
-@set EM_PY=%EMSDK_PYTHON%
-@if "%EM_PY%"=="" (
-  set EM_PY=python
+@set _EM_PY=%EMSDK_PYTHON%
+@if "%_EM_PY%"=="" (
+  set _EM_PY=python
 )
 
 :: Work around Windows bug https://github.com/microsoft/terminal/issues/15212 : If this
@@ -71,16 +71,16 @@
 )
 
 :NORMAL_EXIT
-@"%EM_PY%" -E "%MYDIR%%~n0.py" %*
+@"%_EM_PY%" -E "%MYDIR%%~n0.py" %*
 @exit %ERRORLEVEL%
 
 :MUTE_STDIN
-@"%EM_PY%" -E "%MYDIR%%~n0.py" %* < NUL
+@"%_EM_PY%" -E "%MYDIR%%~n0.py" %* < NUL
 @exit /b %ERRORLEVEL%
 
 :MUTE_STDIN_EXIT
-@"%EM_PY%" -E "%MYDIR%%~n0.py" %* < NUL
+@"%_EM_PY%" -E "%MYDIR%%~n0.py" %* < NUL
 @exit %ERRORLEVEL%
 
 :NORMAL
-@"%EM_PY%" -E "%MYDIR%%~n0.py" %*
+@"%_EM_PY%" -E "%MYDIR%%~n0.py" %*

test/third_party/posixtestsuite

@@ -2,8 +2,8 @@
 ::
 :: Automatically generated by `create_entry_points.py`; DO NOT EDIT.
 ::
-:: To make modifications to this file, edit `tools/run_python.bat` and then run
-:: `tools/maint/create_entry_points.py`
+:: To make modifications to this file, edit `tools\run_python.bat` and then run
+:: `tools\maint\create_entry_points.py`
 
 :: N.b. In Windows .bat scripts, the ':' character cannot appear inside any if () blocks,
 :: or there will be a parsing error.
@@ -13,9 +13,9 @@
 :: -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
 :: of cpython used in cross compilation via setup.py.
 @set _PYTHON_SYSCONFIGDATA_NAME=
-@set EM_PY=%EMSDK_PYTHON%
-@if "%EM_PY%"=="" (
-  set EM_PY=python
+@set _EM_PY=%EMSDK_PYTHON%
+@if "%_EM_PY%"=="" (
+  set _EM_PY=python
 )
 
 :: Work around Windows bug https://github.com/microsoft/terminal/issues/15212 : If this
@@ -71,16 +71,16 @@
 )
 
 :NORMAL_EXIT
-@"%EM_PY%" -E "%MYDIR%%~n0.py" %*
+@"%_EM_PY%" -E "%MYDIR%%~n0.py" %*
 @exit %ERRORLEVEL%
 
 :MUTE_STDIN
-@"%EM_PY%" -E "%MYDIR%%~n0.py" %* < NUL
+@"%_EM_PY%" -E "%MYDIR%%~n0.py" %* < NUL
 @exit /b %ERRORLEVEL%
 
 :MUTE_STDIN_EXIT
-@"%EM_PY%" -E "%MYDIR%%~n0.py" %* < NUL
+@"%_EM_PY%" -E "%MYDIR%%~n0.py" %* < NUL
 @exit %ERRORLEVEL%
 
 :NORMAL
-@"%EM_PY%" -E "%MYDIR%%~n0.py" %*
+@"%_EM_PY%" -E "%MYDIR%%~n0.py" %*