Vendor file_packager.py

bus3297 · Sep 12, 2018 · 84f2f28 · 84f2f28
1 parent 88194ab
commit 84f2f28
Show file tree

Hide file tree

Showing 3 changed files with 794 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 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)

diff --git 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),