Fixup! [sh] Self-test python builder

Author: Joppe

.py.mk

@@ -11,7 +11,12 @@ B ?= build/
 * ?= %
 
 # Default python interpreter
-PYTHON ?= $(shell command -v python3 || cygpath -m `which python.exe`)
+OSTYPE ?= $(shell echo $$OSTYPE)
+ifneq (,$(findstring $(OSTYPE),win32 msys cygwin))
+    PYTHON ?= $(shell cygpath -m `which python.exe`)
+else
+    PYTHON ?= $(shell command -v python3)
+endif
 
 # Python interpreter
 $/_PYTHON ?= $(PYTHON)
@@ -50,58 +55,42 @@ $/$B$*.py.tested: $/$*.py $/$B$*.py.bringup
 	$< --test > $@
 
 
-### Document usage of this builder
+# self-test
+
+define FUNCTION
+def hello():
+    """
+    >>> hello()
+    Hello World!
+    """
+    print('Hello World!')
+endef
 
-# We are going build a python module with a doctest in a hello function available as a command line argument:
 define SH-TEST
 $$ cat build/test.py.tested
 All 1 python usage examples PASS
+All 0 command usage examples PASS
 
 $$ test.py
+NAME
+    test.py
 
-$$ test.py hello
-Hello World!
-
-$$ cat test.py
-
-endef
-
-# We are going verify all the command usages above:
-define SH-TEST.EXPECTED
-All 4 command usage examples PASS
-endef
+SYNOPSIS
+    test.py COMMAND
 
-# After bringup, these are the exact sections we expect to see in the module:
-define SHEBANG
-#!...python...
-
-endef
-define DEPENDENCIES
-"""
-Dependencies:
-pip
-"""
+COMMANDS
+    COMMAND is one of the following:
 
-endef
-define IMPORTS
-import make
-import pip
+     hello
+       >>> hello() Hello World!
 
-endef
-define FUNCTION
-def hello():
-    """
-    >>> hello()
-    Hello World!
-    """
-    print('Hello World!')
+$$ test.py hello
+Hello World!
 
 endef
-define CLI
-if __name__ == '__main__':
-    make.argparser.parse_known_args()
-    fire.fire(dict([(name, item) for name, item in globals().items() if callable(item)]))
 
+define SH-TEST.EXPECTED
+All 3 command usage examples PASS
 endef
 
 $/.py/build/:
@@ -111,33 +100,17 @@ $/.py/build/test.py.sh-test.expected: | $/.py/build/
 	$(file >$@,$(SH-TEST.EXPECTED))
 
 $/.py/build/test.py.sh-test: | $/.py/build/
-	$(file >$@,$(SH-TEST)$(SHEBANG)$(DEPENDENCIES)$(IMPORTS)$(FUNCTION)$(CLI))
+	$(file >$@,$(SH-TEST))
 
 $/.py/test.py: $/.py/build/test.py.sh-test | $/.py/build/
 	$(file >$@,$(FUNCTION))
 
-# Put the bare function into test.py and verify that make.py test.py --shebang inserts make into it:
 $/.py/build/test.py.tested: $/.py/test.py $/.py.mk $/make.py | $/.py/
-	@echo
-	# Self-tested source code:
-	cat $<
-	@echo
-	# The Makefile for .py source code:
 	ln -sf ../.py.mk $|Makefile
-	@echo
-	# The python module that Makefile needs:
 	ln -sf ../make.py $|make.py
-	@echo
-	# Now building $@
 	(cd $| && make tested)
 
-# Verify
-$/.py/build/test.py.sh-test.tested: $/.py/build/test.py.sh-test \
-  $/.py/build/test.py.tested $/.py/build/test.py.sh-test.expected | $/.py/
-	@echo
-	# Expected command line usage:
-	cat $<
-	@echo
-	# Now verifying that
-	(cd $| && test.py --sh-test $<) > $@ && \
+$/.py/build/test.py.sh-test.tested: $/.py/test.py $/.py/build/test.py.tested \
+  $/.py/build/test.py.sh-test $/.py/build/test.py.sh-test.expected
+	$< --sh-test $(word 3,$^) > $@ && \
 	diff -u $(lastword $^) $@