Minor tidy-ups.

ntoll · ntoll · commit 813fafa70c2f · 2022-10-06T15:22:33.000+01:00
diff --git a/Makefile b/Makefile
@@ -1,15 +1,16 @@
 SHELL := /bin/bash
 
 all:
-	@echo "\nThere's no default Makefil target right now. Try\n\n"
+	@echo "There's no default Makefile target right now. Try:"
+	@echo ""
 	@echo "make setup - clone the required repositories."
 	@echo "make update - update the emsdk compiler."
-	@echo "make refresh - re-compile MicroPython for WASM into build."
+	@echo "make mp - compile MicroPython for WASM into the mpbuild directory."
+	@echo "make serve - serve the project at: http://0.0.0.0:8000/"
 
 setup:
 	git clone https://github.com/emscripten-core/emsdk.git
 	git clone https://github.com/micropython/micropython.git
-	git clone  https://github.com/python/cpython.git
 
 update:
 	cd emsdk && git pull && ./emsdk install latest && ./emsdk activate latest
@@ -20,11 +21,5 @@ mp:
 	./emsdk/emsdk activate latest && source emsdk/emsdk_env.sh && $(MAKE) -C micropython/ports/webassembly
 	cp -r micropython/ports/webassembly/build mpbuild
 
-py:
-	rm -rf pybuild
-	./cpython/Tools/wasm/wasm_build.py build
-	./emsdk/emsdk activate latest && source emsdk/emsdk_env.sh && ./cpython/Tools/wasm/wasm_build.py emscripten-browser
-	cp -r cpython/builddir/emscripten-browser pybuild
-
 serve:
 	python -m http.server
diff --git a/README.md b/README.md
@@ -16,3 +16,22 @@ target WASM. Inspired by code in the "real" PyTest website.
 Complexity, edge cases, customization and mess is confined to plugins.
 
 That is all.
+
+## Developer Setup
+
+In order to compile MicroPython you'll need to ensure you have the expected
+compiler tools described here:
+
+https://docs.micropython.org/en/latest/develop/gettingstarted.html
+
+Otherwise, common tasks are scripted by a Makefile (tested on Linux):
+
+```
+$ make
+There's no default Makefile target right now. Try:
+
+make setup - clone the required repositories.
+make update - update the emsdk compiler.
+make mp - compile MicroPython for WASM into the mpbuild directory.
+make serve - serve the project at: http://0.0.0.0:8000/
+```
diff --git a/pyscript.js b/pyscript.js
@@ -123,7 +123,7 @@ class PyScriptTag extends Plugin {
                 document.dispatchEvent(pyScriptRegistered);
             }
         }
-        // Register it (thUs extracting the code from the page).
+        // Register it (thus extracting the code from the page).
         customElements.define('py-script', PyScript);
     }
 }
@@ -173,11 +173,27 @@ class MicroPythonRuntime extends Runtime {
     }
 }
 
+
+class CPythonRuntime extends Runtime {
+    /*
+    The standard CPython version of Python compiled to WASM. For more
+    information, see:
+
+    https://github.com/python/cpython/blob/main/Tools/wasm/README.md
+
+    TODO: Finish this.
+    */
+
+    static get url() {
+        return "pybuild/python.js";
+    }
+}
+
 /******************************************************************************
 The core PyScript app definition.
 ******************************************************************************/
 
-function main() {
+const main = function() {
     // Really simple logging. Emoji 🐍 highlights PyScript app logs. ;-)
     const logger = function() {
         return Function.prototype.bind.call(console.log, console, "🐍 ", ...arguments);
@@ -197,10 +213,10 @@ function main() {
     const pendingScripts = [];
     // Details of runtimes.
     // Key: lowercase runtime name.
-    // Value: path to load runtime.
+    // Value: the class wrapping that version of the runtime.
     const runtimes = {
         "micropython": MicroPythonRuntime,
-        "cpython": "pybuild/python.js"
+        "cpython": CPythonRuntime
     }
     // Default to smallest/fastest runtime.
     runtimes["default"] = runtimes["micropython"]
@@ -356,7 +372,6 @@ function main() {
             evaluate each script in turn with the runtime.
             */
             logger("Evaluating code. 🤖\n" + script.code);
-            debugger;
             runtime.eval(script.code);
         },
     }
@@ -366,14 +381,8 @@ function main() {
     // steps.
     //
     // These functions are defined in the order they're roughly expected to
-    // be called through the life-cycle of the page.
-
-    app["run"] = function() {
-        /*
-        Start everthing running.
-        */
-        app.loadConfig();
-    }
+    // be called through the life-cycle of the page, although this cannot be
+    // guaranteed for some of the functions.
 
     function onPyConfigured(e) {
         /*
@@ -432,11 +441,19 @@ function main() {
     }
     document.addEventListener("py-eval-script", onEvalScript);
 
-    return app;
-}
+    // Finally, return a function to start PyScript.
+
+    return function() {
+        /*
+        Start PyScript.
+        */
+        // TODO: check test/debug flag.
+        app.loadConfig();
+        return app;
+    }
+}();
 
 /******************************************************************************
 Start PyScript.
 ******************************************************************************/
-const _pyscriptApp = main();
-_pyscriptApp.run();
+main();
