Commit Graph

457 Commits

Author SHA1 Message Date
Alon Zakai
dffb280b35 Use check_output in test.py (#280) 2019-06-17 17:11:36 -07:00
Alon Zakai
87285f5e8f 1.38.36 ; Check if all downloads exist for the latest version (#278)
This verifies all builders successfully uploaded builds for a new version that we tag here.

This prevents a problem like happend on 1.38.35, where the mac and windows bots "skipped" the hash that we tagged - they built the one before, and I guess were too slow, so they skipped to the next commit after it? Which is expected I guess, but surprises me a little. Anyhow, with this fix we should avoid such problems in the future.

Tags 1.38.36 to verify things work and get people a working version.

Also check some other basic things: check the version built reports the right one in emcc -v, and that multiple emsdk updates still work.
2019-06-15 12:00:54 -07:00
Alon Zakai
9c22ea9e78 Emscripten 1.38.35 (#276)
This brings in the libtinfo changes. As a result this may fix breakage for some linux users, at the cost of some linux users possibly losing colors in the console (since sometimes that doesn't work with libtinfo not linked in).
2019-06-14 17:54:26 -07:00
Piotr Paczkowski (trzeci.eu)
29b91e38e0 python_selector checks if found python command is valid (#275)
Addresses emscripten-core/emscripten#8792

I've found what's the reason of the strange behaviour of last changes (#273).

In order to reproduce this problem it's needed:

    To don't have python3 installed in system
    To have pyenv with installed at least one version from each family, like:

pyenv install 3.7.0
pyenv install 2.7.15

    To activate a version from python2

pyenv local 2.7.15

Then we have a strange situation that python3 is available as a command, but it's just a mock for pyenv:

➜ pyenv versions
  system
* 2.7.15 (set by /home/trzeci/Projects/emsdk/.python-version)
  3.7.0

➜ which python3
~/.pyenv/shims/python3

➜ python3 --version
pyenv: python3: command not found

The `python3' command exists in these Python versions:
  3.7.0

➜ ./emsdk --help        
pyenv: python3: command not found

The `python3' command exists in these Python versions:
  3.7.0

As you see in an example above I didn't even call emsdk script, just tried to execute python3 --version and I've got exactly the same error. The problem of pyenv is that even if python3 isn't active it's available in the system PATH.
Calling ./emsdk --help get's the same error, as python3 was used.

At the moment this entirely breaks logic in python_selector and in pyenv working command is indistinguishable from stub python command.

@kripken: A couple of ways to go from here:

    revert logic of python_selector and advertise mac users to use python3
    keep logic and advertise pyenv users to use python3
    This PR: extend logic of python_selector by checking if found python command is valid (for the instance by calling python --version), this will filter out false positive matches that coming from pyenv

After patch:

➜ pyenv versions        
  system
* 2.7.15 (set by /home/trzeci/Projects/emsdk/.python-version)
  3.7.0

➜ which python3 
~/.pyenv/shims/python3

➜ python3 --version
pyenv: python3: command not found

The `python3' command exists in these Python versions:
  3.7.0


➜ ./emsdk --help
 emsdk: Available commands:

   emsdk list [--old] [--uses]  - Lists all available SDKs and tools and their
                                  current installation status. With the --old
   ....

As you can see python3 --version command fails as it was, but that's expected behaviour. What's important is that ./emsdk --help gets executed as python_selector recognizes a stub.
2019-06-13 15:47:29 -07:00
Piotr Paczkowski (trzeci.eu)
a61a528e48 Default Python 3 for running emsdk (#273)
* Default Python 3 for running emsdk

On macOS it's pretty common to hit a problem
```
Error downloading URL 'https://github.com/kripken/emscripten/archive/1.38.25.tar.gz': <urlopen error [SSL: TLSV1_ALERT_PROTOCOL_VERSION] tlsv1 alert protocol version (_ssl.c:590)>
```
When an installation is started. I.e. `./emsdk install sdk-1.38.25-64bit` - this is caused in majority of cases by some problem of openssl and python2 - (some other https downloads work just fine, not sure why GitHub is special)

So this Pull Request will default Python to Python 3, for running `emsdk`. It does so by making ./emsdk executable in python, bash, and sh. In bash and sh it will run a python executor script, which picks the best python it can find, preferring python3 on non-windows.
2019-06-12 15:55:29 -07:00
Alon Zakai
c0e1167aad fix ./emsdk update of a *non*-git install (#271)
The non-git case was not well documented and not tested, and it was broken since we switched the build infrastructure.

In the git case, an update is to do a git pull. In the non-git case, it downloads a zip and unpacks it. The old build infra apparently had builds created for this; instead, I made it download it directly from github. Perhaps we should consider creating builds for this as well eventually?

Also add a test for this, so we never break it again.
2019-06-10 16:38:54 -07:00
Alon Zakai
fc0ed1e17c Remove obsolete docs on README (#270)
A bunch of info there is out of date.

Instead, let the link to the install instructions on the main site (which was there already on line 11 higher up) speak for itself; we should have just one central location for these basic instructions.
2019-06-10 10:10:06 -07:00
Alon Zakai
169a3ac27c Error on downloading a 64-bit package on a non-64-bit OS (#265)
Also fix the can_be_installed which was always broken it seems - it returns True for success or a string for error, but didn't check if the output is True.

Includes a test, which hacks up emsdk to make it think it's on 32-bit, and verifies the error and message.
2019-06-06 09:04:05 -07:00
Alon Zakai
bab28f9a71 list emscripten-releases versions in ./emsdk list (#268)
The output now looks like

===
The *recommended* precompiled SDK download is 1.38.34 (048cf9424790cc525a7ea6da340820aae226f3b9).

To install/activate it, use one of:
         latest                  [default (fastcomp) backend]
         latest-upstream         [upstream LLVM wasm backend]

Those are equivalent to installing/activating the following:
         1.38.34
         1.38.34-upstream

All recent (non-legacy) installable versions are:
         1.38.34
         1.38.34-upstream
         1.38.33
         1.38.33-upstream
===

and after that is the detailed output with the older builds etc.
2019-06-05 19:27:34 -07:00
Alon Zakai
fef3dacae0 support sdk-tag-X.Y.Z-64bit (we supported it without -tag-, but that did work before) (#267) 2019-06-05 14:31:44 -07:00
Alon Zakai
5da4a1ae99 Move testing into a bash file on the side (#266) 2019-06-05 10:19:20 -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
1d3522678c Refactor test code into python (#264)
Keep the basic workflow test (checking what a user would do to get started) in bash, but otherwise it's more convenient for most tests to be in python.
2019-06-04 16:01:25 -07:00
Alon Zakai
a382d620e5 Stop fetching emscripten and binaryen tags the old way (#262)
We now have versioning directly here in this repo for emscripten-releases. This PR makes us stop looking for tags the old way, which looked on github for tags.

Rename the files legacy-*.
2019-06-04 10:16:02 -07:00
Alon Zakai
188c3edb9b Tag 1.38.34 (#258)
This should fix some version warnings people are currently seeing - we removed the fastcomp version warnings between repos check after the last version, in emscripten-core/emscripten#8664, #259
2019-06-02 09:11:46 -07:00
Alon Zakai
454bf4a7bb update repo name (#255) 2019-05-30 16:58:36 -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
0490c5f7aa Support getting specific releases from emscripten-releases, by their version (#251)
This makes

emsdk install 1.38.33

work (1.38.33 is from the new builders).

Also works with the old notation, sdk-1.38.33-64bit, and also supports -(upstream|fastcomp).
2019-05-29 14:14:42 -07:00
Alon Zakai
3595b073f3 Switch over to emscripten-releases for 'latest' (#250)
This makes emsdk [install|activate] latest get the latest fastcomp release from emscripten-releases, replacing our usage of the old mozilla build infrastructure.

This is only for "latest", so there should be no change to older releases.

This does remove non-release old stuff from the mozilla infrastructure, like "nightly" builds (that I don't think were even working?). After this PR, only old releases should be used from there.

Context: we've asked that people test the emscripten-releases builds for 1.38.33, and fixed a few issues people found. There are no open showstoppers, so this is us moving to the next step, serving latest builds from the new infrastructure.
2019-05-29 10:38:43 -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
e1c8f791a9 Support for tip-of-tree (tot) builds (#245)
emsdk install tot-upstream will install the very latest build from emscripten-releases. These builds are useful for emscripten github CI.

There isn't a latest or lkgr for emscripten-releases currently. What this does instead is get the git repo, and check if builds exist for the latest commits there, returning the latest of those.

This also makes us not update the emscripten-version.txt file if we are not an actual version. That is, for a tot build we leave that file unchanged in the emscripten checkout.

There is also a tot-fastcomp for fastcomp.
2019-05-24 10:23:01 -07:00
Alon Zakai
0ff164fc0c Restore lkgr (#244) 2019-05-23 19:56:13 -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
7c9b5090bf Fix emsdk on python3 - the values() of a dict is a view there, not a list (#241)
Also add both python2 and 3 testing on CI here.

Fixes #240.
2019-05-23 11:01:49 -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
Alon Zakai
751355a267 remove lkgr.json from git - the mozilla bots break if it's there (#238) 2019-05-20 14:17:35 -07:00
Sam Clegg
040e49ad1e Update tags (#235) 2019-05-09 19:47:35 -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
Sam Clegg
1362a02f16 Line wrap README.md (#233) 2019-05-02 11:34:16 -07:00
Sam Clegg
fa6dc7bad8 Fix some flake8 warnings in emsdk (#224)
Only some checks are enabled here in order to make this change
easier to review and less error prone.
2019-04-29 15:39:20 -07:00
Shane Peelar
9538381d56 Support Fish shell (emsdk_env) (#214)
Fish shell doesn't support the same syntax as most shells,
so add an emsdk_env.fish to support these users.
Instructions included in the file.
2019-03-18 11:43:13 -07:00
Jacob Greenfield
590e7bb23d Fix path quoting bug introduced in #220 (#227)
It seems that some variables were mistakenly left unquoted, leading to paths containing spaces being treated incorrectly.

For example, the directory `/home/person/foo bar/test/` would cause `CURDIR=$(pwd)` to be expanded to `CURDIR=/home/person/foo bar/test/`. This means that the shell would attempt to run the command `bar/test/` with the environment variable `CURDIR` set to `/home/person/foo`. This is due to [word splitting](https://www.gnu.org/software/bash/manual/html_node/Word-Splitting.html). (TL;DR the result of shell expansions should probably be quoted 99% of the time)
2019-03-06 08:35:35 -08:00
Sam Clegg
cd59b3aa26 Remove sudo from travis configuration (#225)
In theory this should speed it up a little.  I suppose it was
initially added because we use docker but it doesn't seem that is
requirement here.
2019-02-27 10:50:07 -08: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
Nic Hartley
a77638d5c1 Remove bashism in favor of portable alternative (#220) 2019-02-21 17:02:22 +02:00
Passw
c486741551 remove duplicated emsdk-1.35.0-full-64bit.exe (#216) 2019-02-13 10:22:46 -08:00
Alon Zakai
ea5d631a54 Deduplicate activated configs in the .emscripten file (#198)
While doing so, we:

* keep the latest activation (e.g., the user may have activated latest and then latest-upstream, then the upstream LLVM is what is desired).
* keep the order of keys fixed (so the relative order of lines in the .emscripten file is fixed)

This adds some assertions in the Dockerfile, to verify we have one LLVM_ROOT command, and it is the right one.

Fixes #194
2019-01-18 16:29:08 -08:00
Alon Zakai
5a8f59737d Remove wasm.js reference (#207)
We removed it in Binaryen #1858. The reference here broke source installs using the emsdk.

Fixes #206
2019-01-09 09:04:03 -08:00
Alon Zakai
f00c9ce165 update emscripten and binaryen tags (#205) 2019-01-09 16:40:53 +02: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
3ef46e970d Revert "Commit update-tags results" (#203) 2019-01-08 13:33:54 -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
juj
43576c3f60 Merge pull request #201 from kripken/update
Commit update-tags results
2019-01-08 12:36:23 +02:00
Alon Zakai (kripken)
028d7c09ab commit update-tags results 2019-01-06 09:21:40 -08:00
juj
df648b4382 Merge pull request #199 from juj/fix-warning
Avoid a Docker warning on an unused build arg
2018-12-21 11:45:05 +02:00
Alon Zakai
c9005824cf avoid a travis warning on an unused build arg 2018-12-20 11:35:21 -08: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