Merge pull request #5 from aidanhs/aphs-docker

Add instructions for docker

Author: aidanhs

Makefile

@@ -30,7 +30,7 @@ EMEXPORTS=\
 	-s EXPORTED_FUNCTIONS="['_Py_Initialize', '_PyRun_SimpleString']" -s "EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap']"
 
 empython.js: python/libpython3.5.a
-	python2 mapfiles.py python/Lib datafilezip > js/postJs.js
+	./mapfiles.py python/Lib datafilezip > js/postJs.js
 	cat js/postJs.js.in >> js/postJs.js
 	emcc $(EMFLAGS) $(EMEXPORTS) -o $@ $< python/Modules/zlib/libz.a
 

README.md

@@ -1,3 +1,18 @@
+= empython
+
+== Get it
+
+First, clone and initialise submodules:
+
+```
+$ git clone [email protected]:aidanhs/empython.git
+$ cd empython
+$ git submodule update --init
+```
+
+== Build it
+
+If you have emscripten 2.0.7 installed (other versions may or may not work):
 
 ```
 $ cd python
@@ -6,3 +21,13 @@ $ make -f ../Makefile em
 $ cd ..
 $ make empython.js
 ```
+
+If you have docker or podman (below I'll use podman, I think you'll need to add `-u $(id -u):$(id -g)` for Docker):
+
+```
+$ podman pull emscripten/emsdk:2.0.7
+$ podman run -it --rm -v $(pwd):/src emscripten/emsdk:2.0.7 bash -c "cd python && make -f ../Makefile prep && make -f ../Makefile em && cd .. && make empython.js"
+$ ls -l empython.{js,wasm}
+.rw-r--r-- 2.9M aidanhs 25 Oct 14:52 empython.js
+.rwxr-xr-x 1.9M aidanhs 25 Oct 14:52 empython.wasm
+```

mapfiles.py

@@ -1,11 +1,11 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 from __future__ import print_function
 
 import os
 import sys
 import py_compile
 from zipfile import ZipFile, ZIP_DEFLATED
-from StringIO import StringIO
+from io import BytesIO
 from subprocess import check_call
 import base64
 
@@ -17,7 +17,7 @@ def mk_contents(data):
         'for(i=0;i<%s;i++)a[i]=t.charCodeAt(i);'
         'return a'
         '})()'
-    ) % (base64.b64encode(data), len(data), len(data))
+    ) % (base64.b64encode(data).decode('ascii'), len(data), len(data))
 
 def files_to_datafilecalls(fpaths):
     basedir = '/usr/local/lib/python3.5'
@@ -44,7 +44,7 @@ def files_to_datafilecalls(fpaths):
     return commands
 
 def files_to_datafilezipcall(fpaths):
-    zf = StringIO()
+    zf = BytesIO()
     zipfile = ZipFile(zf, 'w', ZIP_DEFLATED)
     for fpath, targetdir in fpaths:
         zipfile.write(fpath, os.path.join(targetdir, os.path.basename(fpath)))