# the SVN revision number.
# pkg_enable - Enable or disable package versioning.
# pkg_format - Like "format", but used for the package version.
+# is_release - Specifies that we're building from a release tarball;
+# svnversion.h is not updated. This should be added only
+# to the *released* version.conf, not the one used to build
+# the release (IOW it should be added by automake's dist-hook).
#
# If run with the "-p" or "--package-version" argument, the
# 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.
+# argument is present (it will also not be generated if 'is_release' is set
+# in version.conf).
#
# Default configuration:
#
# enable: 1
-# svn_client: 0
+# svn_client: 1
# format: SVN %Y%m%d%H%M%S
# pkg_enable: 1
# pkg_format: -SVN-%#
my $vconf_file = 'version.conf';
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",
+ "is_release" => 0,
# Normal development builds
- #"pkg_enable" => 1,
- #"pkg_format" => "-SVN-%#",
+ "pkg_enable" => 1,
+ "pkg_format" => "-SVN-%#",
# Development releases
- "pkg_enable" => 0,
- "pkg_format" => "",
+ #"pkg_enable" => 0,
+ #"pkg_format" => "",
);
my $srcdir = ".";
+my $svn_info_cmd = "";
+$ENV{LANG} = "C"; # Ensure we run with correct locale
# Run "svn info". Parse out the most recent modification time and the
# revision number.
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"}) {
+ if ($version_pref{"svn_client"}) {
+ eval {
+ use warnings "all";
+ no warnings "all";
+ $line = qx{$svn_info_cmd};
+ 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;
+ };
+
+ 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
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;
+ print ("Unable to open $srcdir/.svn/entries\n");
} else {
# We need to find out whether our parser can handle the entries file
$line = <ENTRIES>;
} else {
$repo_version = "unknown";
}
- }
- }
- 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.
- 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;
+
+ 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,
$package_format =~ s/%#/$revision/;
$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));
+ }
}
my $svn_version;
my $needs_update = 1;
- if ($pkg_version) { return; }
+ if ($pkg_version || $version_pref{"is_release"} == 1) { return; }
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 \"SVN Rev Unknown\"\n" .
+ "#define SVNPATH \"unknown\"\n";
}
if (open(OLDVER, "<$version_file")) {
- if (<OLDVER> eq $svn_version) {
+ my $old_svn_version = <OLDVER> . <OLDVER>;
+ if ($old_svn_version eq $svn_version) {
$needs_update = 0;
}
close OLDVER;
$srcdir = $ARGV[0]
}
-
if (! open(FILE, "<$vconf_file")) {
print STDERR "Version configuration file $vconf_file not "
. "found. Using defaults.\n";
&get_config();
if (-d "$srcdir/.svn") {
+ $svn_info_cmd = "svn info $srcdir";
+} elsif (-d "$srcdir/.git/svn") {
+ $svn_info_cmd = "(cd $srcdir; git svn info)";
+}
+
+if ($svn_info_cmd) {
print "This is a build from SVN (or a SVN snapshot).\n";
&read_svn_info();
if ($pkg_version) {
git.samba.org / obnox / wireshark / wip.git / blobdiff