Build: Derive build suffix from git tag data

This is for embedding "-alpha123" (etc) in builds; now builds that
aren't off a tag will have "-build-1234abc" based on the hash; this
was previously done for LKG builds via less general code.

The major/minor version are still sourced from src/config.inc

Author: inexorabletash

bin/bumpver

@@ -16,7 +16,13 @@ cd "$(dirname "$0")/.."
 
 vmajor=$(grep 'kDeskTopVersionMajor =' src/config.inc | sed -e 's/.* = //')
 vminor=$(grep 'kDeskTopVersionMinor =' src/config.inc | sed -e 's/.* = //')
-vsuffix=$(grep 'define kDeskTopVersionSuffix' src/config.inc | cut -d'"' -f2)
+
+gittag="$(git describe --abbrev=0 --tags)"
+case "$gittag" in
+  v*.*-*) vsuffix="-${gittag/#*-/}" ;;
+  *) echo "Last tag is '$gittag'; manually tag as vM.M-alpha0" 1>&2 ; exit 1 ;;
+esac
+
 lang=$(grep 'define kBuildLang' src/config.inc | cut -d'"' -f2)
 vtype=$(echo "$vsuffix" | sed -E -e 's/^-//' -e 's/[0-9]+$//')
 vrel=$(echo "$vsuffix" | sed -E -e 's/[^0-9]*//')
@@ -26,15 +32,13 @@ vrel=$(echo "$vsuffix" | sed -E -e 's/[^0-9]*//')
 
 vrel=`expr $vrel + 1`
 
-version=$(echo ${vmajor}.${vminor}-${vtype}${vrel})
+version="$(echo ${vmajor}.${vminor}-${vtype}${vrel})"
 
 # --------------------------------------------------
 echo "Bumping to ${version}..."
 
 bin/setlang "en"
 
-perl -pni -e "s/define kDeskTopVersionSuffix .*/define kDeskTopVersionSuffix \"-${vtype}${vrel}\"/" src/config.inc
-
 git commit -a -m "Bump version to ${version}" > /dev/null
 git tag "v${version}" > /dev/null
 

bin/lkg

@@ -4,13 +4,6 @@ set -e
 cd "$(dirname "$0")/.."
 source "bin/util.sh"
 
-# ============================================================
-# Tweak config
-
-git checkout src/config.inc
-hash=$(git rev-parse --short HEAD)
-perl -pni -e "s/define kDeskTopVersionSuffix .*/define kDeskTopVersionSuffix \"-build-${hash}\"/" src/config.inc
-
 # ============================================================
 # Do a build and package
 

bin/make_buildinfo_inc

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-# Generate `out/date.inc` based off last commit
+# Generate `out/buildinfo.inc` based off last commit and tag
 
 set -e
 cd "$(dirname "$0")/.."
+source "bin/util.sh"
 
-lang="$(egrep 'define kBuildLang' src/config.inc | cut -d'"' -f2)"
 resfile="src/common/res/common.res.${lang}"
 
 yyyy="$(git log -1 --format="%ad" --date=format:%Y)"
@@ -15,13 +15,16 @@ dd="$(git log -1 --format="%ad" --date=format:%d)"
 
 month="$(egrep "\bres_string_month_name_${mm}\b" "$resfile" | cut -d'"' -f2)"
 order="$(egrep "\bres_const_date_order\b" "$resfile" | cut -d' ' -f3)"
-
 if [ "$order" = "0" ]; then
     date="$month $dd, $yyyy"
 else
     date="$dd $month $yyyy"
 fi
 
+if [ "$supports_lowercase" != "1" ]; then
+  vsuffix="$(echo "$vsuffix" | tr 'a-z' 'A-Z')"
+fi
+
 OUTDIR="out"
 
 # Generate tmp file
@@ -31,6 +34,7 @@ kBuildYYYY = $yyyy
 kBuildYY   = $yy
 kBuildMM   = $mm
 kBuildDD   = $dd
+.define kDeskTopVersionSuffix "$vsuffix"
 EOF
 
 # Only generate real file if it doesn't exist or changed

bin/setlang

@@ -17,7 +17,6 @@ perl -pni \
 if [ "$supports_lowercase" != "1" ]; then
   perl -pni \
        -e 's/(?<=define kDeskTopProductName )"(.*)"/"\U$1\E"/;' \
-       -e 's/(?<=define kDeskTopVersionSuffix )"(.*)"/"\U$1\E"/;' \
        src/config.inc
 fi
 

bin/util.sh

@@ -73,9 +73,19 @@ fini_progress () {
 # ============================================================
 # Extract metadata for the build
 
+lang=$(grep 'define kBuildLang' src/config.inc | cut -d'"' -f2)
+decoded_a=$(echo 'a' | bin/transcode.pl decode $lang)
+supports_lowercase=$(if [ "$decoded_a" == "a" ]; then echo 1; else echo 0; fi);
+
 vmajor=$(grep 'kDeskTopVersionMajor =' src/config.inc | sed -e 's/.* = //')
 vminor=$(grep 'kDeskTopVersionMinor =' src/config.inc | sed -e 's/.* = //')
-vsuffix=$(grep 'define kDeskTopVersionSuffix' src/config.inc | cut -d'"' -f2)
-lang=$(grep 'define kBuildLang' src/config.inc | cut -d'"' -f2)
+
+# vsuffix is like "-alpha123" (current tag), "-build-abc1234" (hash), "" (release)
+gittag="$(git describe --tags --exact-match 2> /dev/null || true)"
+case "$gittag" in
+  v*.*-*) vsuffix="-${gittag/#*-/}" ;;
+  v*.*) vsuffix="";;
+  *) vsuffix="-build-$(git rev-parse --short HEAD)" ;;
+esac
+
 version=$(echo ${vmajor}.${vminor}${vsuffix}-${lang})
-supports_lowercase=$(grep 'define kBuildSupportsLowercase' src/config.inc | cut -d' ' -f3)

src/config.inc

@@ -15,7 +15,6 @@
 .define kDeskTopProductName "Apple II DeskTop"
 kDeskTopVersionMajor = 1
 kDeskTopVersionMinor = 6
-.define kDeskTopVersionSuffix "-alpha0"
 
 .include "../out/buildinfo.inc"