Commit 6ef80a8f authored by Roman Yurchak's avatar Roman Yurchak

Use python instead of python2

parent 4d2f4bf6
...@@ -64,7 +64,7 @@ build/pyodide.asm.js: src/main.bc src/jsimport.bc src/jsproxy.bc src/js2python.b ...@@ -64,7 +64,7 @@ build/pyodide.asm.js: src/main.bc src/jsimport.bc src/jsproxy.bc src/js2python.b
build/pyodide.asm.data: root/.built build/pyodide.asm.data: root/.built
python2 $(FILEPACKAGER) build/pyodide.asm.data --preload root/lib@lib --js-output=build/pyodide.asm.data.js --use-preload-plugins python $(FILEPACKAGER) build/pyodide.asm.data --preload root/lib@lib --js-output=build/pyodide.asm.data.js --use-preload-plugins
uglifyjs build/pyodide.asm.data.js -o build/pyodide.asm.data.js uglifyjs build/pyodide.asm.data.js -o build/pyodide.asm.data.js
...@@ -136,7 +136,7 @@ build/test.data: $(CPYTHONLIB) ...@@ -136,7 +136,7 @@ build/test.data: $(CPYTHONLIB)
cd $(CPYTHONLIB)/test; \ cd $(CPYTHONLIB)/test; \
find -type d -name __pycache__ -prune -exec rm -rf {} \; \ find -type d -name __pycache__ -prune -exec rm -rf {} \; \
) )
python2 $(FILEPACKAGER) build/test.data --preload $(CPYTHONLIB)/test@/lib/python3.6/test --js-output=build/test.js --export-name=pyodide --exclude \*.wasm.pre --exclude __pycache__ python $(FILEPACKAGER) build/test.data --preload $(CPYTHONLIB)/test@/lib/python3.6/test --js-output=build/test.js --export-name=pyodide --exclude \*.wasm.pre --exclude __pycache__
uglifyjs build/test.js -o build/test.js uglifyjs build/test.js -o build/test.js
......
...@@ -141,7 +141,7 @@ def package_files(buildpath, srcpath, pkg, args): ...@@ -141,7 +141,7 @@ def package_files(buildpath, srcpath, pkg, args):
name = pkg['package']['name'] name = pkg['package']['name']
libdir = get_libdir(srcpath, args) libdir = get_libdir(srcpath, args)
subprocess.run([ subprocess.run([
'python2', 'python',
Path(os.environ['EMSCRIPTEN']) / 'tools' / 'file_packager.py', Path(os.environ['EMSCRIPTEN']) / 'tools' / 'file_packager.py',
buildpath / (name + '.data'), buildpath / (name + '.data'),
'--preload', '--preload',
......
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