Merge remote branch 'origin/master'

* origin/master:
  minimal-do: deal with 'clean.do' operations better.
  Add --version flag to `redo`.

install.do

@@ -12,7 +12,7 @@ redo-ifchange _all
 echo "Installing to: $DESTDIR$PREFIX"
 
 # make dirs
-$INSTALL -d $MANDIR/man1 $DOCDIR $BINDIR $LIBDIR
+$INSTALL -d $MANDIR/man1 $DOCDIR $BINDIR $LIBDIR $LIBDIR/version
 
 # docs
 for d in Documentation/*.1; do
@@ -22,7 +22,7 @@ done
 $INSTALL -m 0644 README.md $DOCDIR
 
 # .py files (precompiled to .pyc files for speed)
-for d in *.py; do
+for d in *.py version/*.py; do
 	fix=$(echo $d | sed 's,-,_,g')
 	$INSTALL -m 0644 $d $LIBDIR/$fix
 done

minimal/do

@@ -110,7 +110,7 @@ _do()
 			echo "do: $TARGET: no .do file" >&2
 			return 1
 		fi
-		: >>"$TARGET.did"
+		[ ! -e "$DO_BUILD" ] || : >>"$TARGET.did"
 		( _run_dofile "$BASE" "$EXT" "$TARGET.tmp" )
 		RV=$?
 		if [ $RV != 0 ]; then
@@ -147,6 +147,7 @@ fi
 
 if [ -n "$DO_TOP" ]; 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

redo.py

@@ -14,12 +14,17 @@ k,keep-going  keep going as long as possible even if some targets fail
 shuffle    randomize the build order to find dependency bugs
 debug-locks  print messages about file locking (useful for debugging)
 debug-pids   print process ids as part of log messages (useful for debugging)
+version    print the current version and exit
 """
 o = options.Options('redo', optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 targets = extra or ['all']
 
+if opt.version:
+    import version
+    print version.TAG
+    sys.exit(0)
 if opt.debug:
     os.environ['REDO_DEBUG'] = str(opt.debug or 0)
 if opt.verbose: