From 0b5ea4f865da8056ea09e1aca2e7e9c89ed416a6 Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Fri, 22 Jan 2010 01:41:48 +0100 Subject: [PATCH] Fix include/serno.h generation. Apparently #value# is no longer special in hg templates. --- scripts/application.sh | 2 +- scripts/makerelease.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/application.sh b/scripts/application.sh index 203bb640..d97fef17 100755 --- a/scripts/application.sh +++ b/scripts/application.sh @@ -25,7 +25,7 @@ if [ "x$TIP" = "x" ]; then fi # Charybdis wants the hg tip to be in include/serno.h, in its own format. -MYTIP=`hg parents --template '#date|shortdate#_#node|short#' 2>/dev/null | sed -e s/-//g -e s/_/-/` +MYTIP=`hg parents --template '{date|shortdate}_{node|short}' 2>/dev/null | sed -e s/-//g -e s/_/-/` echo "[charybdis] Generating include/serno.h for tip $MYTIP." cat << _EOF_ > include/serno.h /* Generated automatically by makepackage. Any changes made here will be lost. */ diff --git a/scripts/makerelease.sh b/scripts/makerelease.sh index 209ff697..7b3fc276 100755 --- a/scripts/makerelease.sh +++ b/scripts/makerelease.sh @@ -30,7 +30,7 @@ if [ "x$2" = "x--automatic" ]; then AUTOMATIC="yes" fi -TIP=`hg tip --template "#rev#:#node|short#"` +TIP=`hg parents --template "{rev}:{node|short}"` WRKDIR=`pwd`