#!/usr/bin/perl -w
#
-# Copyright 2004 Jörg Mayer (see AUTHORS file)
+# Copyright 2004 Jörg Mayer (see AUTHORS file)
#
# $Id$
#
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-# usage: ./make-version.pl [-p] [--package-version]
+# usage: ./make-version.pl [-p|--package-version]
#
# If "version.conf" is present, it is parsed for configuration values.
# Possible values are:
# 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
+# AC_INIT 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
-# svn_client: 0 <- This needs to change in order to support SVN 1.4
+# svn_client: 1
# format: SVN %Y%m%d%H%M%S
# pkg_enable: 1
# pkg_format: -SVN-%#
-# am_init: 0
# XXX - We're pretty dumb about the "%#" substitution, and about having
# spaces in the package format.
my $version_file = 'svnversion.h';
my $package_string = "";
my $vconf_file = 'version.conf';
-my $last = 0;
+my $last_change = 0;
my $revision = 0;
+my $repo_path = "unknown";
my $pkg_version = 0;
my %version_pref = (
"enable" => 1,
- "svn_client" => 0,
+ "svn_client" => 1,
"format" => "SVN %Y%m%d%H%M%S",
+
+ # Normal development builds
"pkg_enable" => 1,
"pkg_format" => "-SVN-%#",
+
+ # Development releases
+ #"pkg_enable" => 0,
+ #"pkg_format" => "",
);
my $srcdir = ".";
my $in_entries = 0;
my $svn_name;
my $repo_version;
+ my $repo_root = undef;
+ my $repo_url = undef;
+ my $do_hack = 1;
if ($version_pref{"pkg_enable"}) {
$package_format = $version_pref{"pkg_format"};
}
- if (!$version_pref{"svn_client"}) {
- # Start of ugly internal SVN file hack
- if (! open (ENTRIES, "< $srcdir/.svn/entries")) {
- print ("Unable to open $srcdir/.svn/entries, trying 'svn info'\n");
- # Fall back to "svn info"
- $version_pref{"svn_client"} = 1;
- }
+ if ($version_pref{"svn_client"}) {
+ eval {
+ use warnings "all";
+ no warnings "all";
+ $line = qx{svn info $srcdir};
+ if (defined($line)) {
+ 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;
+ }
+ }
+ 1;
+ };
- # We need to find out whether our parser can handle the entries file
- $line = <ENTRIES>;
- chomp $line;
- if ($line eq '<?xml version="1.0" encoding="utf-8"?>') {
- $repo_version = "pre1.4";
- } elsif ($line =~ /^8$/) {
- $repo_version = "1.4";
- } else {
- $repo_version = "unknown";
+ if ($last_change && $revision && $repo_url && $repo_root) {
+ $do_hack = 0;
}
}
- if ($version_pref{"svn_client"} || ($repo_version ne "pre1.4")) {
- $line = qx{svn info};
- 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 =~ /Last Changed Rev: (\d+)/) {
- $revision = $1;
- }
- } else {
- # The entries schema is flat, so we can use regexes to parse its contents.
- while ($line = <ENTRIES>) {
- if ($line =~ /<entry$/ || $line =~ /<entry\s/) {
- $in_entries = 1;
- $svn_name = "";
- }
- if ($in_entries) {
- if ($line =~ /name="(.*)"/) { $svn_name = $1; }
- if ($line =~ /committed-date="(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)/) {
- $last = timegm($6, $5, $4, $3, $2 - 1, $1);
- }
- if ($line =~ /revision="(\d+)"/) { $revision = $1; }
+
+ # '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
+ if (! open (ENTRIES, "< $srcdir/.svn/entries")) {
+ print ("Unable to open $srcdir/.svn/entries\n");
+ } else {
+ # We need to find out whether our parser can handle the entries file
+ $line = <ENTRIES>;
+ chomp $line;
+ if ($line eq '<?xml version="1.0" encoding="utf-8"?>') {
+ $repo_version = "pre1.4";
+ } elsif ($line =~ /^8$/) {
+ $repo_version = "1.4";
+ } else {
+ $repo_version = "unknown";
}
- if ($line =~ /\/>/) {
- if (($svn_name eq "" || $svn_name eq "svn:this_dir") &&
- $last && $revision) {
- $in_entries = 0;
- last;
+
+ if ($repo_version eq "pre1.4") {
+ # The entries schema is flat, so we can use regexes to parse its contents.
+ while ($line = <ENTRIES>) {
+ if ($line =~ /<entry$/ || $line =~ /<entry\s/) {
+ $in_entries = 1;
+ $svn_name = "";
+ }
+ if ($in_entries) {
+ if ($line =~ /name="(.*)"/) { $svn_name = $1; }
+ if ($line =~ /committed-date="(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)/) {
+ $last_change = timegm($6, $5, $4, $3, $2 - 1, $1);
+ }
+ if ($line =~ /revision="(\d+)"/) { $revision = $1; }
+ }
+ if ($line =~ /\/>/) {
+ if (($svn_name eq "" || $svn_name eq "svn:this_dir") &&
+ $last_change && $revision) {
+ $in_entries = 0;
+ last;
+ }
+ }
+ # XXX - Fetch the repository root & URL
}
}
+ close ENTRIES;
}
- close ENTRIES;
}
# If we picked up the revision and modification time,
# generate our strings.
- if ($revision && $last) {
+ if ($revision && $last_change) {
$version_format =~ s/%#/$revision/;
$package_format =~ s/%#/$revision/;
- $package_string = strftime($package_format, gmtime($last));
+ $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));
}
-
}
# Read configure.in, then write it back out with an updated
-# "AM_INIT_AUTOMAKE" line.
+# "AC_INIT" line.
sub update_configure_in
{
my $line;
open(CFGIN, "< configure.in") || die "Can't read configure.in!";
while ($line = <CFGIN>) {
- if ($line =~ /^AM_INIT_AUTOMAKE\(wireshark, (\d+)\.(\d+).(\d+)/) {
- $line = "AM_INIT_AUTOMAKE\(wireshark, $1.$2.$3$package_string)\n";
+ if ($line =~ /^AC_INIT\(wireshark, (\d+)\.(\d+).(\d+)/) {
+ $line = "AC_INIT\(wireshark, $1.$2.$3$package_string)\n";
}
$contents .= $line
}
my $line;
my $contents = "";
my $version = "";
+ my $update_ve = 0;
- return if ($package_string eq "");
+ if ($package_string ne "") { $update_ve = 1; };
open(CFGIN, "< config.nmake") || die "Can't read config.nmake!";
while ($line = <CFGIN>) {
- if ($line =~ /^VERSION_EXTRA=/) {
+ if ($update_ve && $line =~ /^VERSION_EXTRA=/) {
$line = "VERSION_EXTRA=$package_string\n";
}
+ if ($line =~ /^VERSION_BUILD=/ && int($revision) > 0) {
+ $line = "VERSION_BUILD=$revision\n";
+ }
$contents .= $line
}
if ($pkg_version) { return; }
- if ($last && $revision) {
+ if ($last_change && $revision) {
$svn_version = "#define SVNVERSION \"SVN Rev " .
- $revision . "\"\n";
+ $revision . "\"\n" .
+ "#define SVNPATH \"" . $repo_path . "\"\n";
} else {
- $svn_version = "/* #define SVNVERSION \"\" */\n";
+ $svn_version = "/* #define SVNVERSION \"\" */\n" .
+ "/* #define SVNPATH \"\" */\n";
}
if (open(OLDVER, "<$version_file")) {
if (<OLDVER> eq $svn_version) {
- print "$version_file is up-to-date.\n";
$needs_update = 0;
}
close OLDVER;
print VER "$svn_version";
close VER;
print "$version_file has been updated.\n";
+ } else {
+ print "$version_file is up-to-date.\n";
}
}
&get_config();
-if (-d "./.svn") {
+if (-d "$srcdir/.svn") {
print "This is a build from SVN (or a SVN snapshot).\n";
- &read_svn_info(".");
+ &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";
- $last = 0;
+ $last_change = 0;
$revision = 0;
} else {
print "SVN version tag will be computed.\n";
git.samba.org / obnox / wireshark / wip.git / blobdiff