mirror of https://github.com/pyodide/pyodide.git
Move kiwisolver to its own package
This commit is contained in:
parent
08beb135eb
commit
cb7a4046ba
8
Makefile
8
Makefile
|
@ -82,7 +82,8 @@ all: build/pyodide.asm.js \
|
||||||
build/dateutil.data \
|
build/dateutil.data \
|
||||||
build/pytz.data \
|
build/pytz.data \
|
||||||
build/pandas.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 \
|
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__
|
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: \
|
root/.built: \
|
||||||
$(CPYTHONLIB) \
|
$(CPYTHONLIB) \
|
||||||
$(SIX_LIBS) \
|
$(SIX_LIBS) \
|
||||||
$(PYPARSING_LIBS) \
|
$(PYPARSING_LIBS) \
|
||||||
$(CYCLER_LIBS) \
|
$(CYCLER_LIBS) \
|
||||||
$(KIWISOLVER_LIBS) \
|
|
||||||
src/sitecustomize.py \
|
src/sitecustomize.py \
|
||||||
src/webbrowser.py \
|
src/webbrowser.py \
|
||||||
src/pyodide.py \
|
src/pyodide.py \
|
||||||
|
|
|
@ -60,6 +60,7 @@ $(BUILD)/kiwisolver.so: \
|
||||||
[ -d $(ROOT)/build ] || mkdir $(ROOT)/build
|
[ -d $(ROOT)/build ] || mkdir $(ROOT)/build
|
||||||
$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
|
$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
|
||||||
mv $@.wasm $@
|
mv $@.wasm $@
|
||||||
|
rm $@.wasm.pre
|
||||||
|
|
||||||
|
|
||||||
$(ROOT)/.patched: $(HOSTDIR)/setup.py
|
$(ROOT)/.patched: $(HOSTDIR)/setup.py
|
||||||
|
|
|
@ -12,7 +12,8 @@ var languagePluginLoader = new Promise((resolve, reject) => {
|
||||||
// Package loading
|
// Package loading
|
||||||
const packages = {
|
const packages = {
|
||||||
'dateutil' : [],
|
'dateutil' : [],
|
||||||
'matplotlib' : [ 'numpy', 'dateutil', 'pytz' ],
|
'kiwisolver': [],
|
||||||
|
'matplotlib' : [ 'numpy', 'dateutil', 'pytz', 'kiwisolver' ],
|
||||||
'numpy' : [],
|
'numpy' : [],
|
||||||
'pandas' : [ 'numpy', 'dateutil', 'pytz' ],
|
'pandas' : [ 'numpy', 'dateutil', 'pytz' ],
|
||||||
'pytz' : [],
|
'pytz' : [],
|
||||||
|
|
Loading…
Reference in New Issue