Working final nano build for pyodide 0.18.0

Author: phorward

Makefile

@@ -16,7 +16,10 @@ all: check \
 	build/pyodide.asm.js \
 	build/pyodide.js \
 	build/console.html \
+	build/distutils.data \
 	build/packages.json \
+	$(if $(PYODIDE_BUILD), , "build/test.data") \
+	$(if $(PYODIDE_BUILD), , "build/test.html") \
 	build/webworker.js \
 	build/webworker_dev.js
 	echo -e "\nSUCCESS!"
@@ -53,6 +56,10 @@ build/pyodide.asm.js: \
 		-lproxyfs.js \
 		-lworkerfs.js \
 		--preload-file $(CPYTHONLIB)@/lib/python$(PYMAJOR).$(PYMINOR) \
+		$(if $(PYODIDE_BUILD), "", "--preload-file src/webbrowser.py@/lib/python$(PYMAJOR).$(PYMINOR)/webbrowser.py") \
+		$(if $(PYODIDE_BUILD), "", "--preload-file src/_testcapi.py@/lib/python$(PYMAJOR).$(PYMINOR)/_testcapi.py") \
+		$(if $(PYODIDE_BUILD), "", "--preload-file src/_testinternalcapi.py@/lib/python$(PYMAJOR).$(PYMINOR)/_testinternalcapi.py") \
+		$(if $(PYODIDE_BUILD), "", "--preload-file src/pystone.py@/lib/python$(PYMAJOR).$(PYMINOR)/pystone.py") \
 		--preload-file src/py/pyodide@/lib/python$(PYMAJOR).$(PYMINOR)/site-packages/pyodide \
 		--preload-file src/py/_pyodide@/lib/python$(PYMAJOR).$(PYMINOR)/site-packages/_pyodide \
 		--exclude-file "*__pycache__*" \
@@ -220,11 +227,9 @@ FORCE:
 check: $(UGLIFYJS)
 	./tools/dependency-check.sh
 
-
 minimal :
 	PYODIDE_PACKAGES+=",micropip" make
 
-
 debug :
 	EXTRA_CFLAGS+=" -D DEBUG_F" \
 	PYODIDE_PACKAGES+=", micropip, pyparsing, pytz, packaging, " \

cpython/Makefile

@@ -48,12 +48,15 @@ $(INSTALL)/lib/$(LIB): $(BUILD)/$(LIB) remove_modules$(PYODIDE_BUILD).txt
 	rm pybuilddir.txt
 	cd $(INSTALL)/lib/python$(PYMAJOR).$(PYMINOR)/ && rm -rf `cat $(ROOT)/remove_modules$(PYODIDE_BUILD).txt`
 	\
-	# try to run pyminify; If this fails, pyminify is not available. Check your Docker container version!
+	# try to run pyminify --version;
+	# If this fails, pyminify is not available.
 	pyminify --version >/dev/null 2>&1
-	for py in `find $(INSTALL)/lib/python$(PYMAJOR).$(PYMINOR) -name "*.py"`; \
-		do echo "Minifying $${py}..."; \
-		pyminify --remove-literal-statements $${py} > $${py}.min; mv $${py}.min $${py}; \
-	done
+	if [ "$(PYODIDE_BUILD)" ]; then \
+		for py in `find $(INSTALL)/lib/python$(PYMAJOR).$(PYMINOR) -name "*.py"`; \
+			do echo "Minifying $${py}..."; \
+			pyminify --remove-literal-statements $${py} > $${py}.min; mv $${py}.min $${py}; \
+		done \
+	fi
 
 
 clean:

cpython/remove_modules_nano.txt

@@ -33,7 +33,6 @@ crypt.py
 dataclasses.py
 decimal.py
 difflib.py
-distutils
 doctest.py
 dummy_threading.py
 _dummy_thread.py