Commit Graph

132 Commits

Author SHA1 Message Date
Sam Clegg
573278be09 Switch to python3 when installing python on windows installs. (#349) 2020-02-04 17:03:20 -08:00
Brion Vibber
ff44c97ffa Re-add binaryen dep to upstream-master SDK builds (#435)
This should ensure that BINARYEN_PATH is added to the resulting
~/.emscripten file when building from source:

https://github.com/emscripten-core/emsdk/issues/434
2020-01-30 09:44:35 -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
juj
a0d34f6a61 Add upstream-incoming SDK targets for macOS and Linux as well (#413) 2019-12-17 21:52:41 +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
juj
e10be710da Rename old fastcomp-based tools to a specific fastcomp- prefixed name (#400)
* Rename old fastcomp-based tools to a specific fastcomp- prefixed name to clearly distinguish legacy toolchain

* Update test.py
2019-12-12 09:15:26 +02:00
juj
12f1824ffb Remove Tools and SDKs that do no longer work after migration from Mozilla to Google hosting. (#395) 2019-12-03 09:20:05 +02:00
Sam Clegg
e047fe4c1e Add python and java to 'releases-upstream' for windows (#376)
These are part of `releases-fastcomp` but for some reason are not
included in the upstream equivalent.  I imagine they were simply
overlooked.
2019-10-18 14:08:39 -07:00
Sam Clegg
efc64876db Update node version to 12.9.1 (#348)
Turns out 10.16.3 has issues running some emscripten tests due to a
v8 bug: https://bugs.chromium.org/p/v8/issues/detail?id=8347.
2019-09-03 12:16:46 -07:00
Sam Clegg
2dd05dca80 reland: Update default node version to 10.16.3 (#341)
Original change that got reverted: #331

See https://github.com/emscripten-core/emscripten/issues/9332
2019-08-30 12:46:41 -07:00
Sam Clegg
f285fdbb0c Revert "Update default node version to 10.16.3 (#331)" (#339)
Apparently this broke on mac: #337
2019-08-28 16:16:01 -07:00
Alon Zakai
7179fac39b Set EMSCRIPTEN_ROOT in releases builds (#333)
Without setting this, if a non-releases build was previously activated, it will keep affecting EMSCRIPTEN_ROOT in the emitted config file.

Helps with #326
2019-08-28 11:20:14 -07:00
Sam Clegg
7bc47b7232 Update default node version to 10.16.3 (#331)
See https://github.com/emscripten-core/emscripten/issues/9332
2019-08-27 13:02:02 -07:00
Sam Clegg
5dd09e4893 Convert emsdk_manifest.json to unix line endings (#330) 2019-08-27 11:47:57 -07:00
Brion Vibber
2b568055af Basic ARM and Aarch64 support for emsdk (#277)
This adds an "arch" field to various structures, so ARM and Aarch64
Linux can download appropriate versions of node and in theory
other tools, without trying to download x86 builds.

Since there are no prebuilt packages for clang and binaryen on ARM
or Aarch64 this will require building them, which can take a long
time, but works once installed.

Node 4.1.1 and 8.9.1 entries for ARM (armv7l) and aarch64 are
added, and the various x86/x86_64-only things are marked as such
to be filtered out on ARM machines.

Other downloads work as long as they don't have an arch specified,
which indicates they're expected to be arch-independent.

Does not yet fully work on ARM64 Windows (but works in WSL as the
Linux support is fine).
2019-08-02 15:14:11 -07:00
Alon Zakai
f1998bb124 Use the bundled optimizer[.exe], which the releases builds contain already (#289) 2019-06-25 18:02:50 -07:00
Alon Zakai
3e6d8b395f Use prebuilt cache contents (#282)
See WebAssembly/waterfall#542

The builds now contain lib/wasm-obj/ or lib/asmjs/ which have some cache contents. This places those in the cache so the user doesn't need to build them on first run, which for libc at least can be quite slow.

The mechanism here is to run emcc a first time in the emsdk. That clears the cache (since the emsdk just updated the .emscripten file). We can then safely place the files in the cache.

Note that FROZEN_CACHE is not used, since we do want to leave the user the option to build other things to the cache - we'll never ship all possible system and ports builds in the emsdk downloads, probably.

This contains a test, which passes on tot-upstream. The last tagged release doesn't have this yet.
2019-06-25 12:41:28 -07:00
Alon Zakai
077a8b2b97 emsdk list fixes (#257)
List the recommended downloads (latest, latest-upstream) first, and with version and hash. Then list precompiled things, then list build-from-source things.

Remove old upstream-clang build from source, which has been incorrect since llvm switched to a monorepo anyhow. If we want the emsdk to support source builds of llvm, we'll need to fix that - however, as we can use plain upstream llvm anyhow, that shouldn't be hard for developers to build themselves (and normal users will get a precompiled version anyhow).

Remove the option to build fastcomp from source with wasm backend support, as it is horribly old there.

Noticed these issues in emscripten-core/emscripten#8728
2019-06-05 06:25:03 -07:00
Alon Zakai
515f46fae8 Change default emsdk download location to emscripten-releases/deps (#254)
Instead of from mozilla S3.

This should make the core python, java, node downloads work, as we have mirrored them to the new location. I think that should be everything - if we missed something, we will get an error, and so know we need to fix something.

(The non-deps downloads still use a full url to emscripten-releases in the manifest, which is not changed here.)

Also change the download location for old llvm builds to emscripten-releases/old/
2019-05-30 14:22:07 -07:00
Alon Zakai
963d839afa Bundle java and python for emscripten-releases on windows, which matches the old behavior (#253) 2019-05-30 09:05:38 -07:00
Alon Zakai
76a5ae0b82 If an archive has not been downloaded, download it and assume its contents are new (#248)
This allows us to always unpack our builds into upstream/ or fastcomp/, instead of creating a new directory each time. Since without this, we'd get told to download a new file, and the emsdk would see that where it would be unpacked had contents, and assumed that even though it wasn't downloaded it must be the same. So we'd silently skip it.

It's useful to always unpack into the same dir since it's easier for people that create their own .emscripten file (the location of emscripten etc. is all fixed under the emsdk), and also it avoids directories accumulating, which each take hundreds of megabytes, so over time it can get burdensome.
2019-05-28 15:57:04 -07:00
Alon Zakai
7b8322f45e Remove waterfall integration (#246)
We can remove this now that we have emscripten-releases working and use it everywhere we used the emsdk's waterfall integration.

In particular this should fix the current lkgr.json errors people are seeing (by removing all the lkgr stuff), which I believe started when I refactored that code while doing the releases work - I must have gotten something wrong on non-linux OSes. But anyhow, easier to remove that unnecessary code than fix it at this point.
2019-05-24 14:04:43 -07:00
Alon Zakai
de1134d8de Add emscripten-releases support for release tags (#243)
* Structures emscripten-releases-tags.txt to mention the latest release, and then a list of all previous releases.
* Adds a new release for 1.38.33.
* If the manifest has emscripten_releases_hash, then we write out emscripten-version.txt with the proper version. We start with the hash, and check if there is a released version for it, if so we emit that, otherwise we emit the hash.
* Windows zipfile fix.
2019-05-23 17:08:23 -07:00
Alon Zakai
e2434062a8 Prepare for emscripten-releases (#237)
Updated to our current initial plan here:

* Add emscripten-releases-tags.txt which is a JSON file with a map of tag name to git hash in the emscripten-releases repo. Right now this file is just checked in here; in the future we may make the emsdk update it from git tags with update-tags etc.
* That file contains a "latest" tag, which is fetched for when getting latest-releases-[upstream|fastcomp]. We may want that to eventually be updated based on the latest green stuff on the bots perhaps.
* Rename the current sdk-[upstream|fastcomp]-* etc. to sdk-waterfall-[upstream\|fastcomp]-*. Then we'll have sdk-releases-[upstream|fastcomp]-* etc. This is just an internal name change - emsdk install latest-upstream still works as before, and still uses the waterfall (so we don't break our github CI).
* Add support for emsdk install latest-releases-[upstream\|fastcomp]
* Add a test using the actual emscripten-releases builds
2019-05-22 17:23:04 -07:00
juj
4eeff61368 Add SDK definitions for upstream wasm backend enabled LLVM, "sdk-wasm-master-32/64bit". (#213) 2019-05-06 11:52:13 +03:00
Alon Zakai
e5844d746e Add the lkgr as a prefix to upstream downloads (#223)
Without this, we would not download new versions, as the filename looked the same ("already downloaded"). We'd unzip those old contents to a directory with the new name, giving the impression we updated when we didn't :(
2019-02-25 17:18:58 -08:00
Alon Zakai
38dcc11b1d Re-land #200 : waterfall fastcomp support (#204)
(This was reverted by mistake. It had a bad commit message though, so relanding with a nicer one is nice anyhow.)

With this, we can do emsdk install latest-fastcomp and it installs fastcomp from the waterfall. That is, we then have 3 main sdks people might want to use:

* latest which installs fastcomp-llvm (plus emscripten etc.) from the mozilla infrastructure. (fetches the last emscripten version there)
* latest-upstream which installs upstream-llvm (plus emscripten etc.) from the waterfall infrastructure. (fetches the last known good revision (lkgr) there)
* latest-fastcomp which installs fastcomp-llvm (plus emscripten etc.) from the waterfall infrastructure. (fetches the last known good revision (lkgr) there)

The first and last are currently somewhat overlapping in that both fetch a build of fastcomp. However, as we transition away from the mozilla infrastructure, we could just make latest an alias for latest-fastcomp. (And later, when we're ready to switch to the wasm backend by default, the alias could switch to latest-upstream.)
2019-01-08 13:46:53 -08:00
Alon Zakai
b0fda89ec2 Revert "Add 'latest-fastcomp' sdk (#200)" (#202)
This reverts commit b4de632f3f.

This caused the ec2 mozilla builders to fail due to bundling lkgr.json. Reverting til we figure it out.
2019-01-08 13:28:17 -08:00
Alon Zakai
b4de632f3f Add 'latest-fastcomp' sdk (#200)
* add a 'fastcomp' sdk, which provides fastcomp from the waterfall

* fix

* fix

* fix?

* fix

* fix

* fix

* logging

* fix?

* cleanup
2019-01-08 12:37:39 +02:00
Alon Zakai
889c1516fb Enable "emsdk [install|activate] latest-upstream" (#195)
This makes it possible to tell the emsdk to get "latest-upstream", which fetches the latest lkgr from there. This will probably be a common use pattern, I expect we may want to recommend users start trying out the wasm backend that way soon. This will also let us simplify this code: https://github.com/kripken/emscripten/blob/incoming/.circleci/config.yml#L334

Aside from adding the "latest-upstream" alias, this PR has

* A few minor cleanups in the emsdk code.
( Minor restructuring of how we define the upstream stuff in the manifest: It seemed odd to have 3 things (clang, emscripten, binaryen) that are all coming from a single archive from the waterfall. Simpler to have just one - the archive is one big lump, there's no way to download just part of it.
* Also add node 8.9.1 as a dependency of the upstream sdk, which makes things usable out of the box (node.js is the one thing not provided by the waterfall archive).
2018-12-20 09:58:37 -08:00
juj
857f418f9f Merge pull request #164 from jgravelle-google/waterfall_lkgr
Add upstream waterfall tools and sdk
2018-07-25 19:10:34 +03:00
Jacob Gravelle
e7a7828def Move waterfall-lkgr sdk to not be chosen by 'install latest' 2018-07-23 13:52:14 -07:00
Jukka Jylänki
df9957f0dc Also add EMSCRIPTEN_NATIVE_OPTIMIZER environment variable. 2018-07-19 12:37:34 +03:00
Jukka Jylänki
c0e0f2ddd7 Also add EMSDK_NODE environment variable. 2018-07-19 12:30:50 +03:00
Jukka Jylänki
f4f4dbdbf7 Also add EMSDK_PYTHON environment variable to point to the python.exe interpreter that is activated with Emsdk. 2018-07-19 12:27:24 +03:00
Jukka Jylänki
17f50b0e95 Add LLVM_ROOT environment variable when a Clang tool is activated. 2018-07-19 12:19:20 +03:00
Jacob Gravelle
f221912051 Move upstream- prefix from tool id to version 2018-07-18 09:42:25 -07:00
Jacob Gravelle
c475b565ad Add upstream waterfall tools and sdk 2018-07-18 09:27:20 -07:00
Jacob Gravelle
8512c60588 There is no binaryen-incoming, point incoming sdks at binaryen-master (#150) 2018-06-22 09:38:41 -07:00
juj
b6dbf740a6 Merge pull request #146 from jgravelle-google/upstream_llvm
Support for building upstream LLVM from source
2018-06-22 08:00:43 +03:00
Jacob Gravelle
3310027d35 Use only_supports_wasm flag instead of separate install script 2018-06-20 09:07:48 -07:00
Jacob Gravelle
e54a0dc5ae Fix 32-bit lld_url 2018-06-20 08:42:22 -07:00
Jacob Gravelle
16125272b2 Support for building upstream LLVM from source 2018-05-30 16:41:59 -07:00
Jacob Gravelle
5676ccaca4 Build binaryen from source when building tagged sdk versions from source 2018-05-15 15:49:18 -07:00
Jukka Jylänki
4c8ea1b10b Update to WinPython 2.7.13.1 and add new packages for WinPython 3.5.4 as well. (only used if explicitly installed) 2018-02-26 19:53:20 +02:00
Jukka Jylänki
cea44f475a Default to building Release instead of RelWithDebInfo. Closes https://github.com/kripken/emscripten/issues/6016. 2018-01-03 13:52:01 +02:00
Kagami Sascha Rosylight
3c422db225 use node 8 for precompiled builds 2017-12-22 22:01:10 +09:00
Jukka Jylänki
d3a5609c5f Make node.js directory structure universal across Windows, Linux and macOS 2017-11-23 17:26:59 +02:00
Jukka Jylänki
9026335bcd Migrate incoming and new tags to use node.js 8.9.1 LTS 2017-11-23 16:45:20 +02:00