Python3 support

Fixes #1

Author: aidanhs

Makefile

@@ -27,29 +27,25 @@ EMFLAGS=\
 	$$([ $(EMPYOPT) = 1 ] && echo $(EMOPT) || echo $(EMDEBUG))
 
 EMEXPORTS=\
-	-s EXPORTED_FUNCTIONS="['_Py_Initialize', '_PyRun_SimpleString']"
+	-s EXPORTED_FUNCTIONS="['_Py_Initialize', '_PyRun_SimpleString']" -s "EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap']"
 
-lp.js: libpython.a
-	python mapfiles.py python/Lib datafilezip > js/postJs.js
+empython.js: python/libpython3.5.a
+	python2 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
 
-CONFFLAGS=OPT="$(COPT)" --without-threads --without-pymalloc --disable-shared --without-signal-module --disable-ipv6
+CONFFLAGS=OPT="$(COPT)" --without-threads --without-pymalloc --disable-shared --disable-ipv6
 prep:
-	#sudo apt-get install gcc-multilib
 	./configure
-	make Parser/pgen python
-	#cp Makefile ../Makefile.native
-	#cp Parser/pgen ../pgen.native
+	make python
 	cp python ../python.native
 	make clean
 	git clean -f -x -d
 em:
-	cd Modules/zlib && emconfigure ./configure && sed -i 's/^AR=.*/\0 rc/' Makefile && emmake make
+	cd Modules/zlib && emconfigure ./configure --static && emmake make libz.a
 	(export BASECFLAGS=-m32 LDFLAGS=-m32 && emconfigure ./configure $(CONFFLAGS))
 	git apply ../hacks.patch
 	emmake make || true # errors on running python
 	mv python python.bc # only useful if replacing the emscripten test .bc file
 	cp ../python.native python && chmod +x python
-	#cp ../pgen.native Parser/pgen && chmod +x Parser/pgen
 	emmake make

README.md

@@ -4,6 +4,5 @@ $ cd python
 $ make -f ../Makefile prep
 $ make -f ../Makefile em
 $ cd ..
