Changeset 3149

Timestamp:

05/13/05 14:44:04 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

4718

Message:

* fix pugs_version.h generation for svk users, as suggested

by Forth.

Files:

• util/version_h.pl (modified) (2 diffs)

util/version_h.pl

@@ -8 +8 @@
 my $svn_entries = "$base/.svn/entries";
 
-print "Writing version from $svn_entries to $version_h\n";
-
 my $revision = 0;
 open OUT, "> $version_h" or die $!;
 print OUT "#undef PUGS_SVN_REVISION\n";
 if (-r $svn_entries) {
+    print "Writing version from $svn_entries to $version_h\n";
     open FH, $svn_entries or die $!;
     while (<FH>) {
@@ -21 +20 @@
     close FH;
 } elsif (my @info = qx/svk info/ and $? == 0) {
-    my ($line) = grep /Mirrored From/, @info;
-    ($revision) = $line =~ /Rev\. (\d+)/;
+    print "Writing version from `svk info` to $version_h\n";
+    my ($line) = grep /(?:file|svn|https?)\b/, @info;
+    ($revision) = $line =~ / (\d+)$/;
 }
+$revision ||= 0;
 print OUT "#define PUGS_SVN_REVISION $revision\n";
 close OUT;