build: Better Git version info hack, don't --unify

The --unify flag still doesn't quite work because libgc.so can't be found.

Author: cgay

.github/workflows/test.yaml

@@ -28,13 +28,10 @@ jobs:
       - name: make install
         env:
           DYLAN: dylan-root
-        run: make install
+        run: |
+          deft update
+          make install
 
       - name: Run http-server --help
-        env:
-          DYLAN: dylan-root
-          LD_LIBRARY_PATH: _od/opendylan-2024.1/lib
         run: |
-          ls -l dylan-root/bin/
-          find . -name '*unwind*'
           dylan-root/bin/http-server --help

Makefile

@@ -3,26 +3,31 @@
 # "http-server". The expectation is that during development people will use `deft build`
 # or `deft test`.
 
-# TODO: use the .gitattributes filtering that Deft uses instead of this version hack.
-
 DYLAN		?= $${HOME}/dylan
 
 .PHONY: build clean install
 
-build:
+git_version := $(shell git describe --tags --always --match 'v*')
+
+# We assume `deft update` is invoked manually before running make.
+
+build: common/*.dylan common/*.lid server/*/*.dylan server/*/*.lid
 	file="server/core/server.dylan"; \
-	backup=$$(mktemp); \
-	temp=$$(mktemp); \
-	cp -p $${file} $${backup}; \
-	cat $${file} | sed "s,/.__./.*/.__./,/*__*/ \"$$(git describe --always --tags)\" /*__*/,g" > $${temp}; \
-	mv $${temp} $${file}; \
-	dylan update; \
-	dylan build --unify http-server-app; \
-	cp -p $${backup} $${file}
+	  orig=$$(mktemp); \
+	  temp=$$(mktemp); \
+	  cp -p $${file} $${orig}; \
+	  cat $${file} | sed "s|_NO_VERSION_SET_|${git_version} built on $$(date -Iseconds)|g" > $${temp}; \
+	  mv $${temp} $${file}; \
+	  deft build http-server-app; \
+	  cp -p $${orig} $${file}
 
 install: build
 	mkdir -p $(DYLAN)/bin
-	cp _build/sbin/http-server-app $(DYLAN)/bin/http-server
+	mkdir -p $(DYLAN)/install/http/bin
+	mkdir -p $(DYLAN)/install/http/lib
+	cp _build/bin/http-server-app $(DYLAN)/install/http/bin/http-server
+	cp -r _build/lib/lib* $(DYLAN)/install/http/lib/
+	ln -s -f $$(realpath $(DYLAN)/install/http/bin/http-server) $(DYLAN)/bin/http-server
 
 clean:
-	rm -rf _build registry
+	rm -rf _build _packages registry

server/core/server.dylan

@@ -8,12 +8,8 @@ Copyright: See LICENSE in this distribution for details.
 // sort of connotes slowness (?) so I stopped using it.
 define constant $server-name = "Dylan HTTP Server";
 
-// The Makefile replaces EVERYTHING BETWEEN THE /*__*/ MARKERS with the actual
-// tagged version before building, so don't move them.  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 $server-version :: <string> = /*__*/ "HEAD" /*__*/;
+// The Makefile replaces this string with Git version info before building.
+define constant $server-version :: <string> = "_NO_VERSION_SET_";
 
 // This is needed to handle sockets shutdown.
 define variable *exiting-application* = #f;