Skip to content

Commit b40f024

Browse files
committed
Remove remaining launcher files from git. NFC
Folks who use git need to run `./bootstrap` to have these launchers created. This has been true now since #23761. However, I initially left these commonly used launchers checked in so that folks could run them and they would report the "you need to run `bootstrap` message". Now that its been 6 months we removed the launcher I think existing users should all now be aware of the `./bootstrap` script. I'm also hoping to move to `.exe` files on windows soon, and this change will help smooth the way: #24858
1 parent d9b3c38 commit b40f024

File tree

12 files changed

+38
-422
lines changed

12 files changed

+38
-422
lines changed

.circleci/config.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ commands:
503503
echo "-----"
504504
echo "Running browser tests (EMTEST_BROWSER=$EMTEST_BROWSER)"
505505
echo "-----"
506-
test/runner << parameters.test_targets >>
506+
test/runner.bat << parameters.test_targets >>
507507
- upload-test-results
508508
test-sockets-chrome:
509509
description: "Runs emscripten sockets tests under chrome"
@@ -1284,14 +1284,17 @@ jobs:
12841284
- install-emsdk
12851285
- pip-install:
12861286
python: "$EMSDK_PYTHON"
1287-
- run-tests:
1288-
title: "crossplatform tests"
1289-
test_targets: "--crossplatform-only"
1287+
# run-tests depends on the ./test/runner script which is normally only
1288+
# created on UNIX systems (windows uses runner.bat)
1289+
- run: $EMSDK_PYTHON tools/maint/create_entry_points.py --all
1290+
- run:
1291+
name: "crossplatform tests"
1292+
command: test/runner.bat --crossplatform-only
12901293
- upload-test-results
12911294
# Run a single websockify-based test to ensure it works on windows.
1292-
- run-tests:
1293-
title: "sockets.test_nodejs_sockets_echo*"
1294-
test_targets: "sockets.test_nodejs_sockets_echo*"
1295+
- run:
1296+
name: "sockets.test_nodejs_sockets_echo*"
1297+
command: "test/runner.bat sockets.test_nodejs_sockets_echo*"
12951298
- upload-test-results
12961299

12971300
test-mac-arm64:

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ coverage.xml
4040
!/tools/run_python_compiler.ps1
4141

4242
# Shell scripts (created by ./tools/maint/create_entry_points.py)
43+
em++
44+
emcc
4345
em-config
4446
emar
4547
embuilder
@@ -58,10 +60,13 @@ emscons
5860
emsize
5961
emstrip
6062
emsymbolizer
63+
test/runner
6164
tools/file_packager
6265
tools/webidl_binder
6366

6467
# Windows .bat files (created by ./tools/maint/create_entry_points.py)
68+
em++.bat
69+
emcc.bat
6570
em-config.bat
6671
emar.bat
6772
embuilder.bat
@@ -80,5 +85,6 @@ emscons.bat
8085
emsize.bat
8186
emstrip.bat
8287
emsymbolizer.bat
88+
test/runner.bat
8389
tools/file_packager.bat
8490
tools/webidl_binder.bat

ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ See docs/process.md for more on how version tagging works.
2020

2121
5.0.2 (in development)
2222
----------------------
23+
- The remaining launcher scripts (e.g. `emcc.bat`) were removed from the git
24+
reprository. These scripts are created by the `./bootstrap` script which
25+
must be run before the toolchain is usable (for folks using a git checkout of
26+
emscripten). (#26247)
2327

2428
5.0.1 - 02/13/26
2529
----------------

em++

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

em++.bat

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

emcc

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

emcc.bat

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

site/source/docs/building_from_source/index.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ Building Emscripten yourself is an alternative to getting binaries using the
88
emsdk.
99

1010
Emscripten itself is written in Python and JavaScript so it does not need to be
11-
compiled. However, after checkout you will need to perform various steps
12-
before it can be used (e.g. ``npm install``). The ``bootstrap`` script in the
13-
top level of the repository takes care of running these steps and ``emcc`` will
14-
error out if it detects that ``bootstrap`` needs to be run.
15-
16-
Emscripten comes with its own versions of some C/C++ system libraries which ``emcc``
17-
builds automatically as and when needed (in the emsdk builds, these are precompiled).
18-
You can also build them manually with the ``embuilder`` tool - see ``embuilder --help``
19-
for more information.
20-
21-
In addition to the main emscripten repository you will also need to checkout
22-
and build LLVM and Binaryen (as detailed below). After compiling these, you
23-
will need to edit your ``.emscripten`` file to point to their corresponding
11+
compiled. However, after checkout you will need to run the top level
12+
``bootstrap`` script before the toolchain is usable. This create perform
13+
various steps including ``npm install`` and the creation of compiler entry
14+
points.
15+
16+
Emscripten comes with its own versions of some C/C++ system libraries which
17+
``emcc`` builds automatically as and when needed (in the emsdk builds, these are
18+
precompiled). You can also build them manually with the ``embuilder`` tool - see
19+
``embuilder --help`` for more information.
20+
21+
In addition to the main emscripten repository you will also need to checkout and
22+
build LLVM and Binaryen (as detailed below). After compiling these, you will
23+
need to edit your ``.emscripten`` file to point to their corresponding
2424
locations.
2525

2626
Use the ``main`` branches of each of these repositories, or check the `Packaging

0 commit comments

Comments
 (0)