Skip to content

Commit dfd6162

Browse files
authored
Remove launcher scripts from git (#23761)
For a while now we have been mandating that bootstrap is run before emscripten can be used. This change removes most of the launcher scripts from git (since we can rely on bootstrap to create them). This helps clean up the top level directory. I've left emcc and em++ launchers in source control. If anyone runs these without first running bootstrap it will ask them to first run bootstrap.
1 parent 5cfdfaa commit dfd6162

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+50
-2186
lines changed

.gitignore

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,50 @@ coverage.xml
3030
# Test output
3131
/out/
3232

33-
# All the ps1 files are generated by bootstrap...
33+
# Windows ps1 launchers (created by ./tools/maint/create_entry_points.py)
3434
*.ps1
3535
# ...except the templates.
3636
!/tools/run_python.ps1
3737
!/tools/run_python_compiler.ps1
38+
39+
# Shell scripts (created by ./tools/maint/create_entry_points.py)
40+
em-config
41+
emar
42+
embuilder
43+
emcmake
44+
emconfigure
45+
emdump
46+
emdwp
47+
emmake
48+
emnm
49+
emprofile
50+
emranlib
51+
emrun
52+
emscan-deps
53+
emscons
54+
emsize
55+
emstrip
56+
emsymbolizer
57+
tools/file_packager
58+
tools/webidl_binder
59+
60+
# Windows .bat files (created by ./tools/maint/create_entry_points.py)
61+
em-config.bat
62+
emar.bat
63+
embuilder.bat
64+
emcmake.bat
65+
emconfigure.bat
66+
emdump.bat
67+
emdwp.bat
68+
emmake.bat
69+
emnm.bat
70+
emprofile.bat
71+
emranlib.bat
72+
emrun.bat
73+
emscan-deps.bat
74+
emscons.bat
75+
emsize.bat
76+
emstrip.bat
77+
emsymbolizer.bat
78+
tools/file_packager.bat
79+
tools/webidl_binder.bat

bootstrap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# To make modifications to this file, edit `tools/run_python.sh` and then run
1212
# `tools/maint/create_entry_points.py`
1313

14-
# $PYTHON -E will not ignore _PYTHON_SYSCONFIGDATA_NAME an internal
15-
# of cpython used in cross compilation via setup.py.
14+
# $PYTHON -E does not ignore _PYTHON_SYSCONFIGDATA_NAME, an internal of cpython
15+
# used in cross compilation via setup.py, so we unset it explicitly here.
1616
unset _PYTHON_SYSCONFIGDATA_NAME
1717

1818
if [ -z "$PYTHON" ]; then

cmake/Modules/Platform/Emscripten.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ endif()
6060
# Locate where the Emscripten compiler resides in relative to this toolchain file.
6161
if (NOT DEFINED EMSCRIPTEN_ROOT_PATH)
6262
get_filename_component(GUESS_EMSCRIPTEN_ROOT_PATH "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
63-
if (EXISTS "${GUESS_EMSCRIPTEN_ROOT_PATH}/emranlib")
63+
if (EXISTS "${GUESS_EMSCRIPTEN_ROOT_PATH}/emranlib.py")
6464
set(EMSCRIPTEN_ROOT_PATH "${GUESS_EMSCRIPTEN_ROOT_PATH}")
6565
else()
6666
# If not found by above search, locate using the EMSCRIPTEN environment variable.

em-config

Lines changed: 0 additions & 35 deletions
This file was deleted.

em-config.bat

Lines changed: 0 additions & 86 deletions
This file was deleted.

emar

Lines changed: 0 additions & 35 deletions
This file was deleted.

emar.bat

Lines changed: 0 additions & 86 deletions
This file was deleted.

embuilder

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)