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

Merge pull request #25 from iodide-project/modularize 

Don't dump everything in the global namespace
This commit is contained in:
Michael Droettboom 2018-04-13 16:45:50 -04:00 committed by GitHub
parent 8aca5e2ab3 e0fd7652b6
commit d1cb952a66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -13,6 +13,7 @@ CXX=em++
OPTFLAGS=-O3 OPTFLAGS=-O3
CXXFLAGS=-std=c++14 $(OPTFLAGS) -g -I$(CPYTHONINC) -Wno-warn-absolute-paths CXXFLAGS=-std=c++14 $(OPTFLAGS) -g -I$(CPYTHONINC) -Wno-warn-absolute-paths
LDFLAGS=\ LDFLAGS=\
-s MODULARIZE=1 \
$(CPYTHONROOT)/installs/python-$(PYVERSION)/lib/libpython$(PYMINOR).a \ $(CPYTHONROOT)/installs/python-$(PYVERSION)/lib/libpython$(PYMINOR).a \
-s "BINARYEN_METHOD='native-wasm'" \ -s "BINARYEN_METHOD='native-wasm'" \
-s TOTAL_MEMORY=268435456 \ -s TOTAL_MEMORY=268435456 \

8
src/pyodide.js
View File

@ -1,4 +1,3 @@
var pyodide = {}
{ {
let baseURL = "{{DEPLOY}}"; let baseURL = "{{DEPLOY}}";
@ -7,14 +6,17 @@ var pyodide = {}
wasmXHR.open('GET', wasmURL, true); wasmXHR.open('GET', wasmURL, true);
wasmXHR.responseType = 'arraybuffer'; wasmXHR.responseType = 'arraybuffer';
wasmXHR.onload = function() { wasmXHR.onload = function() {
let Module = {};
if (wasmXHR.status === 200 || wasmXHR.status === 0) { if (wasmXHR.status === 200 || wasmXHR.status === 0) {
pyodide.wasmBinary = wasmXHR.response; Module.wasmBinary = wasmXHR.response;
} else { } else {
alert("Couldn't download the pyodide.asm.wasm binary. Response was " + wasmXHR.status); alert("Couldn't download the pyodide.asm.wasm binary. Response was " + wasmXHR.status);
} }
pyodide.baseURL = baseURL; Module.baseURL = baseURL;
var script = document.createElement('script'); var script = document.createElement('script');
script.onload = function() { window.pyodide = pyodide(Module); };
script.src = baseURL + "pyodide.asm.js"; script.src = baseURL + "pyodide.asm.js";
document.body.appendChild(script); document.body.appendChild(script);
}; };