Skip to content

Fix parentheses mix-up in batch files in Windows #13698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aheejin merged 4 commits into from
Mar 20, 2021
Merged

Fix parentheses mix-up in batch files in Windows #13698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a66865
Fix parentheses mix-up in batch files in Windows
aheejin Mar 18, 2021
14ee985
Fix run_python_compiler.bat
aheejin Mar 18, 2021
af44b71
Merge branch 'main' into fix_windows_paren
aheejin Mar 19, 2021
fb3061c
Merge branch 'main' into fix_windows_paren
aheejin Mar 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions em++.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: To modify this file, edit `tools/run_python_compiler.bat` and then run
:: `tools/create_entry_points.py`

@setlocal
Expand All @@ -8,11 +8,12 @@
set EM_PY=python
)

@set ARGS=%*
@if "%_EMCC_CCACHE%"=="" (
:: Do regular invocation of em++.py compiler
"%EM_PY%" "%~dp0\%~n0.py" %*
"%EM_PY%" "%~dp0\%~n0.py" %ARGS:)=^)%
) else (
:: Remove the ccache env. var, invoke ccache and re-enter this script to take the above branch.
set _EMCC_CCACHE=
ccache "%~dp0\%~n0.bat" %*
ccache "%~dp0\%~n0.bat" %ARGS:)=^)%
)
7 changes: 4 additions & 3 deletions emcc.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: To modify this file, edit `tools/run_python_compiler.bat` and then run
:: `tools/create_entry_points.py`

@setlocal
Expand All @@ -8,11 +8,12 @@
set EM_PY=python
)

@set ARGS=%*
@if "%_EMCC_CCACHE%"=="" (
:: Do regular invocation of em++.py compiler
"%EM_PY%" "%~dp0\%~n0.py" %*
"%EM_PY%" "%~dp0\%~n0.py" %ARGS:)=^)%
) else (
:: Remove the ccache env. var, invoke ccache and re-enter this script to take the above branch.
set _EMCC_CCACHE=
ccache "%~dp0\%~n0.bat" %*
ccache "%~dp0\%~n0.bat" %ARGS:)=^)%
)
7 changes: 4 additions & 3 deletions tools/run_python_compiler.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:: Entry point for running python scripts on windows systems.
:: To modify this file, edit `tools/run_python.bat` and then run
:: To modify this file, edit `tools/run_python_compiler.bat` and then run
:: `tools/create_entry_points.py`

@setlocal
Expand All @@ -8,11 +8,12 @@
set EM_PY=python
)

@set ARGS=%*
@if "%_EMCC_CCACHE%"=="" (
:: Do regular invocation of em++.py compiler
"%EM_PY%" "%~dp0\%~n0.py" %*
"%EM_PY%" "%~dp0\%~n0.py" %ARGS:)=^)%
) else (
:: Remove the ccache env. var, invoke ccache and re-enter this script to take the above branch.
set _EMCC_CCACHE=
ccache "%~dp0\%~n0.bat" %*
ccache "%~dp0\%~n0.bat" %ARGS:)=^)%
)