Skip to content

Conversation

mtrive
Copy link

@mtrive mtrive commented May 6, 2016

  • 1.36.x patches from upstream to get emscripten to build/run with Unity
  • replace access to indexedDB/window.indexedDB with Module.indexedDB

@mtrive mtrive merged commit 6c2dfbe into master May 16, 2016
mtrive pushed a commit that referenced this pull request Jan 5, 2018
* Remove duplicated `var Module`: it is already defined unconditionally in `shell.js` and because of var hoisting it will work fine.
Also this allows to remove one of Closure Compiler suppressions.

* Eliminate one `eval()` construction by replacing placeholder in source code on later stage of the build process.
Move some comments out of final generated code and reword it to better reflect the actual meaning.

* Fix some tests that introduced duplicated `var Module` that caused tests to fail when they shouldn't

* `file_packager.py` tweaked to have access to `EXPORT_NAME` and can now work without `emcc.py` again

* add a test for modularize+closure+prejs

* Moved `var Module` into `emcc.py` in order to make sure it is placed in output code before any `--pre-js`.
Also edited copied comment as behavior have changed slightly.

* Fixed one test that incorrectly (after recent update) assumed that during `--pre-js` execution `Module` should be `undefined`, not it should be an empty object.

* Added check for Closure Compiler usage in `emcc` so that anti-mangling substitution for Closure Compiler is not used when not needed

* `--no-closure` option in `file_packager.py` now replaced with `--from-emcc` and code is further simplified as `file_packager.py` doesn't need to be aware of Closure Compiler

* Do not append module header for `-s SIDE_MODULE`

* Fix for Closure Compiler replacing `Module` variable with plain string

* Fix test case that was looking for comment in shell code that was actually moved from there

* Removed assignment that seems redundant after recent changes
juj pushed a commit that referenced this pull request Feb 19, 2020
…mscripten-core#8744)

This reverts commit 1d198e4.

Apparently this cause a failure on the mac builder:
https://ci.chromium.org/p/emscripten-releases/builders/ci/mac/b8911649373078606944

```
cache:INFO:  - ok
Traceback (most recent call last):
  File "/b/s/w/ir/k/install/emscripten/emcc.py", line 3391, in <module>
    sys.exit(run(sys.argv))
  File "/b/s/w/ir/k/install/emscripten/emcc.py", line 1894, in run
    final = shared.Building.link(linker_inputs, DEFAULT_FINAL, force_archive_contents=force_archive_contents, just_calculate=just_calculate)
  File "/b/s/w/ir/k/install/emscripten/tools/shared.py", line 1940, in link
    Building.read_link_inputs([x for x in files if not x.startswith('-')])
  File "/b/s/w/ir/k/install/emscripten/tools/shared.py", line 1721, in read_link_inputs
    object_names_in_archives = pool.map(extract_archive_contents, archive_names)
  File "/b/s/w/ir/cipd_bin_packages/lib/python2.7/multiprocessing/pool.py", line 253, in map
    return self.map_async(func, iterable, chunksize).get()
  File "/b/s/w/ir/cipd_bin_packages/lib/python2.7/multiprocessing/pool.py", line 572, in get
    raise self._value
IOError: [Errno 2] No such file or directory: u'/b/s/w/ir/tmp/t/emscripten_temp_oIE5H7_archive_contents/#1/12'
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants