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

Move kiwisolver to its own package

This commit is contained in:
Michael Droettboom 2018-06-15 12:05:52 -04:00
parent 08beb135eb
commit cb7a4046ba
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -82,7 +82,8 @@ all: build/pyodide.asm.js \
build/dateutil.data \
build/pytz.data \
build/pandas.data \
build/matplotlib.data
build/matplotlib.data \
build/kiwisolver.data
build/pyodide.asm.js: src/main.bc src/jsimport.bc src/jsproxy.bc src/js2python.bc \
@ -178,12 +179,15 @@ build/matplotlib.data: $(MATPLOTLIB_LIBS)
python2 $(FILEPACKAGER) build/matplotlib.data --preload $(MATPLOTLIB_ROOT)@/lib/python3.6/site-packages/matplotlib --js-output=build/matplotlib.js --export-name=pyodide --exclude \*.wasm.pre --exclude __pycache__
build/kiwisolver.data: $(KIWISOLVER_LIBS)
python2 $(FILEPACKAGER) build/kiwisolver.data --preload kiwisolver/build@/lib/python3.6/site-packages --js-output=build/kiwisolver.js --export-name=pyodide --exclude \*.wasm.pre --exclude __pycache__
root/.built: \
$(CPYTHONLIB) \
$(SIX_LIBS) \
$(PYPARSING_LIBS) \
$(CYCLER_LIBS) \
$(KIWISOLVER_LIBS) \
src/sitecustomize.py \
src/webbrowser.py \
src/pyodide.py \

1
kiwisolver/Makefile
View File

@ -60,6 +60,7 @@ $(BUILD)/kiwisolver.so: \
[ -d $(ROOT)/build ] || mkdir $(ROOT)/build
$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
mv $@.wasm $@
rm $@.wasm.pre
$(ROOT)/.patched: $(HOSTDIR)/setup.py

3
src/pyodide.js
View File

@ -12,7 +12,8 @@ var languagePluginLoader = new Promise((resolve, reject) => {
// Package loading
const packages = {
'dateutil' : [],
'matplotlib' : [ 'numpy', 'dateutil', 'pytz' ],
'kiwisolver': [],
'matplotlib' : [ 'numpy', 'dateutil', 'pytz', 'kiwisolver' ],
'numpy' : [],
'pandas' : [ 'numpy', 'dateutil', 'pytz' ],
'pytz' : [],