#
# Copyright 2004 Jörg Mayer (see AUTHORS file)
#
-# $Id: make-version.pl,v 1.7 2004/03/04 16:19:40 jmayer Exp $
+# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# usage: ./make-version.pl
+# usage: ./make-version.pl [-p] [--package-version]
#
# If "version.conf" is present, it is parsed for configuration values.
# Possible values are:
#
-# enable - Enable or disable versioning. Zero (0) disables, nonzero
-# enables.
-# format - A strftime() formatted string to use as a template for the
-# version string.
+# enable - Enable or disable versioning. Zero (0) disables, nonzero
+# enables.
+# format - A strftime() formatted string to use as a template for
+# the version string. The sequence "%#" will substitute
+# the SVN revision number.
+# pkg_format - Like "format", but used for the package version.
+#
+# If run with the "-p" or "--package-version" argument, the
+# AM_INIT_AUTOMAKE macro in configure.in and the VERSION macro in
+# config.nmake will have the pkg_format template appended to the
+# version number. svnversion.h will _not_ be generated if either
+# argument is present.
#
# Default configuration:
#
# enable: 1
-# format: CVS %Y%m%d%H%M%S
+# format: SVN %Y%m%d%H%M%S
+# pkg_format: -SVN-%#
+# am_init: 0
+
+# XXX - We're pretty dumb about the "%#" substitution, and about having
+# spaces in the package format.
use strict;
use Time::Local;
use POSIX qw(strftime);
-my $version_file = 'cvsversion.h';
+my $version_file = 'svnversion.h';
+my $version_string = "";
+my $package_string = "";
my $vconf_file = 'version.conf';
-my %monthnum = ( "Jan" => "0", "Feb" => "1", "Mar" => "2", "Apr" => "3",
- "May" => "4", "Jun" => "5", "Jul" => "6", "Aug" => "7",
- "Sep" => "8", "Oct" => "9", "Nov" => "10", "Dec" => "11" );
my $last = 0;
-my $last_file = undef;
-my %version_pref = ("enable" => 1, "format" => "CVS %Y%m%d%H%M%S");
-
-
-# Recursively find all CVS Entries files starting from the given directory,
-# and compute the modification time of the most recently modified Entries file.
-sub find_last_CVS_Entries {
- my $dir = shift;
- my $d;
-
- opendir(DIR, "$dir") || print STDERR "Can't open directory $dir ($!)\n" && next;
- foreach $d (readdir(DIR)) {
- if (-d "$dir/$d" && $d !~ /^\.(|.)$/) {
- if ($d =~ /^CVS$/) {
- if (-f "$dir/CVS/Entries") {
- &lastentry("$dir/CVS/Entries");
- }
- } else { # Recurse in directory
- &find_last_CVS_Entries("$dir/$d");
- }
+my $revision = 0;
+my $pkg_version = 0;
+my %version_pref = (
+ "enable" => 1,
+ "format" => "SVN %Y%m%d%H%M%S",
+ "pkg_format" => "-SVN-%#",
+ );
+
+
+# Run "svn info". Parse out the most recent modification time and the
+# revision number.
+sub read_svn_info {
+ my $line;
+ my $version_format = $version_pref{"format"};
+ my $package_format = $version_pref{"pkg_format"};
+ # If any other odd paths pop up, put them here.
+ my @svn_paths = ("", "c:/cygwin/lib/subversion/bin/");
+ my $svn_cmd;
+ my $svn_pid;
+
+ foreach $svn_cmd (@svn_paths) {
+ $svn_cmd .= "svn info";
+ if ($svn_pid = open(SVNINFO, $svn_cmd . " |")) {
+ print ("Fetching version with command \"$svn_cmd\".\n");
+ last;
}
}
- closedir DIR;
-}
+ if (! defined($svn_pid)) {
+ print ("Unable to get SVN info.\n");
+ return;
+ }
+ while ($line = <SVNINFO>) {
+ if ($line =~ /^Last Changed Date: (\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/) {
+ $last = timegm($6, $5, $4, $3, $2 - 1, $1);
+ }
+ if ($line =~ /^Revision: (\d+)/) {
+ $revision = $1;
+ }
+ }
+ close SVNINFO;
+ if ($last && $revision) {
+ $version_format =~ s/%#/$revision/;
+ $version_string = strftime($version_format, gmtime($last));
-# Check all entries in $file. In case they are newer, update $last accordingly
-# Args: Entries file
-sub lastentry {
- my $date;
- my ($wdayascii, $monthascii, $day, $time, $year);
- my $file = shift;
- my $current;
+ $package_format =~ s/%#/$revision/;
+ $package_string = strftime($package_format, gmtime($last));
+ }
+}
- open(FILE, "<$file") || print STDERR "Open $file for reading failed ($!)\n" && return 1;
- while (<FILE>) {
- chomp;
- # Regular lines look like this: /ethereal_be.py/1.6/Fri Aug 2 22:55:19 2002//
- next if (/^D/);
- $date = (split(/\//, $_, 5))[3];
- # Month Day Hour Minute Second Year
- next if ($date !~ /\w{3} (\w{3}) (.\d) (\d\d):(\d\d):(\d\d) (\d{4})/);
- $current = timegm($5, $4, $3, $2, $monthnum{$1}, $6);
-
- if ($current > $last) {
- $last = $current;
+# Read configure.in, then write it back out with an updated
+# "AM_INIT_AUTOMAKE" line.
+sub update_configure_in
+{
+ my $line;
+ my $contents = "";
+ my $version = "";
+
+ return if ($package_string eq "");
+
+ open(CFGIN, "< configure.in") || die "Can't read configure.in!";
+ while ($line = <CFGIN>) {
+ if ($line =~ /^AM_INIT_AUTOMAKE\(ethereal, (\d+)\.(\d+).(\d+)/) {
+ $line = "AM_INIT_AUTOMAKE\(ethereal, $1.$2.$3$package_string)\n";
}
+ $contents .= $line
}
- close FILE;
- return 1;
+
+ open(CFGIN, "> configure.in") || die "Can't write configure.in!";
+ print(CFGIN $contents);
+ close(CFGIN);
+ print "configure.in has been updated.\n";
+}
+
+# Read config.nmake, then write it back out with an updated
+# "VERSION" line.
+sub update_config_nmake
+{
+ my $line;
+ my $contents = "";
+ my $version = "";
+
+ return if ($package_string eq "");
+
+ open(CFGIN, "< config.nmake") || die "Can't read config.nmake!";
+ while ($line = <CFGIN>) {
+ if ($line =~ /^VERSION=(\d+)\.(\d+).(\d+)/) {
+ $line = "VERSION=$1.$2.$3$package_string\n";
+ }
+ $contents .= $line
+ }
+
+ open(CFGIN, "> config.nmake") || die "Can't write config.nmake!";
+ print(CFGIN $contents);
+ close(CFGIN);
+ print "config.nmake has been updated.\n";
}
-# Print the CVS version to $version_file.
+
+# Print the SVN version to $version_file.
# Don't change the file if it is not needed.
-sub print_cvs_version
+sub print_svn_version
{
- my $cvs_version;
+ my $svn_version;
my $needs_update = 1;
- if ($last) {
- $cvs_version = "#define CVSVERSION \"" .
- strftime($version_pref{"format"}, gmtime($last)) .
- "\"\n";
+ if ($pkg_version) { return; }
+
+ if ($last && $revision) {
+ $svn_version = "#define SVNVERSION \"" .
+ $version_string . "\"\n";
} else {
- $cvs_version = "/* #define CVSVERSION \"\" */\n";
+ $svn_version = "/* #define SVNVERSION \"\" */\n";
}
if (open(OLDVER, "<$version_file")) {
- if (<OLDVER> eq $cvs_version) {
+ if (<OLDVER> eq $svn_version) {
print "$version_file is up-to-date.\n";
$needs_update = 0;
}
}
if ($needs_update == 1) {
- # print "Updating $version_file so it contains:\n$cvs_version";
+ # print "Updating $version_file so it contains:\n$svn_version";
open(VER, ">$version_file") || die ("Cannot write to $version_file ($!)\n");
- print VER "$cvs_version";
+ print VER "$svn_version";
close VER;
print "$version_file has been updated.\n";
}
# Read values from the configuration file, if it exists.
sub get_config {
- open(FILE, "<$vconf_file") || print STDERR "Version configuration file $vconf_file not found. Using defaults.\n" && return 1;
+ my $arg;
+
+ # Get our command-line args
+ foreach $arg (@ARGV) {
+ if ($arg eq "-p" || $arg eq "--package-version") {
+ $pkg_version = 1;
+ }
+ }
+
+
+ if (! open(FILE, "<$vconf_file")) {
+ print STDERR "Version configuration file $vconf_file not "
+ . "found. Using defaults.\n";
+ return 1;
+ }
while (<FILE>) {
chomp;
&get_config();
-if ($version_pref{"enable"} == 0) {
- print "Version tag disabled in $vconf_file.\n";
-} elsif (-d "./CVS") {
- print "This is a build from CVS (or a CVS snapshot), "
- . "CVS version tag will be computed.\n";
- &find_last_CVS_Entries(".");
+if (-d "./.svn") {
+ print "This is a build from SVN (or a SVN snapshot).\n";
+ &read_svn_info(".");
+ if ($pkg_version) {
+ print "Generating package version. Ignoring $version_file\n";
+ &update_configure_in;
+ &update_config_nmake;
+ } elsif ($version_pref{"enable"} == 0) {
+ print "Version tag disabled in $vconf_file.\n";
+ } else {
+ print "SVN version tag will be computed.\n";
+ }
} else {
- print "This is not a CVS build.\n";
+ print "This is not a SVN build.\n";
}
-# Now that we've computed everything, print the CVS version to $version_file
-&print_cvs_version;
+&print_svn_version;
__END__
git.samba.org / obnox / wireshark / wip.git / blobdiff