Switch to apenwarr's `redo`

.gitignore

@@ -1,4 +1,5 @@
 .nyc_output/
+.redo/
 coverage/
 dist/
 lib/
@@ -6,3 +7,7 @@ node_modules/
 scratch/
 
 package-lock.json
+
+*.did
+.do_built
+.do_built.dir/

.npmignore

@@ -0,0 +1,3 @@
+*.did
+.do_built
+.do_built.dir

all.do

@@ -0,0 +1 @@
+for p in packages/*; do [ -f $p/all.do ] && echo $p/all; done | xargs redo-ifchange

bootstrap

@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -d node_modules/lerna ] || npm i .
+npx lerna bootstrap

clean.do

@@ -0,0 +1 @@
+for p in packages/*; do [ -f $p/clean.do ] && echo $p/clean; done | xargs redo

do

@@ -0,0 +1,368 @@
+#!/bin/sh
+#
+# A minimal alternative to djb redo that doesn't support incremental builds.
+# For the full version, visit http://github.com/apenwarr/redo
+#
+# The author disclaims copyright to this source file and hereby places it in
+# the public domain. (2010 12 14; updated 2018 10 31)
+#
+USAGE="
+usage: $0 [-d] [-x] [-v] [-c] <targets...>
+  -d  print extra debug messages (mostly about dependency checks)
+  -v  run .do files with 'set -v'
+  -x  run .do files with 'set -x'
+  -c  clean up all old targets before starting
+
+  Note: $0 is an implementation of redo that does *not* check dependencies.
+  It will never rebuild a target it has already built, unless you use -c.
+"
+
+# By default, no output coloring.
+green=""
+bold=""
+plain=""
+
+if [ -n "$TERM" -a "$TERM" != "dumb" ] && tty <&2 >/dev/null 2>&1; then
+	green="$(printf '\033[32m')"
+	bold="$(printf '\033[1m')"
+	plain="$(printf '\033[m')"
+fi
+
+# Split $1 into a dir part ($_dirsplit_dir) and base filename ($_dirsplit_base)
+_dirsplit()
+{
+	_dirsplit_base=${1##*/}
+	_dirsplit_dir=${1%$_dirsplit_base}
+}
+
+# Like /usr/bin/dirname, but avoids a fork and uses _dirsplit semantics.
+dirname()
+(
+	_dirsplit "$1"
+	dir=${_dirsplit_dir%/}
+	echo "${dir:-.}"
+)
+
+_dirsplit "$0"
+export REDO=$(cd "${_dirsplit_dir:-.}" && echo "$PWD/$_dirsplit_base")
+_cmd=$_dirsplit_base
+
+DO_TOP=
+if [ -z "$DO_BUILT" ]; then
+	export _do_opt_debug=
+	export _do_opt_exec=
+	export _do_opt_verbose=
+	export _do_opt_clean=
+fi
+while getopts 'dxvch?' _opt; do
+	case $_opt in
+		d) _do_opt_debug=1 ;;
+		x) _do_opt_exec=x ;;
+		v) _do_opt_verbose=v ;;
+		c) _do_opt_clean=1 ;;
+		\?|h|*) printf "%s" "$USAGE" >&2
+		   exit 99
+		   ;;
+	esac
+done
+shift "$((OPTIND - 1))"
+_debug() {
+	[ -z "$_do_opt_debug" ] || echo "$@" >&2
+}
+
+if [ -z "$DO_BUILT" -a "$_cmd" != "redo-whichdo" ]; then
+	DO_TOP=1
+	if [ "$#" -eq 0 ] && [ "$_cmd" = "do" -o "$_cmd" = "redo" ]; then
+		set all  # only toplevel redo has a default target
+	fi
+	export DO_BUILT=$PWD/.do_built
+	: >>"$DO_BUILT"
+	sort -u "$DO_BUILT" >"$DO_BUILT.new"
+	echo "Cleaning up from previous run..." >&2
+	while read f; do
+		[ -n "$_do_opt_clean" ] && printf "%s\0%s.did\0" "$f" "$f"
+		printf "%s.did.tmp\0" "$f"
+	done <"$DO_BUILT.new" |
+	xargs -0 rm -f 2>/dev/null
+	mv "$DO_BUILT.new" "$DO_BUILT"
+	DO_PATH=$DO_BUILT.dir
+	export PATH=$DO_PATH:$PATH
+	rm -rf "$DO_PATH"
+	mkdir "$DO_PATH"
+	for d in redo redo-ifchange redo-whichdo; do
+		ln -s "$REDO" "$DO_PATH/$d"
+	done
+	[ -e /bin/true ] && TRUE=/bin/true || TRUE=/usr/bin/true
+	for d in redo-ifcreate redo-stamp redo-always redo-ood \
+	    redo-targets redo-sources; do
+		ln -s $TRUE "$DO_PATH/$d"
+	done
+fi
+
+
+# Chop the "file" part off a /path/to/file pathname.
+# Note that if the filename already ends in a /, we just remove the slash.
+_updir()
+{
+	local v="${1%/*}"
+	[ "$v" != "$1" ] && echo "$v"
+	# else "empty" which means we went past the root
+}
+
+
+# Returns true if $1 starts with $2.
+_startswith()
+{
+	[ "${1#"$2"}" != "$1" ]
+}
+
+
+# Returns true if $1 ends with $2.
+_endswith()
+{
+	[ "${1%"$2"}" != "$1" ]
+}
+
+
+# Prints $1 as a path relative to $PWD (not starting with /).
+# If it already doesn't start with a /, doesn't change the string.
+_relpath()
+{
+	local here="$(command pwd)" there="$1" out= hadslash=
+	#echo "RP start '$there' hs='$hadslash'" >&2
+	_startswith "$there" "/" || { echo "$there" && return; }
+	[ "$there" != "/" ] && _endswith "$there" "/" && hadslash=/
+	here=${here%/}/
+	while [ -n "$here" ]; do
+		#echo "RP out='$out' here='$here' there='$there'" >&2
+		[ "${here%/}" = "${there%/}" ] && there= && break;
+		[ "${there#$here}" != "$there" ] && break
+		out=../$out
+		_dirsplit "${here%/}"
+		here=$_dirsplit_dir
+	done
+	there=${there#$here}
+	if [ -n "$there" ]; then
+		echo "$out${there%/}$hadslash"
+	else
+		echo "${out%/}$hadslash"
+	fi
+}
+
+
+# Prints a "normalized relative" path, with ".." resolved where possible.
+# For example, a/b/../c will be reduced to just a/c.
+_normpath()
+(
+	local path="$1" out= isabs=
+	#echo "NP start '$path'" >&2
+	if _startswith "$path" "/"; then
+		isabs=1
+	else
+		path="${PWD%/}/$path"
+	fi
+	set -f
+	IFS=/
+	for d in $path; do
+		#echo "NP out='$out' d='$d'" >&2
+		if [ "$d" = ".." ]; then
+			out=$(_updir "${out%/}")/
+		else
+			out=$out$d/
+		fi
+	done
+	#echo "NP out='$out' (done)" >&2
+	out=${out%/}
+	if [ -n "$isabs" ]; then
+		echo "${out:-/}"
+	else
+		_relpath "${out:-/}"
+	fi
+)
+
+
+# List the possible names for default*.do files in dir $1 matching the target
+# pattern in $2.  We stop searching when we find the first one that exists.
+_find_dofiles_pwd()
+{
+	local dodir="$1" dofile="$2"
+	_startswith "$dofile" "default." || dofile=${dofile#*.}
+	while :; do
+		dofile=default.${dofile#default.*.}
+		echo "$dodir$dofile"
+		[ -e "$dodir$dofile" ] && return 0
+		[ "$dofile" = default.do ] && break
+	done
+	return 1
+}
+
+
+# List the possible names for default*.do files in $PWD matching the target
+# pattern in $1.  We stop searching when we find the first name that works.
+# If there are no matches in $PWD, we'll search in .., and so on, to the root.
+_find_dofiles()
+{
+	local target="$1" dodir= dofile= newdir=
+	_debug "find_dofile: '$PWD' '$target'"
+	dofile="$target.do"
+	echo "$dofile"
+	[ -e "$dofile" ] && return 0
+
+	# Try default.*.do files, walking up the tree
+	_dirsplit "$dofile"
+	dodir=$_dirsplit_dir
+	dofile=$_dirsplit_base
+	[ -n "$dodir" ] && dodir=${dodir%/}/
+	[ -e "$dodir$dofile" ] && return 0
+	for i in $(seq 100); do
+		[ -n "$dodir" ] && dodir=${dodir%/}/
+		#echo "_find_dofiles: '$dodir' '$dofile'" >&2
+		_find_dofiles_pwd "$dodir" "$dofile" && return 0
+		newdir=$(_normpath "${dodir}..")
+		[ "$newdir" = "$dodir" ] && break
+		dodir=$newdir
+	done
+	return 1
+}
+
+
+# Print the last .do file returned by _find_dofiles.
+# If that file exists, returns 0, else 1.
+_find_dofile()
+{
+	local files="$(_find_dofiles "$1")"
+	rv=$?
+	#echo "files='$files'" >&2
+	[ "$rv" -ne 0 ] && return $rv
+	echo "$files" | {
+		while read -r linex; do line=$linex; done
+		printf "%s\n" "$line"
+	}
+}
+
+
+# Actually run the given $dofile with the arguments in $@.
+# Note: you should always run this in a subshell.
+_run_dofile()
+{
+	export DO_DEPTH="$DO_DEPTH  "
+	export REDO_TARGET="$PWD/$target"
+	local line1
+	set -e
+	read line1 <"$PWD/$dofile" || true
+	cmd=${line1#"#!/"}
+	if [ "$cmd" != "$line1" ]; then
+		set -$_do_opt_verbose$_do_opt_exec
+		exec /$cmd "$PWD/$dofile" "$@" >"$tmp.tmp2"
+	else
+		set -$_do_opt_verbose$_do_opt_exec
+		:; . "$PWD/$dofile" >"$tmp.tmp2"
+	fi
+}
+
+
+# Find and run the right .do file, starting in dir $1, for target $2, using
+# filename $3 as the temporary output file.  Renames the temp file to $2 when
+# done.
+_do()
+{
+	local dir="$1" target="$2" tmp="$3" dopath= dodir= dofile= ext=
+	if [ "$_cmd" = "redo" ] ||
+	    ( [ ! -e "$target" -o -d "$target" ] &&
+	      [ ! -e "$target.did" ] ); then
+		printf '%sdo  %s%s%s%s\n' \
+			"$green" "$DO_DEPTH" "$bold" "$dir$target" "$plain" >&2
+		dopath=$(_find_dofile "$target")
+		if [ ! -e "$dopath" ]; then
+			echo "do: $target: no .do file ($PWD)" >&2
+			return 1
+		fi
+		_dirsplit "$dopath"
+		dodir=$_dirsplit_dir dofile=$_dirsplit_base
+		if _startswith "$dofile" "default."; then
+			ext=${dofile#default}
+			ext=${ext%.do}
+		else
+			ext=
+		fi
+		target=$PWD/$target
+		tmp=$PWD/$tmp
+		cd "$dodir" || return 99
+		target=$(_relpath "$target") || return 98
+		tmp=$(_relpath "$tmp") || return 97
+		base=${target%$ext}
+		[ ! -e "$DO_BUILT" ] || [ ! -d "$(dirname "$target")" ] ||
+		: >>"$target.did.tmp"
+		( _run_dofile "$target" "$base" "$tmp.tmp" )
+		rv=$?
+		if [ $rv != 0 ]; then
+			printf "do: %s%s\n" "$DO_DEPTH" \
+				"$dir$target: got exit code $rv" >&2
+			rm -f "$tmp.tmp" "$tmp.tmp2" "$target.did"
+			return $rv
+		fi
+		echo "$PWD/$target" >>"$DO_BUILT"
+		mv "$tmp.tmp" "$target" 2>/dev/null ||
+		! test -s "$tmp.tmp2" ||
+		mv "$tmp.tmp2" "$target" 2>/dev/null
+		[ -e "$target.did.tmp" ] &&
+		mv "$target.did.tmp" "$target.did" ||
+		: >>"$target.did"
+		rm -f "$tmp.tmp2"
+	else
+		_debug "do  $DO_DEPTH$target exists." >&2
+	fi
+}
+
+
+# Make corrections for directories that don't actually exist yet.
+_dir_shovel()
+{
+	local dir base
+	xdir=$1 xbase=$2 xbasetmp=$2
+	while [ ! -d "$xdir" -a -n "$xdir" ]; do
+		_dirsplit "${xdir%/}"
+		xbasetmp=${_dirsplit_base}__$xbasetmp
+		xdir=$_dirsplit_dir xbase=$_dirsplit_base/$xbase
+	done
+	_debug "xbasetmp='$xbasetmp'" >&2
+}
+
+
+# Implementation of the "redo" command.
+_redo()
+{
+	set +e
+	for i in "$@"; do
+		_dirsplit "$i"
+		_dir_shovel "$_dirsplit_dir" "$_dirsplit_base"
+		dir=$xdir base=$xbase basetmp=$xbasetmp
+		( cd "$dir" && _do "$dir" "$base" "$basetmp" )
+		[ "$?" = 0 ] || return 1
+	done
+}
+
+
+# Implementation of the "redo-whichdo" command.
+_whichdo()
+{
+	_find_dofiles "$1"
+}
+
+
+case $_cmd in
+	do|redo|redo-ifchange) _redo "$@" ;;
+	redo-whichdo) _whichdo "$1" ;;
+	do.test) ;;
+	*) printf "$0: '%s': unexpected redo command" "$_cmd" >&2; exit 99 ;;
+esac
+[ "$?" = 0 ] || exit 1
+
+if [ -n "$DO_TOP" ]; then
+	if [ -n "$_do_opt_clean" ]; then
+		echo "Removing stamp files..." >&2
+		[ ! -e "$DO_BUILT" ] ||
+		while read f; do printf "%s.did\0" "$f"; done <"$DO_BUILT" |
+		xargs -0 rm -f 2>/dev/null
+	fi
+fi

packages/core/Makefile

@@ -1,13 +0,0 @@
-.PHONY:	all clean veryclean test
-
-all:
-	npm install .
-
-clean:
-	rm -f dist/*.js
-
-veryclean: clean
-	rm -rf node_modules/
-
-test:
-	npm test

packages/core/package.json

@@ -9,7 +9,6 @@
   },
   "repository": "github:syndicate-lang/syndicate-js",
   "scripts": {
-    "clean": "rm -f dist/*",
     "test": "mocha",
     "cover": "nyc --reporter=html mocha"
   },

packages/driver-browser-ui/Makefile

@@ -1,8 +0,0 @@
-.PHONY: build
-
-build:
-	mkdir -p lib
-	npx syndicate-babel src --out-dir lib
-
-clean:
-	rm -rf lib

packages/driver-browser-ui/all.do

@@ -0,0 +1 @@
+for d in src/*.js; do echo lib/$(basename $d); done | xargs redo-ifchange

packages/driver-browser-ui/clean.do

@@ -0,0 +1 @@
+rm -rf lib

packages/driver-browser-ui/default.js.do

@@ -0,0 +1,5 @@
+src=$(echo "$1" | sed -e 's:^lib/:src/:')
+[ -f ../syntax/all.do ] && redo-ifchange ../syntax/all
+redo-ifchange "$src"
+mkdir -p $(dirname "$1")
+npx syndicate-babel "$src"

packages/driver-browser-ui/package.json

@@ -10,7 +10,7 @@
     "access": "public"
   },
   "scripts": {
-    "prepare": "make build"
+    "prepare": "which redo >/dev/null && redo || ../../do"
   },
   "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-browser-ui",
   "devDependencies": {

packages/driver-http-node/Makefile

@@ -1,8 +0,0 @@
-.PHONY: build
-
-build:
-	mkdir -p lib
-	npx syndicate-babel src --out-dir lib
-
-clean:
-	rm -rf lib

packages/driver-http-node/all.do

@@ -0,0 +1 @@
+for d in src/*.js; do echo lib/$(basename $d); done | xargs redo-ifchange

packages/driver-http-node/clean.do

@@ -0,0 +1 @@
+rm -rf lib

packages/driver-http-node/default.js.do

@@ -0,0 +1,5 @@
+src=$(echo "$1" | sed -e 's:^lib/:src/:')
+[ -f ../syntax/all.do ] && redo-ifchange ../syntax/all
+redo-ifchange "$src"
+mkdir -p $(dirname "$1")
+npx syndicate-babel "$src"

packages/driver-http-node/package.json

@@ -10,7 +10,7 @@
     "access": "public"
   },
   "scripts": {
-    "prepare": "make build"
+    "prepare": "which redo >/dev/null && redo || ../../do"
   },
   "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-http-node",
   "devDependencies": {

packages/driver-timer/Makefile

@@ -1,8 +0,0 @@
-.PHONY: build
-
-build:
-	mkdir -p lib
-	npx syndicate-babel src --out-dir lib
-
-clean:
-	rm -rf lib

packages/driver-timer/all.do

@@ -0,0 +1 @@
+for d in src/*.js; do echo lib/$(basename $d); done | xargs redo-ifchange

packages/driver-timer/clean.do

@@ -0,0 +1 @@
+rm -rf lib

packages/driver-timer/default.js.do

@@ -0,0 +1,5 @@
+src=$(echo "$1" | sed -e 's:^lib/:src/:')
+[ -f ../syntax/all.do ] && redo-ifchange ../syntax/all
+redo-ifchange "$src"
+mkdir -p $(dirname "$1")
+npx syndicate-babel "$src"

packages/driver-timer/package.json

@@ -10,7 +10,7 @@
     "access": "public"
   },
   "scripts": {
-    "prepare": "make build"
+    "prepare": "which redo >/dev/null && redo || ../../do"
   },
   "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-timer",
   "devDependencies": {

packages/driver-udp-node/Makefile

@@ -1,8 +0,0 @@
-.PHONY: build
-
-build:
-	mkdir -p lib
-	npx syndicate-babel src --out-dir lib
-
-clean:
-	rm -rf lib

packages/driver-udp-node/all.do

@@ -0,0 +1 @@
+for d in src/*.js; do echo lib/$(basename $d); done | xargs redo-ifchange

packages/driver-udp-node/clean.do

@@ -0,0 +1 @@
+rm -rf lib

packages/driver-udp-node/default.js.do

@@ -0,0 +1,5 @@
+src=$(echo "$1" | sed -e 's:^lib/:src/:')
+[ -f ../syntax/all.do ] && redo-ifchange ../syntax/all
+redo-ifchange "$src"
+mkdir -p $(dirname "$1")
+npx syndicate-babel "$src"

packages/driver-udp-node/package.json

@@ -10,7 +10,7 @@
     "access": "public"
   },
   "scripts": {
-    "prepare": "make build"
+    "prepare": "which redo >/dev/null && redo || ../../do"
   },
   "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-udp-node",
   "devDependencies": {

packages/driver-websocket/Makefile

@@ -1,8 +0,0 @@
-.PHONY: build
-
-build:
-	mkdir -p lib
-	npx syndicate-babel src --out-dir lib
-
-clean:
-	rm -rf lib

packages/driver-websocket/all.do

@@ -0,0 +1 @@
+for d in src/*.js; do echo lib/$(basename $d); done | xargs redo-ifchange

packages/driver-websocket/clean.do

@@ -0,0 +1 @@
+rm -rf lib

packages/driver-websocket/default.js.do

@@ -0,0 +1,5 @@
+src=$(echo "$1" | sed -e 's:^lib/:src/:')
+[ -f ../syntax/all.do ] && redo-ifchange ../syntax/all
+redo-ifchange "$src"
+mkdir -p $(dirname "$1")
+npx syndicate-babel "$src"

packages/driver-websocket/package.json

@@ -10,7 +10,7 @@
     "access": "public"
   },
   "scripts": {
-    "prepare": "make build"
+    "prepare": "which redo >/dev/null && redo || ../../do"
   },
   "homepage": "https://github.com/syndicate-lang/syndicate-js/tree/master/packages/driver-websocket",
   "devDependencies": {

packages/syntax-playground/Makefile

@@ -1,11 +0,0 @@
-dist/main.js: lib $(wildcard lib/*.js)
-	mkdir -p dist
-	npx webpack
-
-lib: $(wildcard src/*.js)
-	mkdir -p $@
-	npx syndicate-babel src --out-dir $@
-
-clean:
-	rm -rf lib
-	rm -rf dist

packages/syntax-playground/all.do

@@ -0,0 +1,2 @@
+for d in src/*.js; do echo lib/$(basename $d); done | xargs redo-ifchange
+redo-ifchange dist/main.js

packages/syntax-playground/clean.do

@@ -0,0 +1,2 @@
+rm -rf lib
+rm -rf dist

packages/syntax-playground/default.js.do

@@ -0,0 +1,16 @@
+mkdir -p $(dirname "$1")
+case "$1" in
+    lib/*)
+        src=$(echo "$1" | sed -e 's:^lib/:src/:')
+        [ -f ../syntax/all.do ] && redo-ifchange ../syntax/all
+        redo-ifchange "$src"
+        mkdir -p $(dirname "$1")
+        npx syndicate-babel "$src"
+        ;;
+    dist/*)
+        for maybedep in $(npx webpack --json -o "$3" | jq -r '.modules[].identifier')
+        do
+            [ -f "$maybedep" ] && echo "$maybedep"
+        done | xargs redo-ifchange
+        ;;
+esac

packages/syntax/Makefile

@@ -1,9 +0,0 @@
-.PHONY: build
-
-build:
-	mkdir -p lib
-	cat node_modules/@babel/parser/lib/index.js babel_parser_suffix.js > lib/babel_parser.js
-	npx babel src --out-dir lib
-
-clean:
-	rm -rf lib

packages/syntax/all.do

@@ -0,0 +1,3 @@
+exec >&2
+redo-ifchange lib/babel_parser.js
+for d in src/*.js; do echo lib/$(basename $d); done | xargs redo-ifchange

packages/syntax/clean.do

@@ -0,0 +1 @@
+rm -rf lib

packages/syntax/default.js.do

@@ -0,0 +1,14 @@
+mkdir -p $(dirname "$1")
+case "$1" in
+    lib/babel_parser.js)
+        src=node_modules/@babel/parser/lib/index.js
+        [ -f "$src" ] || npm -i .
+        redo-ifchange "$src" babel_parser_suffix.js
+        cat "$src" babel_parser_suffix.js
+        ;;
+    *)
+        src=$(echo "$1" | sed -e 's:^lib/:src/:')
+        redo-ifchange "$src"
+        npx babel "$src"
+        ;;
+esac

packages/syntax/package.json

@@ -9,7 +9,7 @@
   "repository": "github:syndicate-lang/syndicate-js",
   "author": "Tony Garnock-Jones <tonyg@leastfixedpoint.com>",
   "scripts": {
-    "prepare": "make build"
+    "prepare": "which redo >/dev/null && redo || ../../do"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.1.0"