~ chicken-core (chicken-5) 2344ce2a2a8ee409978208e15e5b0c4031e89a1d
commit 2344ce2a2a8ee409978208e15e5b0c4031e89a1d Author: Peter Bex <peter@more-magic.net> AuthorDate: Sat Aug 29 18:44:26 2015 +0200 Commit: Peter Bex <peter@more-magic.net> CommitDate: Sat Aug 29 18:47:55 2015 +0200 Fix "identify.sh" for release and snapshot builds. This is a bit of a hack: check whether the manual-html directory exists and assume it must be a distribution build, then exit to avoid a rebuild which requires a pre-existing chicken. Changeset 4e1f7272a3536dd93577c71f0a8bad16dab2a308 (for "allowing custom builds") caused this breakage. diff --git a/identify.sh b/identify.sh index 5781991e..0a398d12 100755 --- a/identify.sh +++ b/identify.sh @@ -21,6 +21,10 @@ if test -d "$1/.git"; then rev=`GIT_DIR="$1/.git" git rev-parse --short HEAD 2>/dev/null` branchname=`GIT_DIR="$1/.git" git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'` tag="#define C_BUILD_TAG \"compiled ${buildtime} on ${host} (${usys})\"" +elif test -d "$1/manual-html"; then + # Assume this is a snapshot or release build; don't touch + # identifying files to avoid a rebuild which needs chicken + exit else branchname=${branchname:-"custom"} tag=${tag:-"#define C_BUILD_TAG \"compiled ${buildtime} on ${host} (${usys})\""}Trap