Commit 2117ff2f authored by Michael Droettboom's avatar Michael Droettboom Committed by GitHub

Merge pull request #161 from mdboom/vendor-file-packager

Vendor file_packager.py
parents 9ee69d18 a028a86d
PYODIDE_ROOT=$(abspath .) PYODIDE_ROOT=$(abspath .)
include Makefile.envs include Makefile.envs
FILEPACKAGER=$(PYODIDE_ROOT)/emsdk/emsdk/emscripten/tag-1.38.10/tools/file_packager.py FILEPACKAGER=$(PYODIDE_ROOT)/tools/file_packager.py
CPYTHONROOT=cpython CPYTHONROOT=cpython
CPYTHONLIB=$(CPYTHONROOT)/installs/python-$(PYVERSION)/lib/python$(PYMINOR) CPYTHONLIB=$(CPYTHONROOT)/installs/python-$(PYVERSION)/lib/python$(PYMINOR)
......
...@@ -124,7 +124,7 @@ def package_files(buildpath, srcpath, pkg, args): ...@@ -124,7 +124,7 @@ def package_files(buildpath, srcpath, pkg, args):
install_prefix = (srcpath / 'install').resolve() install_prefix = (srcpath / 'install').resolve()
subprocess.run([ subprocess.run([
'python', 'python',
Path(os.environ['EMSCRIPTEN']) / 'tools' / 'file_packager.py', Path(ROOTDIR) / 'file_packager.py',
name + '.data', name + '.data',
'--preload', '--preload',
'{}@/'.format(install_prefix), '{}@/'.format(install_prefix),
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment