changeset 972:d66ab756c75b

Change the way the version is printed (more verbose, with short hash) If the user has patches managed by the mq extension, the version and hash printed are those of the qparent revision (the revision the patches were applied on top of) instead of tip. Also fixes a bug: print LLVM revision even if there are local modifications to it. Sorry for the long line in the perl file. I have no idea how to break it up.
author Frits van Bommel <fvbommel wxs.nl>
date Tue, 17 Feb 2009 01:13:18 +0100
parents 985104c0f1db
children d96471e8b5e5
files revisions.pl.in
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/revisions.pl.in	Tue Feb 17 00:08:20 2009 +0100
+++ b/revisions.pl.in	Tue Feb 17 01:13:18 2009 +0100
@@ -9,8 +9,8 @@
 
 my $llvm_rev = `svnversion $llvm_src`;
 
-if ($llvm_rev =~ s/(\d+)\s+$/$1/) {
-	$llvm_rev = qq!#define LLVM_REV "LLVM rev.$llvm_rev"!
+if ($llvm_rev =~ s/(\d+M?)\s+$/$1/) {
+	$llvm_rev = qq!#define LLVM_REV "LLVM rev. $llvm_rev"!
 } else {
 	my $llvm_lib = `perl @LLVM_CONFIG@ --libdir`;
 	$llvm_lib =~ s/\s+$//;
@@ -18,13 +18,13 @@
 	$llvm_rev = qq!#include "llvm/Config/config.h"\n#define LLVM_REV PACKAGE_STRING" ($llvm_rev)"!;
 }
 
-my $ldc_rev = `hg -R@PROJECT_SOURCE_DIR@ tip --template {rev}`;
+my $ldc_rev = `hg -R@PROJECT_SOURCE_DIR@ log -r qparent --template '{rev}:{node|short} ({date|isodate})' 2>/dev/null || hg -R@PROJECT_SOURCE_DIR@ tip --template '{rev}:{node|short} ({date|isodate})'`;
 
 my $out = qq!#ifndef LDC_VERSIONS_H
 #define LDC_VERSIONS_H
 
 $llvm_rev
-#define LDC_REV "rev.$ldc_rev"
+#define LDC_REV "rev. $ldc_rev"
 
 #endif // LDC_VERSIONS_H\n!;