Change how $deft-version is managed.

Use the git config filter mechanism instead of a Makefile hack.  Each dev needs to run
these two commands in the top-level repo directory once per clone:

  git config filter.version.smudge ./scripts/version-smudge.sh
  git config filter.version.clean ./scripts/version-clean.sh

Author: cgay

.gitattributes

@@ -0,0 +1,5 @@
+# To actually use this filter you must run the following commands in the top-level Def directory.
+#   git config filter.version.smudge ./scripts/version-smudge.sh
+#   git config filter.version.clean ./scripts/version-clean.sh
+# There is no way to configure that for all users of the repo.
+sources/commands/utils.dylan filter=version

Makefile

@@ -1,24 +1,15 @@
-# Low-tech Makefile to build and install deft.
+# Low-tech Makefile to build and install deft. You will need a working "dylan" binary on
+# your PATH somewhere.
 
 DYLAN		?= $${HOME}/dylan
 
 .PHONY: build clean install remove-deft-artifacts test dist distclean
 
 git_version := $(shell git describe --tags --always --match 'v*')
 
-# Hack to add the version to the binary with Git tag info. During development I (cgay)
-# just build with "deft build" so the unnecessary rebuilds that this would cause aren't
-# an issue.
 build:
 	dylan update
-	file="sources/commands/utils.dylan"; \
-	  orig=$$(mktemp); \
-	  temp=$$(mktemp); \
-	  cp -p $${file} $${orig}; \
-	  cat $${file} | sed "s,/.__./.*/.__./,/*__*/ \"${git_version}\ built on $$(date -Iseconds)\" /*__*/,g" > $${temp}; \
-	  mv $${temp} $${file}; \
-	  OPEN_DYLAN_USER_REGISTRIES=${PWD}/registry dylan-compiler -build deft-app; \
-	  cp -p $${orig} $${file}
+	dylan build deft-app
 
 install: build
 	mkdir -p $(DYLAN)/bin
@@ -36,8 +27,7 @@ install: build
 
 test:
 	dylan update
-	OPEN_DYLAN_USER_REGISTRIES=${PWD}/registry dylan-compiler -build deft-test-suite \
-	  && _build/bin/deft-test-suite
+	dylan build deft-test-suite && _build/bin/deft-test-suite
 
 dist: distclean install
 

scripts/version-clean.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "$(date -Iseconds) clean $(pwd)" >> /tmp/version.log
+sed "s,\"v.*built on.*\",\"DEVELOPMENT_VERSION\",g"

scripts/version-smudge.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+git_version="$(git describe --tags --always --match 'v*')"
+date="$(date -Iseconds)"
+echo "$(date -Iseconds) smudge $(pwd)" >> /tmp/version.log
+sed "s,DEVELOPMENT_VERSION,${git_version} built on ${date},g"

sources/commands/utils.dylan

@@ -2,18 +2,14 @@ Module: deft
 Synopsis: Utilities for use by deft commands
 
 
-// The Makefile replaces this string with the actual tagged version before
-// building. DON'T MOVE THE /*__*/ MARKERS since they're part of the regex.
-// Using the comment markers enables recovery if someone commits a string
-// other than "HEAD" by accident. git's `ident` attribute doesn't use tag
-// names and `filter` looks more complex than it's worth.
-define constant $deft-version :: <string> = /*__*/ "HEAD" /*__*/;
+// This string is replaced by Git filters on checkout. See the .gitattributes file.
+define constant $deft-version :: <string> = "DEVELOPMENT_VERSION";
 
 
-// Run an executable or shell command. `command` may be a string or a sequence
-// of strings. If a string it is run with `/bin/sh -c`. If a sequence of
-// strings the first element is the executable pathname. Returns the exit
-// status of the command and the combined output to stdout and stderr.
+// Run an executable or shell command. `command` may be a string or a sequence of
+// strings. If a string it is run with `/bin/sh -c`. If a sequence of strings the first
+// element is the executable pathname. Returns the exit status of the command and the
+// combined output to stdout and stderr.
 define function run
     (command :: <seq>, #key working-directory :: false-or(<directory-locator>))
  => (status :: <int>, output :: <string>)