Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 10 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ commands:
echo "-----"
echo "Running browser tests (EMTEST_BROWSER=$EMTEST_BROWSER)"
echo "-----"
test/runner << parameters.test_targets >>
test/runner.bat << parameters.test_targets >>
- upload-test-results
test-sockets-chrome:
description: "Runs emscripten sockets tests under chrome"
Expand Down Expand Up @@ -1284,14 +1284,17 @@ jobs:
- install-emsdk
- pip-install:
python: "$EMSDK_PYTHON"
- run-tests:
title: "crossplatform tests"
test_targets: "--crossplatform-only"
# run-tests depends on the ./test/runner script which is normally only
# created on UNIX systems (windows uses runner.bat)
- run: $EMSDK_PYTHON tools/maint/create_entry_points.py --all
- run:
name: "crossplatform tests"
command: test/runner.bat --crossplatform-only
- upload-test-results
# Run a single websockify-based test to ensure it works on windows.
- run-tests:
title: "sockets.test_nodejs_sockets_echo*"
test_targets: "sockets.test_nodejs_sockets_echo*"
- run:
name: "sockets.test_nodejs_sockets_echo*"
command: "test/runner.bat sockets.test_nodejs_sockets_echo*"
- upload-test-results

test-mac-arm64:
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ coverage.xml
!/tools/run_python_compiler.ps1

# Shell scripts (created by ./tools/maint/create_entry_points.py)
em++
emcc
em-config
emar
embuilder
Expand All @@ -58,10 +60,13 @@ emscons
emsize
emstrip
emsymbolizer
test/runner
tools/file_packager
tools/webidl_binder

# Windows .bat files (created by ./tools/maint/create_entry_points.py)
em++.bat
emcc.bat
em-config.bat
emar.bat
embuilder.bat
Expand All @@ -80,5 +85,6 @@ emscons.bat
emsize.bat
emstrip.bat
emsymbolizer.bat
test/runner.bat
tools/file_packager.bat
tools/webidl_binder.bat
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ See docs/process.md for more on how version tagging works.

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

5.0.1 - 02/13/26
----------------
Expand Down
38 changes: 0 additions & 38 deletions em++

This file was deleted.

95 changes: 0 additions & 95 deletions em++.bat

This file was deleted.

38 changes: 0 additions & 38 deletions emcc

This file was deleted.

95 changes: 0 additions & 95 deletions emcc.bat

This file was deleted.

26 changes: 13 additions & 13 deletions site/source/docs/building_from_source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ Building Emscripten yourself is an alternative to getting binaries using the
emsdk.

Emscripten itself is written in Python and JavaScript so it does not need to be
compiled. However, after checkout you will need to perform various steps
before it can be used (e.g. ``npm install``). The ``bootstrap`` script in the
top level of the repository takes care of running these steps and ``emcc`` will
error out if it detects that ``bootstrap`` needs to be run.

Emscripten comes with its own versions of some C/C++ system libraries which ``emcc``
builds automatically as and when needed (in the emsdk builds, these are precompiled).
You can also build them manually with the ``embuilder`` tool - see ``embuilder --help``
for more information.

In addition to the main emscripten repository you will also need to checkout
and build LLVM and Binaryen (as detailed below). After compiling these, you
will need to edit your ``.emscripten`` file to point to their corresponding
compiled. However, after checkout you will need to run the top level
``bootstrap`` script before the toolchain is usable. This create perform
various steps including ``npm install`` and the creation of compiler entry
points.

Emscripten comes with its own versions of some C/C++ system libraries which
``emcc`` builds automatically as and when needed (in the emsdk builds, these are
precompiled). You can also build them manually with the ``embuilder`` tool - see
``embuilder --help`` for more information.

In addition to the main emscripten repository you will also need to checkout and
build LLVM and Binaryen (as detailed below). After compiling these, you will
need to edit your ``.emscripten`` file to point to their corresponding
locations.

Use the ``main`` branches of each of these repositories, or check the `Packaging
Expand Down
Loading