Commit Graph

638 Commits

Author SHA1 Message Date
Bob Tolbert
c1f0ad9fcd Fix emsdk_env.sh for multiple shells (#594)
This change allows sourcing emsdk_env.sh from bash, zsh and
ksh.

The script works out the true location of the emsdk directory,
even if it is a symlink or the script itself is a symlink.

Added a test in scripts/test_source_env.sh to try sourcing via
all the shells and with various paths.

Co-authored-by: Bob Tolbert <bob@tolbert.org>
2020-08-22 11:31:16 -07:00
Alon Zakai
721ef8f476 2.0.1 (#596)
Also fix the test - we can't activate fastcomp and call upstream's emcc to
even clear the cache, as it disallows fastcomp's LLVM.
2020-08-21 12:56:57 -07:00
Alon Zakai
6adb624e04 Error on trying to get latest-fastcomp (#590)
I think this is less surprising than continuing to support latest-fastcomp
with the last fastcomp release. That's technically correct - the last release
is 1.40.1, and always will be - but when a user asks for "latest" I think they
want something up to date. Instead, give a clear error that indicates how
they can get an actually up to date build, by using upstream.
2020-08-11 15:10:43 -07:00
Sam Clegg
ff8a62a3fb Pre-bundle requests module with macOS bundles python (#589)
The problem is that python can have trouble finding the default
certifcate set on macOS.  The actual bundle is installed by the certifi
package which the requests module uses under the hood.

Fixes: #588
2020-08-11 11:51:47 -07:00
Sam Clegg
839c108479 2.0.0! (#586) 2020-08-10 17:12:56 -07:00
Sam Clegg
1e5c650388 Log warnings to stderr (#585)
Its particularly important during `construct_env` where stdout
is directly interpreted by the shell.

See: #385
2020-08-07 11:26:32 -07:00
Alon Zakai
16d4ec5489 Disallow fastcomp in tot and 2.0.0+ (#584) 2020-08-07 09:06:46 -07:00
Sam Clegg
60e3a51c7b Split out expand_sdk_name function. NFC. (#580) 2020-08-05 10:03:41 -07:00
Alon Zakai
e88a3c5bbf 1.40.1 (#579) 2020-08-01 07:45:21 -07:00
Sam Clegg
147abfe46c Make emscripten directory world writable (#578)
Without this emscripten will default to using $HOME for the
emscripten cache rather than the embedded one.
2020-07-31 13:41:13 -07:00
Alon Zakai
1dc9fde175 1.40.0 (#577) 2020-07-30 09:34:46 -07:00
Wouter van Oortmerssen
e3b08413c9 [powershell] fix emsdk.ps1 assuming emsdk_set_env.ps1 lives in the current dir (#576)
This makes it fail when run from a project directory.
Thansks @sbc100 for finding the problem :)
2020-07-29 13:18:23 -07:00
Sam Clegg
6dac5ae712 Fail update-tags if not tot revision is found (#574) 2020-07-27 15:32:06 -07:00
Kleis Auke Wolthuizen
de08462b17 Cleanup Dockerfile. NFC. (#569)
- Remove unnecessary dependencies from build stage.
- Move binutils installation to first layer.
- Adjust indents and spacing.
- Merge ENV declarations into a single line.
- Split apt-get commands over multiple lines
2020-07-25 11:04:20 -07:00
Kleis Auke Wolthuizen
b5077e4642 Fix sanity file location within Dockerfile (#568)
Starting from 1.39.20 the .emscripten_sanity file has
been moved to upstream/emscripten/cache/sanity.txt.
2020-07-23 12:49:48 -07:00
Sam Clegg
56f5a2bcc5 Cleanup emsdk.bat launcher (#566)
TIL a couple of things about bat files. God help me.

- Use a single @echo off at the top rather than @ on every line
- Use lowercase names for builtin operation
- Use setlocal/endlocal rather than reseting EM_PYTHON at the end
2020-07-22 14:06:08 -07:00
Sam Clegg
9b405d313a Add new python version of known versions in emsdk.bat (#565) 2020-07-21 21:29:12 -07:00
Sam Clegg
4d4ae34365 Improve activation message (#562)
* Improve activation message

The activation message is now IMHO more informative and
actionable:

```
$ emsdk activate latest
Setting the following tools as active:
   node-12.18.1-64bit
   releases-upstream-e7e39da9c81faecd9ecf44065cee864d76e4e34d-64bit

Next steps:
- To conveniently access emsdk tools from the command line,
  consider adding the following directories to your PATH:
    $HOME/wasm/emsdk
    $HOME/wasm/emsdk/node/12.18.1_64bit/bin
    $HOME/wasm/emsdk/upstream/emscripten
- This can be done for the current shell by running:
    source "$HOME/wasm/emsdk/emsdk_env.sh"
- Configure emsdk in your bash profile by running:
    echo 'source "$HOME/wasm/emsdk/emsdk_env.sh"' >> $HOME/.bash_profile
```

* .
2020-07-21 18:04:31 -07:00
Sam Clegg
0e5f2d8e11 Rename osx -> macos (#563) 2020-07-21 12:26:30 -07:00
Sam Clegg
4aa028017c Use bundled/embedded python3 binary on OSX (#561)
See https://github.com/emscripten-core/emscripten/issues/7198
2020-07-21 10:21:02 -07:00
Sam Clegg
d8984b2a9d Rename build_llvm_monorepo to just build_llvm. NFC. (#560)
And build_llvm_fastcomp to just build_fastcomp (matches its name
in the json file.
2020-07-20 17:33:54 -07:00
Alon Zakai
3249417955 1.39.20 (#556) 2020-07-20 15:36:09 -07:00
Sam Clegg
b504f0ba3a Cleanup legacy 'copy_pregenerated_cache' handling. NFC. (#558) 2020-07-20 14:47:25 -07:00
Sam Clegg
9d1b5b6d7d Cleanup and unify code for removing files. (#557) 2020-07-20 14:25:09 -07:00
Sam Clegg
3e9f04d467 Remove support for non-embedded mode (#510)
embedded mode as been the default since #472 and I included
`--no-embedded` as an option during the interim time, but to simply
the code and avoid have two modes of operation I think its safe
to now remove the non-embedded mode.
2020-07-20 13:39:21 -07:00
Sam Clegg
dec8a63594 Remove emsdk_set_ene.bat from .gitignore (#550)
This file should only ever exist momentarily.  Its written during
`emsdk construct_env` on windows, but emsdk.bat immediately uses
at deletes it before returning.

Having this file remain around on disk would be a bug so we shouldn't
ignore its presense.
2020-07-15 11:39:24 -07:00
Sam Clegg
e5f63be5a4 Update location emsdk_set_env.bat in emsdk.bat (#553)
The location of this file is now fixed to living inside the
emsdk directory, not the current working directory.
2020-07-14 17:32:47 -07:00
Sam Clegg
d4383f4767 Fix docker build to not depend on emsdk_set_env.sh (#554)
This was an internal script that we used to generate up
until #544.   Now we avoid writing that file at all and
emsdk_env.sh is instead sourced directly.

This should fix the docker CI issues we have been having.
2020-07-14 16:22:16 -07:00
Sam Clegg
96ba7f6a73 Remove bash-ism from emsdk_env.sh (#552)
This is a because its not possible to determine the location
of as script that is currently being sources under a POSIX shell
such as dash (the default ubuntu shell).  Only bash has this
special BASH_SCRIPT variable.
2020-07-14 15:58:42 -07:00
Brion Vibber
9f63f10ab6 Fix fatal exception in "emsdk list" on unsupported platforms (#549)
On platforms with no supported binary SDKs to download, find_sdk
can return None which caused a check in the "list" command to fail.
Checking for the return value before making method calls fixes this,
and allows Linux/ARM64 to run "emsdk list" and then build an SDK
from source.

Fixes https://github.com/emscripten-core/emsdk/issues/548
2020-07-11 20:44:40 -07:00
Walt
c494899c17 Change EMSDK_SET_ENV to output correct filename for powershell. (#546)
Rename write_set_env_bat to write_set_env_script.
2020-07-11 07:38:17 -07:00
Sam Clegg
d37abed2de Avoid writing to file in emsdk_env.csh / emsdk_env.sh (#544)
This is an alternative fix for
https://github.com/emscripten-core/emscripten/issues/9090 which recently
came up again after #539.

Tested with bash, tcsh and fish.
2020-07-10 17:49:16 -07:00
Alon Zakai
833dfddcdc 1.39.19 (#542) 2020-07-07 10:04:10 -07:00
Sam Clegg
4f2daec074 Fix running emsdk_env.sh outside of emsdk directory (#541)
Fixes: #540
2020-07-07 09:03:43 -07:00
Sam Clegg
819e95cd99 Cleanup emsdk_env scripts (#539)
Remove the optional argument to contruct_env.  It simple if we
always construct the env in the same place.  Avoid using temp files,
and avoid changing directory.
2020-07-06 16:34:02 -07:00
태재영
92d512faa8 docs: change message when running emsdk_env.sh (#537) 2020-07-01 21:37:54 -07:00
Piotr Paczkowski (trzeci.eu)
7f77b615c2 Add standard workdir for Dockerimage (#534)
As requested by @curiousdannii in https://github.com/trzecieu/emscripten-docker/issues/58#issuecomment-648760800
2020-06-27 01:51:21 +02:00
Sam Clegg
eff1d2e2f1 Drop "-upstream" suffix from docker image name (#530) 2020-06-24 16:55:32 -07:00
Sam Clegg
47c669a002 Update node directory in Dockerfile (#532) 2020-06-24 15:12:58 -07:00
Derek Schuff
c08015164e Update nodejs to v12.18.1 (#529)
It includes an update to v8 7.8
2020-06-24 10:41:47 -07:00
Sam Clegg
dc74092927 Revert testing changes 2020-06-23 20:35:53 -07:00
Sam Clegg
618fcf36ee More circleci testing 2020-06-23 19:06:58 -07:00
Sam Clegg
8e5b6d8986 More circleci testing (sorry) 2020-06-23 18:56:39 -07:00
Sam Clegg
25416b8ff7 Testing circleci auto-publish of docker image (#531) 2020-06-23 18:50:16 -07:00
Sam Clegg
38a270fa5c Minor python cleanups. NFC. (#496) 2020-06-23 18:00:22 -07:00
Sam Clegg
8dd51b45e9 Remove unused permanent in construct_env (#525)
This was only ever set to true if the user knew to pass an
undocumented extra argument called "perm".
2020-06-23 17:59:46 -07:00
Sam Clegg
d50b1d86f6 Simplify docker image in several ways (#523)
- `--embeddded` mode is the now the default
- embedded cache and ports is also the default
- emsdk now fully polulates the cache by default so no need to do that.
- always "activate" the SDK avoiding that need things to work without
  that.
- avoid making extra symlinks.
- remove python2
2020-06-22 17:19:12 -07:00
Sam Clegg
7241082595 Build docker image as part of CI (#527)
We only publish on tag, but we want to build and test the image
on all PRs.
2020-06-22 16:09:09 -07:00
Alon Zakai
27b23d467d 1.39.18 (#521) 2020-06-12 10:59:52 -07:00
Piotr Paczkowski (trzeci.eu)
01589e7afd Updated tagging schema for docker images (#519) 2020-06-09 08:36:37 -07:00