Vendor file_packager.py

84f2f282 · Michael Droettboom · 88194ab2 · 84f2f282 · 84f2f282 · 84f2f282
Commit 84f2f282 authored Sep 12, 2018 by Michael Droettboom
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 794 additions and 2 deletions

Makefile Makefile +1 -1

tools/buildpkg.py tools/buildpkg.py +1 -1

tools/file_packager.py tools/file_packager.py +792 -0

No files found.
--- a/Makefile
+++ b/Makefile
 PYODIDE_ROOT=$(abspath .)
 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
 CPYTHONLIB=$(CPYTHONROOT)/installs/python-$(PYVERSION)/lib/python$(PYMINOR)

--- a/tools/buildpkg.py
+++ b/tools/buildpkg.py
@@ -124,7 +124,7 @@ def package_files(buildpath, srcpath, pkg, args):
    install_prefix = (srcpath / 'install').resolve()
    subprocess.run([
        'python',
-        Path(os.environ['EMSCRIPTEN']) / 'tools' / 'file_packager.py',
+        Path(ROOTDIR) / 'file_packager.py',
        name + '.data',
        '--preload',
        '{}@/'.format(install_prefix),

--- a/tools/file_packager.py
+++ b/tools/file_packager.py