comparison revisions.pl.in @ 1112:829ac3f30103

Updating revisions.pl.in: - Change the way the LLVM SVN revision is detected, using `svn info` instead of `svnversion`. This speeds it up significantly on my machine (especially when the LLVM SVN checkout isn't in disk cache). - Add "last changed date" to SVN checkouts too, not just unpacked tarballs - No longer rely on SVN revision to detect release vs trunk checkouts, treat release checkout the same as unpacked release tarball. (Except for date determination, which uses SVN date instead of filesystem date)
author Frits van Bommel <fvbommel wxs.nl>
date Fri, 13 Mar 2009 16:18:01 +0100
parents dc576c7e4b1e
children 123812e02bc8
comparison
equal deleted inserted replaced
1111:0f8aeb31678c 1112:829ac3f30103
5 use File::stat; 5 use File::stat;
6 use Time::localtime; 6 use Time::localtime;
7 7
8 my $llvm_src = `perl @LLVM_CONFIG@ --src-root`; 8 my $llvm_src = `perl @LLVM_CONFIG@ --src-root`;
9 9
10 my $llvm_rev = `svnversion --committed $llvm_src`; 10 my $svn_info = `svn info $llvm_src 2>/dev/null`;
11
12 my $extra_includes = "";
11 my $llvm_rev_str; 13 my $llvm_rev_str;
12 my $llvm_rev_nr; 14 my $llvm_rev_nr;
15 my $llvm_date = "";
13 16
14 if ($llvm_rev =~ /^\s*(\d+:)?((\d+)[MSP]*)\s*$/) { 17 if ($svn_info =~ /^URL:.*\/trunk\s*$/m && $svn_info =~ /^Last Changed Rev:\s*(\d+)\s*/m) {
15 $llvm_rev_str = qq!#define LLVM_REV_STR "LLVM rev. $2"!; 18 $llvm_rev_str = qq!"LLVM trunk rev. $1"!;
16 $llvm_rev_nr = "$3"; 19 $llvm_rev_nr = $1;
17 } else { 20 } else {
18 my $llvm_lib = `perl @LLVM_CONFIG@ --libdir`; 21 # Either non-trunk or 'svn info' didn't report "Last Changed Rev".
19 $llvm_lib =~ s/\s+$//; 22 $extra_includes = qq!#include "llvm/Config/config.h"!;
20 $llvm_rev = ctime(stat($llvm_lib)->mtime) if (-d $llvm_lib); 23 $llvm_rev_str = "PACKAGE_STRING";
21 $llvm_rev_str = qq!#include "llvm/Config/config.h"\n#define LLVM_REV_STR PACKAGE_STRING" ($llvm_rev)"!; 24 # Assume latest release, so < any version we should be testing for.
22 # Assume latest release, so < any version we should be testing for. 25 $llvm_rev_nr = 0;
23 $llvm_rev_nr = 0; 26 }
27
28 # Use SVN date even if non-trunk:
29 if ($svn_info =~ /^Last Changed Date: ([^(]*?)\s*(\(|$)/m) {
30 $llvm_date = qq!" ($1)"!;
31 } else {
32 # Otherwise, try to get it from the libdir
33 my $llvm_lib = `perl @LLVM_CONFIG@ --libdir`;
34 $llvm_lib =~ s/\s+$//;
35 if (-d $llvm_lib) {
36 my $mod_time = ctime(stat($llvm_lib)->mtime);
37 $llvm_date = qq!" ($mod_time)"!;
38 }
24 } 39 }
25 40
26 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})'`; 41 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})'`;
27 42
28 my $out = qq!#ifndef LDC_VERSIONS_H 43 my $out = qq!#ifndef LDC_VERSIONS_H
29 #define LDC_VERSIONS_H 44 #define LDC_VERSIONS_H
45 $extra_includes
30 46
31 // LLVM version string, for use in -version output 47 // LLVM version string, for use in -version output
32 $llvm_rev_str 48 #define LLVM_REV_STR $llvm_rev_str$llvm_date
33 // LLVM svn revision number, used to adapt to changes in LLVM 49 // LLVM svn revision number, used to adapt to changes in LLVM
34 // (Is 0 if LLVM is not an SVN version) 50 // (Is 0 if LLVM is not an SVN trunk version)
35 #define LLVM_REV $llvm_rev_nr 51 #define LLVM_REV $llvm_rev_nr
36 // LDC version string, for use in -version output 52 // LDC version string, for use in -version output
37 #define LDC_REV "rev. $ldc_rev" 53 #define LDC_REV "rev. $ldc_rev"
38 54
39 #endif // LDC_VERSIONS_H\n!; 55 #endif // LDC_VERSIONS_H\n!;