-$ ln -sf python/libpython2.7.a libpython.a
-$ make lp.js
+$ make empython.js
 ```

hacks.patch

@@ -1,74 +1,33 @@
-diff --git a/pyconfig.h.orig b/pyconfig.h
---- a/pyconfig.h
-+++ b/pyconfig.h
-@@ -269,7 +269,7 @@
- 
- /* Define if we can use gcc inline assembler to get and set x87 control word
-    */
--#define HAVE_GCC_ASM_FOR_X87 1
-+#undef HAVE_GCC_ASM_FOR_X87
- 
- /* Define if you have the getaddrinfo function. */
- #define HAVE_GETADDRINFO 1
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -18,6 +18,7 @@ from distutils.command.install_lib import install_lib
- from distutils.spawn import find_executable
- 
- cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
-+cross_compiling = True
- 
- def get_platform():
-     # cross build
-@@ -442,7 +443,9 @@ class PyBuildExt(build_ext):
-             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-         if cross_compiling:
-             self.add_gcc_paths()
--        self.add_multiarch_paths()
-+        #self.add_multiarch_paths()
-+        add_dir_to_list(self.compiler.library_dirs, './Modules/zlib')
-+        add_dir_to_list(self.compiler.include_dirs, './Modules/zlib')
- 
-         # Add paths specified in the environment variables LDFLAGS and
-         # CPPFLAGS for header and library files.
-diff --git a/Modules/Setup b/Modules/Setup
---- a/Modules/Setup
-+++ b/Modules/Setup
-@@ -171,14 +171,14 @@ GLHACK=-Dclear=__GLclear
- #array arraymodule.c	# array objects
- #cmath cmathmodule.c _math.c # -lm # complex math library functions
- #math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
--#_struct _struct.c	# binary structure packing/unpacking
-+_struct _struct.c	# binary structure packing/unpacking
- #time timemodule.c # -lm # time operations and variables
--#operator operator.c	# operator.add() and similar goodies
-+operator operator.c	# operator.add() and similar goodies
- #_testcapi _testcapimodule.c    # Python C API test module
- #_random _randommodule.c	# Random number generator
--#_collections _collectionsmodule.c # Container types
--#_heapq _heapqmodule.c		# Heapq type
--#itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
-+_collections _collectionsmodule.c # Container types
-+_heapq _heapqmodule.c		# Heapq type
-+itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
- #strop stropmodule.c		# String manipulations
- #_functools _functoolsmodule.c	# Tools for working with functions and callable objects
- #_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
-@@ -434,7 +434,7 @@ itertools itertoolsmodule.c	# Functions creating iterators for efficient looping
- 
- 
- # Helper module for various ascii-encoders
--#binascii binascii.c
-+binascii binascii.c
- 
- # Fred Drake's interface to the Python parser
- #parser parsermodule.c
-@@ -465,6 +465,7 @@ GLHACK=-Dclear=__GLclear
+--- pyconfig.h.orig	2020-10-24 22:13:50.745086908 +0100
++++ pyconfig.h	2020-10-24 23:04:46.647877114 +0100
+@@ -979,7 +979,7 @@
+ #define HAVE_SYS_FILE_H 1
+ 
+ /* Define to 1 if you have the <sys/ioctl.h> header file. */
+-#define HAVE_SYS_IOCTL_H 1
++//#define HAVE_SYS_IOCTL_H 1
+ 
+ /* Define to 1 if you have the <sys/kern_control.h> header file. */
+ /* #undef HAVE_SYS_KERN_CONTROL_H */
+--- Modules/Setup.orig	2020-10-24 23:04:17.224003619 +0100
++++ Modules/Setup	2020-10-24 23:04:24.079974258 +0100
+@@ -358,7 +358,7 @@
+ # Andrew Kuchling's zlib module.
  # This require zlib 1.1.3 (or later).
  # See http://www.gzip.org/zlib/
- #zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+zlib zlibmodule.c -I./Modules/zlib -L./Modules/zlib -lz
+-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++zlib zlibmodule.c -IModules/zlib -LModules/zlib -lz
 
  # Interface to the Expat XML parser
  #
+--- setup.py
++++ setup.py
+@@ -16,7 +16,7 @@ from distutils.command.install_lib import install_lib
+ from distutils.command.build_scripts import build_scripts
+ from distutils.spawn import find_executable
+ 
+-cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
++cross_compiling = True
+ 
+ # Add special CFLAGS reserved for building the interpreter and the stdlib
+ # modules (Issue #21121).

js/postJs.js.in

@@ -1,21 +1,23 @@
       Module.FS = FS;
       Module.ENV = ENV;
-      root['Module'] = Module;
-    }
+      Module.onRuntimeInitialized = onRuntimeInitialized;
+      return Module;
+    })()
   };
 
-  root.empython();
   // Undo pollution of window
   delete window.Module;
 
   // Init emscripten stuff
   root.Module.run();
 
-  root.Initialize = root.Module.cwrap('Py_Initialize', 'number', []);
-  root.Run = root.Module.cwrap('PyRun_SimpleString', 'number', [
-      'string'  // string to eval
-  ]);
-
-  return root;
-
-})();
+  function onRuntimeInitialized() {
+    root.Initialize = root.Module.cwrap('Py_Initialize', 'number', []);
+    root.Run = root.Module.cwrap('PyRun_SimpleString', 'number', [
+        'string'  // string to eval
+    ]);
+    root.Initialize();
+    // empython comes out from this callback
+    initialized_callback(root);
+  }
+};

js/preJs.js

@@ -1,10 +1,12 @@
-this.empython = (function () {
+this.init_empython = function (initialized_callback, print_hook) {
 
   var root = {
-    empython: function () {
+    Module: (function () {
       var Module = {
         noInitialRun: true,
         noExitRuntime: true,
         preRun: [],
-        postRun: []
+        postRun: [],
+        print: print_hook,
+        printErr: print_hook,
       };

mapfiles.py

@@ -20,7 +20,7 @@ def mk_contents(data):
     ) % (base64.b64encode(data), len(data), len(data))
 
 def files_to_datafilecalls(fpaths):
-    basedir = '/usr/local/lib/python2.7'
+    basedir = '/usr/local/lib/python3.5'
     commands = []
     dpaths = set([basedir])
     for fpath, targetdir in fpaths:
@@ -38,9 +38,7 @@ def files_to_datafilecalls(fpaths):
 
     dpaths.remove(basedir)
     for dpath in sorted(dpaths, key=len, reverse=True):
-        commands.insert(0, 'FS.createFolder("%s", "%s", true, true)' % (
-            os.path.dirname(dpath), os.path.basename(dpath)
-        ))
+        commands.insert(0, 'FS.mkdirTree("%s")' % (dpath,))
     commands.insert(0, 'FS.createPath("/", "' + basedir[1:] + '", true, true)')
 
     return commands
@@ -52,7 +50,7 @@ def files_to_datafilezipcall(fpaths):
         zipfile.write(fpath, os.path.join(targetdir, os.path.basename(fpath)))
     zipfile.close()
 
-    target = '/usr/local/lib/python27.zip'
+    target = '/usr/local/lib/python35.zip'
     commands = []
     commands.insert(0, 'FS.createPath("/", "' + os.path.dirname(target)[1:] + '", true, true)')
     commands.append('FS.createDataFile("%s", "%s", %s, true, true)' % (
@@ -89,17 +87,17 @@ def main(root):
             fpaths.append((os.path.join(dirpath, filename), dirpath))
 
     # _sysconfigdata is created by the build process
-    fpaths.append(('../build/lib.linux-x86_64-2.7/_sysconfigdata.py', '.'))
+    fpaths.append(('../build/lib.linux-x86_64-3.5/_sysconfigdata.py', '.'))
 
     # Some checks and assertions
     assert all([targetdir[0] == '.' for fpath, targetdir in fpaths])
     fpaths = [
         (fpath, targetdir) for fpath, targetdir in fpaths
         if os.path.splitext(fpath)[1] == '.py'
     ]
-    # Compile to save space and time in the parser
-    check_call(['python', '-OO', '-m', 'py_compile'] + [fpath for fpath, _ in fpaths])
-    fpaths = [(fpath + 'o', targetdir) for fpath, targetdir in fpaths]
+    ## Compile to save space and time in the parser
+    #check_call(['python3', '-OO', '-m', 'py_compile'] + [fpath for fpath, _ in fpaths])
+    #fpaths = [(fpath + 'o', targetdir) for fpath, targetdir in fpaths]
 
     if sys.argv[2] == 'datafiles':
         commands = files_to_datafilecalls(fpaths)
@@ -109,7 +107,7 @@ def main(root):
         assert False
 
     # Start out in a writeable folder.
-    commands.append('FS.createFolder(".", "sandbox", true, true)')
+    commands.append('FS.mkdirTree("/sandbox")')
     commands.append('FS.currentPath = "/sandbox"')
 
     # http://bugs.python.org/issue22689