Skip to content

Commit

Permalink
Honor EMSDK_PYTHON in bat and sh launcher scripts (#11611)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbc100
sbc100 authored Jul 10, 2020
1 parent a037f62 commit e0702c9
Show file tree
Hide file tree
Showing 26 changed files with 208 additions and 52 deletions.
4 changes: 4 additions & 0 deletions em++
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down
16 changes: 12 additions & 4 deletions em++.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
4 changes: 4 additions & 0 deletions em-config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down
16 changes: 12 additions & 4 deletions em-config.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
4 changes: 4 additions & 0 deletions emar
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down
16 changes: 12 additions & 4 deletions emar.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
4 changes: 4 additions & 0 deletions embuilder
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down
16 changes: 12 additions & 4 deletions embuilder.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
4 changes: 4 additions & 0 deletions emcc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down
16 changes: 12 additions & 4 deletions emcc.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
4 changes: 4 additions & 0 deletions emcmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down
16 changes: 12 additions & 4 deletions emcmake.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
4 changes: 4 additions & 0 deletions emconfigure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down
16 changes: 12 additions & 4 deletions emconfigure.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
4 changes: 4 additions & 0 deletions emmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down
16 changes: 12 additions & 4 deletions emmake.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
4 changes: 4 additions & 0 deletions emranlib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down
16 changes: 12 additions & 4 deletions emranlib.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
4 changes: 4 additions & 0 deletions emrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down
16 changes: 12 additions & 4 deletions emrun.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
4 changes: 4 additions & 0 deletions emscons
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down
16 changes: 12 additions & 4 deletions emscons.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
4 changes: 4 additions & 0 deletions emsize
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down
16 changes: 12 additions & 4 deletions emsize.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
16 changes: 12 additions & 4 deletions tools/run_python.bat
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off
REM Entry point for running python scripts on windows systems.
REM To modify this file, edit `tools/run_python.bat` and then run
REM `tools/create_entry_points.py`
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: `tools/create_entry_points.py`

python "%~dp0\%~n0.py" %*
@IF "%PYTHON%"=="" (
@SET PYTHON=%EMSDK_PYTHON%
)

@IF "%PYTHON%"=="" (
@SET PYTHON=python
)

%PYTHON% "%~dp0\%~n0.py" %*
4 changes: 4 additions & 0 deletions tools/run_python.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
# To modify this file, edit `tools/run_python.sh` and then run
# `tools/create_entry_points.py`

if [ -z "$PYTHON" ]; then
PYTHON=$EMSDK_PYTHON
fi

if [ -z "$PYTHON" ]; then
PYTHON=$(which python3 2> /dev/null)
fi
Expand Down

0 comments on commit e0702c9

Please sign in to comment.