Skip to content
Open
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ commands:
bootstrap:
description: "bootstrap"
steps:
- run: ./bootstrap
- run: "$EMSDK_PYTHON ./bootstrap.py"
pip-install:
description: "pip install"
parameters:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
# Uncomment this like to pull the rebaseline_tests.py from the
# current branch:
# git checkout - ./tools/maint/rebaseline_tests.py
./bootstrap
./bootstrap.py
if ! ./tools/maint/rebaseline_tests.py --check-only; then
echo ""
echo "Test expectations are out-of-date on the target branch."
Expand All @@ -83,7 +83,7 @@ jobs:
# since it doesn't recognise it.
git checkout ${{ github.sha }}
git rev-parse HEAD
./bootstrap
./bootstrap.py
if ! ./tools/maint/rebaseline_tests.py --check-only --clear-cache; then
echo "Test expectations are out-of-date on the PR branch."
echo "You can run './tools/maint/rebaseline_tests.py' to"
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ test/runner.bat
tools/file_packager.bat
tools/webidl_binder.bat

bootstrap.exe
em++.exe
emcc.exe
em-config.exe
Expand Down
33 changes: 0 additions & 33 deletions bootstrap

This file was deleted.

86 changes: 0 additions & 86 deletions bootstrap.bat

This file was deleted.

2 changes: 1 addition & 1 deletion bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def check_deps(name, deps):
def check():
for name, deps, _ in actions:
if not check_deps(name, deps):
utils.exit_with_error(f'emscripten setup is not complete ("{name}" is out-of-date). Run `bootstrap` to update')
utils.exit_with_error(f'emscripten setup is not complete ("{name}" is out-of-date). Run `bootstrap.py` to update')


def main(args):
Expand Down
5 changes: 0 additions & 5 deletions tools/maint/create_entry_points.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
'''.split()

entry_points = '''
bootstrap
emar
embuilder
emcmake
Expand Down Expand Up @@ -115,10 +114,6 @@ def generate_entry_points(cmd, path):
make_executable(launcher)

if do_windows:
if entry_point != 'bootstrap':
# The bootstrap.bat file is checked into source control so we
# don't want to delete it.
maybe_remove(launcher + '.bat')
maybe_remove(launcher + '.ps1')
maybe_remove(launcher + '.exe')
if use_bat_file:
Expand Down
2 changes: 1 addition & 1 deletion tools/maint/post-checkout
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

# Test for the existence of the bootstrap script itself to handle branches
# that predate its existence.
test -f ./bootstrap && exec ./bootstrap
test -f ./bootstrap.py && exec ./bootstrap.py
Loading