Rooba
/
pyodide
mirror of https://github.com/pyodide/pyodide.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use pyodide, rather than Module, as the main namespace

This commit is contained in:
Michael Droettboom 2018-02-26 08:31:46 -05:00
parent 67566d9530
commit 1de972ef3f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -19,7 +19,7 @@ all: pyodide.asm.html
pyodide.asm.html: main.bc root pyodide.asm.html: main.bc root
$(CC) -s WASM=1 --bind -o $@ $(filter %.bc,$^) $(LDFLAGS) \ $(CC) -s WASM=1 -s EXPORT_NAME="'pyodide'" --bind -o $@ $(filter %.bc,$^) $(LDFLAGS) \
$(foreach d,$(wildcard root/*),--preload-file $d@/$(notdir $d)) $(foreach d,$(wildcard root/*),--preload-file $d@/$(notdir $d))

18
pyodide.js
View File

@ -1,4 +1,4 @@
var Module = {} var pyodide = {}
{ {
let wasmURL = 'pyodide.asm.wasm'; let wasmURL = 'pyodide.asm.wasm';
@ -7,22 +7,22 @@ var Module = {}
wasmXHR.responseType = 'arraybuffer'; wasmXHR.responseType = 'arraybuffer';
wasmXHR.onload = function() { wasmXHR.onload = function() {
if (wasmXHR.status === 200 || wasmXHR.status === 0) { if (wasmXHR.status === 200 || wasmXHR.status === 0) {
Module.wasmBinary = wasmXHR.response; pyodide.wasmBinary = wasmXHR.response;
} else { } else {
var wasmURLBytes = tryParseAsDataURI(wasmURL); var wasmURLBytes = tryParseAsDataURI(wasmURL);
if (wasmURLBytes) { if (wasmURLBytes) {
Module.wasmBinary = wasmURLBytes.buffer; pyodide.wasmBinary = wasmURLBytes.buffer;
} }
} }
var memoryInitializer = 'pyodide.asm.html.mem'; var memoryInitializer = 'pyodide.asm.html.mem';
if (typeof Module['locateFile'] === 'function') { if (typeof pyodide['locateFile'] === 'function') {
memoryInitializer = Module['locateFile'](memoryInitializer); memoryInitializer = pyodide['locateFile'](memoryInitializer);
} else if (Module['memoryInitializerPrefixURL']) { } else if (pyodide['memoryInitializerPrefixURL']) {
memoryInitializer = Module['memoryInitializerPrefixURL'] + memoryInitializer; memoryInitializer = pyodide['memoryInitializerPrefixURL'] + memoryInitializer;
} }
Module['memoryInitializerRequestURL'] = memoryInitializer; pyodide['memoryInitializerRequestURL'] = memoryInitializer;
var meminitXHR = Module['memoryInitializerRequest'] = new XMLHttpRequest(); var meminitXHR = pyodide['memoryInitializerRequest'] = new XMLHttpRequest();
meminitXHR.open('GET', memoryInitializer, true); meminitXHR.open('GET', memoryInitializer, true);
meminitXHR.responseType = 'arraybuffer'; meminitXHR.responseType = 'arraybuffer';
meminitXHR.send(null); meminitXHR.send(null);