aboutsummaryrefslogtreecommitdiffstats
path: root/make-version.pl
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2004-12-17 20:41:14 +0000
committerGerald Combs <gerald@wireshark.org>2004-12-17 20:41:14 +0000
commit9b27ed9bd5d930f98fcc06496b73bf2f7e63dda8 (patch)
tree71f6aa9a9609bc2a4057efda27a326ae7fb5ca11 /make-version.pl
parentb321d9fbfe98b5ad10cb0617371c29698ef2ec48 (diff)
Work around a bug in the strftime() code in the Windows version of Perl.
svn path=/trunk/; revision=12767
Diffstat (limited to 'make-version.pl')
-rwxr-xr-xmake-version.pl12
1 files changed, 8 insertions, 4 deletions
diff --git a/make-version.pl b/make-version.pl
index 15b74d3600..96b3dcdde5 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -73,6 +73,8 @@ my %version_pref = (
# revision number.
sub read_svn_info {
my $line;
+ my $version_format = $version_pref{"format"};
+ my $package_format = $version_pref{"pkg_format"};
open(SVNINFO, "svn info |") || die("Unable to get SVN info!");
while ($line = <SVNINFO>) {
@@ -86,11 +88,13 @@ sub read_svn_info {
close SVNINFO;
if ($last && $revision) {
- $version_string = strftime($version_pref{"format"}, gmtime($last));
- $version_string =~ s/%#/$revision/;
+ $version_format =~ s/%#/$revision/;
+ $version_string = strftime($version_format, gmtime($last));
- $package_string = strftime($version_pref{"pkg_format"}, gmtime($last));
- $package_string =~ s/%#/$revision/;
+ $package_format =~ s/%#/$revision/;
+print "pf: $package_format r: $revision\n";
+ $package_string = strftime($package_format, gmtime($last));
+print "ps2: $package_string\n";
}
}