Commit Graph

608 Commits

Author SHA1 Message Date
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
Jonathan Hale
24d88487f4 Set up build-docker-image job build docker image for tags on Circle CI (#513)
Signed-off-by: Squareys <squareys@googlemail.com>
2020-06-05 15:32:23 -07:00
Alon Zakai
d371fb6ffc 1.39.17 (#518) 2020-06-05 09:49:28 -07:00
Piotr Paczkowski (trzeci.eu)
ede26f1709 Add host network for building image (#514)
Without --network host It's impossible to build images
2020-06-04 13:02:17 -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
85cf370a74 1.39.16 (#503)
Also update precompiled lib tests, for the new cache logic.
2020-05-15 08:15:58 -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
Alon Zakai
d75a9a845f Add some docs for building from source and binary. fixes #10063 (#420) 2020-05-12 11:18:11 -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
5e996c6e69 test.py should require that the SDK be activated (#492)
It was working previously by accident because the tests were
using the defaults such as `$HOME/.emscripten`.  However usage of the
emsdk should really only happen in the emsdk environment where
EM_CONFIG dictates the config location (not just using the default).

This change is needed as precursor to making `--embedded` the default
(in this case the config doesn't live in `$HOME/.emscripten`).
2020-05-07 11:42:51 -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
Sam Clegg
99320fcf1e Support python3 in test.py (#494) 2020-05-07 08:29:42 -07:00
Alon Zakai
15ac4ffc1e 1.39.15 (#491) 2020-05-06 15:11:24 -07:00
Sam Clegg
fd269ba6b0 Add more generated files to .gitconfig (#490)
Two of these are ones that occur with --embedded users.

fastcomp-clang exists when users build fastcomp from source.
2020-05-04 15:56:08 -07:00
Sam Clegg
62914e7f66 Add script for updating node and python binaries in google storage (#486)
In both cases updating these is slightly non-trivial so encode
the process in the script.
2020-05-04 15:08:43 -07:00
Sam Clegg
e381caad2f Move test scripts into scripts directory (#485)
I'm planning on adding a some scripts for managing node and python
binaries and I don't want to clutter up the top level any more.
2020-05-04 13:40:24 -07:00
Sam Clegg
64d54b832f Add pywin32 to windows python installation (#487)
Fixes: #458
2020-05-04 11:09:32 -07:00
Alon Zakai
eeecdd02ee 1.39.14 (#484) 2020-05-01 06:38:29 -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
Alon Zakai
6dd96f1f2c 1.39.13 (#474) 2020-04-17 09:16:00 -07:00
Sam Clegg
1e62b13573 Remove reference of old clang binary. (#469)
I think this should have been part of #395.

Fixes: https://github.com/emscripten-core/emscripten/issues/10904
2020-04-16 09:30:12 -07:00
Sam Clegg
b1f867a5a3 Re-enable building master from source for linux 32-bit (#471)
Doing this for windows is trickier as we would also need to provide
the python binaries for win32.

Note that we don't provide node binaries in this case because the
node project itself doesn't produce 32-bit builds for linux anymore.
This should still be useable for 32-bit linux users although they
will need to provide their own node (or use the system provided
one).

Fixes: #470
2020-04-15 17:10:44 -07:00
Alon Zakai
c523a654c8 1.39.12 (#465) 2020-04-09 16:32:39 -07:00
Alon Zakai
a952a6fb14 Fix expected test output (#464)
Somehow CI did not run on #460
and the UI did not indicate that... weird. So
we had a typo in the text output
that was expected that went missed.
2020-04-09 16:19:00 -07:00