Build: Derive build date from last commit

Rather than requiring bin/setdate to run to update timestamps, make
the included date dynamic and based on the last commit. This should be
equally stable builds, but also update more frequently.

Requires some Makefile trickery, so fingers crossed.

Author: inexorabletash

bin/README.md

@@ -18,8 +18,8 @@
   * Generates a set of disk images for distribution.
 * [roll](roll)
   * Updates external dependencies.
-* [setdate](setdate)
-  * Updates the config with the current date.
+* [make_builddate_inc](make_builddate_inc)
+  * Generates include file containing the last commit date.
 * [setlang](setlang)
   * Updates the config to build the specified language.
 * [setopt](setopt)
@@ -59,6 +59,8 @@
   * Shows the size of the Main and Aux segments of all desk accessories.
 * [endproc.pl](endproc.pl)
   * Applies the coding style guidelines for `.endproc` comments.
+* [mametest](mametest)
+  * Runs Lua test scripts from `tests/` in MAME.
 * [md5](md5)
   * Generates MD5 checksums for all built files. Useful for ensuring a change does not alter the binaries in any way.
 * [stats.pl](stats.pl)

bin/lkg

@@ -8,7 +8,6 @@ source "bin/util.sh"
 # Tweak config
 
 git checkout src/config.inc
-bin/setdate en
 hash=$(git rev-parse --short HEAD)
 perl -pni -e "s/define kDeskTopVersionSuffix .*/define kDeskTopVersionSuffix \"-build-${hash}\"/" src/config.inc
 

bin/make_builddate_inc

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+# Generate `out/date.inc` based off last commit
+
+set -e
+cd "$(dirname "$0")/.."
+
+lang="$(egrep 'define kBuildLang' src/config.inc | cut -d'"' -f2)"
+
+yyyy="$(git log -1 --format="%ad" --date=format:%Y)"
+yy="$(git log -1 --format="%ad" --date=format:%y)"
+mm="$(git log -1 --format="%ad" --date=format:%m)"
+dd="$(git log -1 --format="%ad" --date=format:%d)"
+
+month=$(egrep "\bres_string_month_name_${mm}\b" "src/common/res/common.res.${lang}" | cut -d'"' -f2)
+order=$(egrep "\bres_const_date_order\b" "src/common/res/common.res.${lang}" | cut -d' ' -f3)
+
+if [ "$order" = "0" ]; then
+    date="$month $dd, $yyyy"
+else
+    date="$dd $month $yyyy"
+fi
+
+OUTDIR="out"
+
+# Generate tmp file
+cat > $OUTDIR/builddate.inc.tmp  <<EOF
+.define kBuildDate "$date"
+kBuildYYYY = $yyyy
+kBuildYY   = $yy
+kBuildMM   = $mm
+kBuildDD   = $dd
+EOF
+
+# Only generate real file if it doesn't exist or changed
+if [ -r $OUTDIR/builddate.inc ]; then
+  cmp --silent $OUTDIR/builddate.inc.tmp $OUTDIR/builddate.inc || \
+    mv -f $OUTDIR/builddate.inc.tmp $OUTDIR/builddate.inc
+else
+  mv -f $OUTDIR/builddate.inc.tmp $OUTDIR/builddate.inc
+fi

bin/setdate

@@ -7,7 +7,6 @@ test $# -eq 1 || (echo "Usage: $0 LANG"; exit 1)
 lang=$1
 decoded_a=$(echo 'a' | bin/transcode.pl decode $lang)
 supports_lowercase=$(if [ "$decoded_a" == "a" ]; then echo 1; else echo 0; fi);
-date=$(bin/setdate $lang)
 
 git checkout src/config.inc
 perl -pni \
@@ -23,4 +22,3 @@ if [ "$supports_lowercase" != "1" ]; then
 fi
 
 echo Set lang to: $lang
-bin/setdate $lang

bin/setlang

@@ -7,9 +7,13 @@ LDFLAGS = --config ../common/asm.cfg --warnings-as-errors
 # Each directory builds into an 'out' sibling dir:
 OUTDIR = ../../out
 
+BINDIR = ../../bin
+
 # Evaluated relative to each Makefile - include, library, and resource files
-COMMON_HEADERS = $(wildcard ../*.inc ../inc/*.inc *.inc inc/*.inc) \
-	$(wildcard ../lib/*.s) \
+COMMON_HEADERS = \
+	../config.inc $(OUTDIR)/builddate.inc ../common.inc \
+	$(wildcard ../inc/*.inc *.inc) \
+	$(wildcard ../lib/*.s ../lib/*.inc) \
 	$(wildcard res/*.res.?? ../common/res/*.res.??)
 
 LANGS = da de en es fr it nl pt sv bg
@@ -18,6 +22,9 @@ MONO_FONTS = $(foreach LANG,$(LANGS),$(OUTDIR)/Monaco.$(LANG).font)
 
 ### Build Rules
 
+# Nothing here should be default
+.DEFAULT_GOAL := all
+
 # Object files
 $(OUTDIR)/%.o: %.s $(HEADERS)
 	ca65 $(CAFLAGS) --listing $(basename $@).list -o $@ $<
@@ -33,5 +40,12 @@ $(OUTDIR)/%.SYS: $(OUTDIR)/%.o ../common/asm.cfg
 # Fonts
 .SECONDEXPANSION:
 $(OUTDIR)/%.font: ../../res/fonts/$$(basename $$*).unicode.txt
-	../../bin/build_font_from_unicode_txt.pl $(subst .,,$(suffix $*)) < ../../res/fonts/$(basename $*).unicode.txt > $@
+	$(BINDIR)/build_font_from_unicode_txt.pl $(subst .,,$(suffix $*)) < ../../res/fonts/$(basename $*).unicode.txt > $@
 .NOTINTERMEDIATE: $(SYS_FONTS) $(MONO_FONTS)
+
+# Build Date
+$(OUTDIR)/builddate.inc: FORCE
+	@$(BINDIR)/make_builddate_inc
+
+FORCE:
+

src/common/Makefile.common

@@ -16,11 +16,8 @@
 kDeskTopVersionMajor = 1
 kDeskTopVersionMinor = 6
 .define kDeskTopVersionSuffix "-alpha0"
-.define kBuildDate "November 13, 2025"
-kBuildYYYY = 2025
-kBuildYY = 25
-kBuildMM = 11
-kBuildDD = 13
+
+.include "../out/builddate.inc"
 
 ;;; Localization - applies language suffix to filename
 

src/config.inc

@@ -22,4 +22,6 @@ clean:
 	rm -f $(OUTDIR)/*.o
 	rm -f $(OUTDIR)/*.list
 	rm -f $(OUTDIR)/*.font
+	rm -f $(OUTDIR)/*.inc
+	rm -f $(OUTDIR)/*.tmp
 	rm -f $(TARGETS)

src/desk.acc/Makefile

@@ -1722,7 +1722,7 @@ str_a2hr_suffix:
 
         .include "../lib/uppercase.s"
         .include "../inc/hires_table.inc"
-        .include "inc/hr_to_dhr.inc"
+        .include "hr_to_dhr.inc"
 
 .proc LZ4FH
         .include "../lib/lz4fh6502.s"