Use "svn info" to fetch the version by default. Fetch the repository path as
well. Add the repository path to the version strings. svn path=/trunk/; revision=29171
This commit is contained in:
parent
0b0ff6cdcf
commit
1e93d53b56
|
@ -241,7 +241,7 @@ usage(gboolean is_error)
|
||||||
|
|
||||||
fprintf(output, "Capinfos %s"
|
fprintf(output, "Capinfos %s"
|
||||||
#ifdef SVNVERSION
|
#ifdef SVNVERSION
|
||||||
" (" SVNVERSION ")"
|
" (" SVNVERSION " from " SVNPATH ")"
|
||||||
#endif
|
#endif
|
||||||
"\n", VERSION);
|
"\n", VERSION);
|
||||||
fprintf(output, "Prints information about capture files.\n");
|
fprintf(output, "Prints information about capture files.\n");
|
||||||
|
|
|
@ -563,7 +563,7 @@ usage(void)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Editcap %s"
|
fprintf(stderr, "Editcap %s"
|
||||||
#ifdef SVNVERSION
|
#ifdef SVNVERSION
|
||||||
" (" SVNVERSION ")"
|
" (" SVNVERSION " from " SVNPATH ")"
|
||||||
#endif
|
#endif
|
||||||
"\n", VERSION);
|
"\n", VERSION);
|
||||||
fprintf(stderr, "Edit and/or translate the format of capture files.\n");
|
fprintf(stderr, "Edit and/or translate the format of capture files.\n");
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
# Default configuration:
|
# Default configuration:
|
||||||
#
|
#
|
||||||
# enable: 1
|
# enable: 1
|
||||||
# svn_client: 0
|
# svn_client: 1
|
||||||
# format: SVN %Y%m%d%H%M%S
|
# format: SVN %Y%m%d%H%M%S
|
||||||
# pkg_enable: 1
|
# pkg_enable: 1
|
||||||
# pkg_format: -SVN-%#
|
# pkg_format: -SVN-%#
|
||||||
|
@ -64,10 +64,11 @@ my $package_string = "";
|
||||||
my $vconf_file = 'version.conf';
|
my $vconf_file = 'version.conf';
|
||||||
my $last_change = 0;
|
my $last_change = 0;
|
||||||
my $revision = 0;
|
my $revision = 0;
|
||||||
|
my $repo_path = "unknown";
|
||||||
my $pkg_version = 0;
|
my $pkg_version = 0;
|
||||||
my %version_pref = (
|
my %version_pref = (
|
||||||
"enable" => 1,
|
"enable" => 1,
|
||||||
"svn_client" => 0,
|
"svn_client" => 1,
|
||||||
"format" => "SVN %Y%m%d%H%M%S",
|
"format" => "SVN %Y%m%d%H%M%S",
|
||||||
|
|
||||||
# Normal development builds
|
# Normal development builds
|
||||||
|
@ -90,17 +91,46 @@ sub read_svn_info {
|
||||||
my $in_entries = 0;
|
my $in_entries = 0;
|
||||||
my $svn_name;
|
my $svn_name;
|
||||||
my $repo_version;
|
my $repo_version;
|
||||||
|
my $repo_root = undef;
|
||||||
|
my $repo_url = undef;
|
||||||
|
my $do_hack = 1;
|
||||||
|
|
||||||
if ($version_pref{"pkg_enable"}) {
|
if ($version_pref{"pkg_enable"}) {
|
||||||
$package_format = $version_pref{"pkg_format"};
|
$package_format = $version_pref{"pkg_format"};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$version_pref{"svn_client"}) {
|
if ($version_pref{"svn_client"}) {
|
||||||
|
eval {
|
||||||
|
use warnings "all";
|
||||||
|
no warnings "all";
|
||||||
|
$line = qx{svn info $srcdir};
|
||||||
|
if (!defined($line)) {
|
||||||
|
exit 1;
|
||||||
|
}
|
||||||
|
if ($line =~ /Last Changed Date: (\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/) {
|
||||||
|
$last_change = timegm($6, $5, $4, $3, $2 - 1, $1);
|
||||||
|
}
|
||||||
|
if ($line =~ /Last Changed Rev: (\d+)/) {
|
||||||
|
$revision = $1;
|
||||||
|
}
|
||||||
|
if ($line =~ /URL: (\S+)/) {
|
||||||
|
$repo_url = $1;
|
||||||
|
}
|
||||||
|
if ($line =~ /Repository Root: (\S+)/) {
|
||||||
|
$repo_root = $1;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if ($last_change && $revision && $repo_url && $repo_root) {
|
||||||
|
$do_hack = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# 'svn info' failed or the user really wants us to dig around in .svn/entries
|
||||||
|
if ($do_hack) {
|
||||||
# Start of ugly internal SVN file hack
|
# Start of ugly internal SVN file hack
|
||||||
if (! open (ENTRIES, "< $srcdir/.svn/entries")) {
|
if (! open (ENTRIES, "< $srcdir/.svn/entries")) {
|
||||||
print ("Unable to open $srcdir/.svn/entries, trying 'svn info'\n");
|
print ("Unable to open $srcdir/.svn/entries\n");
|
||||||
# Fall back to "svn info"
|
|
||||||
$version_pref{"svn_client"} = 1;
|
|
||||||
} else {
|
} else {
|
||||||
# We need to find out whether our parser can handle the entries file
|
# We need to find out whether our parser can handle the entries file
|
||||||
$line = <ENTRIES>;
|
$line = <ENTRIES>;
|
||||||
|
@ -112,24 +142,8 @@ sub read_svn_info {
|
||||||
} else {
|
} else {
|
||||||
$repo_version = "unknown";
|
$repo_version = "unknown";
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
if ($repo_version eq "pre1.4") {
|
||||||
if ($version_pref{"svn_client"} || ($repo_version ne "pre1.4")) {
|
|
||||||
if (!$version_pref{"svn_client"}) {
|
|
||||||
close ENTRIES;
|
|
||||||
}
|
|
||||||
$line = qx{svn info $srcdir};
|
|
||||||
if ($line =~ /Last Changed Date: (\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/) {
|
|
||||||
$last_change = timegm($6, $5, $4, $3, $2 - 1, $1);
|
|
||||||
}
|
|
||||||
if ($line =~ /Last Changed Rev: (\d+)/) {
|
|
||||||
$revision = $1;
|
|
||||||
}
|
|
||||||
if ($line =~ /^\s*$/ || $revision =~ /^\s*$/) {
|
|
||||||
$last_change = "unknown";
|
|
||||||
$revision = "unknown";
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
# The entries schema is flat, so we can use regexes to parse its contents.
|
# The entries schema is flat, so we can use regexes to parse its contents.
|
||||||
while ($line = <ENTRIES>) {
|
while ($line = <ENTRIES>) {
|
||||||
if ($line =~ /<entry$/ || $line =~ /<entry\s/) {
|
if ($line =~ /<entry$/ || $line =~ /<entry\s/) {
|
||||||
|
@ -150,9 +164,12 @@ sub read_svn_info {
|
||||||
last;
|
last;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
# XXX - Fetch the repository root & URL
|
||||||
|
}
|
||||||
}
|
}
|
||||||
close ENTRIES;
|
close ENTRIES;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
# If we picked up the revision and modification time,
|
# If we picked up the revision and modification time,
|
||||||
# generate our strings.
|
# generate our strings.
|
||||||
|
@ -161,6 +178,10 @@ sub read_svn_info {
|
||||||
$package_format =~ s/%#/$revision/;
|
$package_format =~ s/%#/$revision/;
|
||||||
$package_string = strftime($package_format, gmtime($last_change));
|
$package_string = strftime($package_format, gmtime($last_change));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($repo_url && $repo_root && index($repo_url, $repo_root) == 0) {
|
||||||
|
$repo_path = substr($repo_url, length($repo_root));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -229,9 +250,11 @@ sub print_svn_version
|
||||||
|
|
||||||
if ($last_change && $revision) {
|
if ($last_change && $revision) {
|
||||||
$svn_version = "#define SVNVERSION \"SVN Rev " .
|
$svn_version = "#define SVNVERSION \"SVN Rev " .
|
||||||
$revision . "\"\n";
|
$revision . "\"\n" .
|
||||||
|
"#define SVNPATH \"" . $repo_path . "\"\n";
|
||||||
} else {
|
} else {
|
||||||
$svn_version = "/* #define SVNVERSION \"\" */\n";
|
$svn_version = "/* #define SVNVERSION \"\" */\n" .
|
||||||
|
"/* #define SVNPATH \"\" */\n";
|
||||||
}
|
}
|
||||||
if (open(OLDVER, "<$version_file")) {
|
if (open(OLDVER, "<$version_file")) {
|
||||||
if (<OLDVER> eq $svn_version) {
|
if (<OLDVER> eq $svn_version) {
|
||||||
|
|
|
@ -89,7 +89,7 @@ usage(void)
|
||||||
|
|
||||||
fprintf(stderr, "Mergecap %s"
|
fprintf(stderr, "Mergecap %s"
|
||||||
#ifdef SVNVERSION
|
#ifdef SVNVERSION
|
||||||
" (" SVNVERSION ")"
|
" (" SVNVERSION " from " SVNPATH ")"
|
||||||
#endif
|
#endif
|
||||||
"\n", VERSION);
|
"\n", VERSION);
|
||||||
fprintf(stderr, "Merge two or more capture files into one.\n");
|
fprintf(stderr, "Merge two or more capture files into one.\n");
|
||||||
|
|
|
@ -1028,7 +1028,7 @@ usage (void)
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"Text2pcap %s"
|
"Text2pcap %s"
|
||||||
#ifdef SVNVERSION
|
#ifdef SVNVERSION
|
||||||
" (" SVNVERSION ")"
|
" (" SVNVERSION " from " SVNPATH ")"
|
||||||
#endif
|
#endif
|
||||||
"\n"
|
"\n"
|
||||||
"Generate a capture file from an ASCII hexdump of packets.\n"
|
"Generate a capture file from an ASCII hexdump of packets.\n"
|
||||||
|
|
|
@ -96,7 +96,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef SVNVERSION
|
#ifdef SVNVERSION
|
||||||
const char *wireshark_svnversion = " (" SVNVERSION ")";
|
const char *wireshark_svnversion = " (" SVNVERSION " from " SVNPATH ")";
|
||||||
#else
|
#else
|
||||||
const char *wireshark_svnversion = "";
|
const char *wireshark_svnversion = "";
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue