Commit Graph

57 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Orestis Floros
6b0d151917 Properly sort versions in "emsdk list" (#508)
Split version to integers but avoid exceptions in case there is a
non-numerical character in some version.

Comparison:
    Before   |   After
    1.39.9       1.39.16
    1.39.8       1.39.15
    1.39.7       1.39.14
    1.39.6       1.39.13
    1.39.5       1.39.12
    1.39.4       1.39.11
    1.39.3       1.39.10
    1.39.2       1.39.9
    1.39.16      1.39.8
    1.39.15      1.39.7
    1.39.14      1.39.6
    1.39.13      1.39.5
    1.39.12      1.39.4
    1.39.11      1.39.3
    1.39.10      1.39.2
    1.39.1       1.39.1
    1.39.0       1.39.0
    1.38.48      1.38.48
    1.38.47      1.38.47
    1.38.46      1.38.46
    1.38.45      1.38.45
    1.38.44      1.38.44
    1.38.43      1.38.43
    1.38.42      1.38.42
    1.38.41      1.38.41
    1.38.40      1.38.40
    1.38.39      1.38.39
    1.38.38      1.38.38
    1.38.37      1.38.37
    1.38.36      1.38.36
    1.38.35      1.38.35
    1.38.34      1.38.34
    1.38.33      1.38.33
2020-06-01 15:15:41 -07:00
Sam Clegg
858b176f68 Use embedded configuration by default (#472)
This is part of a wider plan to remove the use of the user's HOME
directory completely:
  https://github.com/emscripten-core/emscripten/issues/9543
2020-05-29 09:49:51 -07:00
Orestis Floros
855c51d36d Improve behaviour regarding "help" (#509)
Also accept -h for help. 

This is the usual behaviour of most utils that accept --help.

Also, now an empty call to ./emsdk does not print the full help, as
discussed in #509.
2020-05-28 13:25:23 -07:00
Alon Zakai
5613488e75 Properly report what is installed in "emsdk list" (#505)
This expands on #460 which added a file in each install dir
with the version, that lets us know not to re-download it. That
didn't integrate with is_installed, so it wasn't reported properly,
which this PR fixes.

With this we can remove a hack for python, as we can simply
not install anything if it's already installed (see line 1859).

Also add the "INSTALLED" indicators on the main listings in
"emsdk list".

Bug was reported in #477
2020-05-21 10:35:48 -07:00
Sam Clegg
14c0a9ec21 Update default emscripten cache directory (#501)
See: https://github.com/WebAssembly/waterfall/pull/644

For the sake of older versions of emscripten explicitly set
EM_CACHE environment variable to point to the in-tree cache
directory.
2020-05-13 16:28:49 -07:00
Sam Clegg
7e22ab8ae0 Refactor such that Tool.activated_config returns a map. NFC (#502)
Split out from #501
2020-05-13 15:43:00 -07:00
Alon Zakai
4265173445 Remove legacy builds (#500)
"Legacy" here meaning anything using only < 1.38.0, and anything
using 'nightly' mozilla builds (which have not been done for years).

This also lets us remove node 4.1.1 (but not 8.9.1).
2020-05-13 08:10:23 -07:00
Sam Clegg
f5e21de6d6 Fix for parsing existing config in --embedded mode after #495 (#498)
Ooops, I guess even the most innocent-seeming change can have
unintended consequences. Switching to embedded by default will at
least make this path more tested in the future.

Fixed #497
2020-05-08 10:45:57 -07:00
Sam Clegg
88ae40037b Make installation errors fatal (#437)
If `is_installed` doesn't return true after install than something
serious went wrong so make this into a warning.

Also, clean up couple of places to make the python code more
readable.
2020-05-07 12:51:19 -07:00
Sam Clegg
683ceadc32 Add CACHE setting to config file (for embedded users) (#495)
See https://github.com/emscripten-core/emscripten/pull/11091
2020-05-07 12:12:52 -07:00
Sam Clegg
a8263f30af Allow EMCC_BASH to force bash during construct_env (#493)
This allows `emsdk_env.sh` to work under bash for windows even in the
absence of the `MSYSTEM` environment variable (which seems to be 
the setup on circle CI.
2020-05-07 08:31:02 -07:00
juj
7016bd60ce Drop Visual Studio 2015 build support and older (#482)
* Drop Visual Studio 2015 build support and older

* Flake
2020-04-28 17:25:19 +03:00
Dan Field
009ab2c77f Avoid re-downloading files that are already downloaded (#460)
* Writes a .emsdk_version file to output directories using the name (which contains a version number and/or hash) once all installation steps have completed successfully.
* If that file exists, skip downloading/installation hooks.
2020-04-01 13:46:22 -07:00
Alon Zakai
8a35734a47 Fix precompiled library support + testing (#444)
Support multiple libraries for precompiled things, as we use a
different one for LTO, etc.
2020-03-05 10:45:46 -08:00
Diego Casorran
50df5a2983 Fix ZIP extraction on Windows. (#438)
Meant to resolve #412 (comment)
2020-02-12 14:01:50 -08:00
Sam Clegg
deaa7e4bfd Hide npm output by default (#431)
Fixes: https://github.com/emscripten-core/emscripten/issues/10291
2020-01-28 17:12:31 -08:00
Sam Clegg
ba53d20e94 Use npm ci over npm install (#433)
Fixes: https://github.com/emscripten-core/emscripten/issues/10291

Also fix issue where an old/incorrect version of node could be used
during SDK install since we were preferring activated versions of node.
2020-01-28 14:32:36 -08:00
Sam Clegg
3532fd3924 Extract install_sdk and install_tool from install. NFC (#432)
This change simply splits this function into its two logical parts.
2020-01-28 10:36:16 -08:00
Sam Clegg
997b0a19ff Pass --no-audit to npm install (#426)
Fixes https://github.com/emscripten-core/emscripten/issues/10246
2020-01-21 09:22:15 -08:00
Sam Clegg
3631f0aac3 Remove use of incoming branches (#423)
See https://github.com/emscripten-core/emscripten/issues/10067
2020-01-14 13:59:15 -08:00
juj
d30ba160ed Add npm install step as post-build to Emscripten (#404)
* Add npm install step as post-build to Emscripten

* Address review

* Run npm install on releases-upstream and releases-fastcomp

* Fix node path

* Add node to PATH

* Only install production packages with npm

* Address review
2020-01-10 22:11:38 +02:00
Ron Wright
98ad15a3d7 Fix issue with Windows paths under MinGW versions of Python (#419) 2020-01-07 12:11:29 +02:00
juj
b7cde08f6c Remove old workaround that was there to restore %SystemRoot% in PATH on Windows systems that were affected by #4121. (#416) 2019-12-19 20:30:02 +02:00
juj
f72c6e9dec Add support for building with Visual Studio 2019 (#415) 2019-12-19 20:29:21 +02:00
juj
2546d5ab51 Build wasm master (#401)
* Build wasm upstream

* Fix lld build for wasm-ld. Add note about compiler-rt not working.

* Address review

* Address review

* Address review

* Address review

* If targeting fastcomp Clang, apply EMCC_WASM_BACKEND=0 so that previous leftover environment with EMCC_WASM_BACKEND=1 will not cause a conflict

* Add docs about setting up Emscripten
2019-12-16 23:59:15 +02:00
Sam Clegg
322c7aa727 Don't force re-download of all archives during install (#411)
Only do this for the new `emscripten-releases`.   These all install
the the same directory so we can't use the presence of the directory
to know if we have already installed them.
2019-12-11 16:55:06 -06:00
Sam Clegg
3c548d39f2 Clobber target directory before extracting SDK tools (#410)
With emscripten-releases all the SDKs install the same directory so
this is particularly important for them.
2019-12-11 15:15:45 -06:00
juj
cf90c72aba Do not attempt to reinstall python if it already exists (#394)
* Do not attempt to reinstall python if it already exists, since that python may be interpreting the current emsdk.py script that is being executed to do the installation.

* Add TODO comment about refactoring install scheme
2019-12-05 17:59:21 +02:00
juj
5b75fb38da Remove unused EMSDK_DEV option. (#393) 2019-11-25 19:56:28 +02:00
Sam Clegg
ae5044e779 Switch default backend from 'fastcomp' to 'upstream' (#373)
When users as for 'latest' or just '1.39.0' we now default to the
upstream llvm backend.

For versions before 1.39.0 we continue to default to fastcomp.

Fixes: https://github.com/emscripten-core/emscripten/issues/5488
2019-10-21 14:23:29 -07:00
Alon Zakai
6ac51b4275 Show a clear error when a tool is only 64-bit but the platform is 32. (#378) 2019-10-18 12:58:53 -07:00
Alon Zakai
e375d247f2 Strip the tot value. (#375)
Opening it and saving it in an editor can add a newline, and we have user
reports of this happening for users.

Fixes emscripten-core/emscripten#9651
2019-10-17 15:26:22 -07:00
Alon Zakai
7f9af7bd1a 1.38.48 (#371) 2019-10-11 09:13:44 -07:00
Nikolaos S. Papaspyrou
27d6233c80 Add support for constructing a t?csh environment (#370) 2019-10-10 14:55:27 -07:00
Sam Clegg
cf01b11c4e Fix for default NODE_JS in config file (#369)
This was broken in #362
2019-10-09 11:33:15 -07:00
Sam Clegg
6ab7f5829a Cleanup emsdk.py (#362)
- Remove some unneeded use of `global` keyword
- Use OrderedDict
- Add exit_with_error helper
- Remove SPIDERMONKY_ENGINE from emscripten config
2019-10-07 17:02:15 -07:00