# enables.
# svn_client - Use svn client i.s.o. ugly internal SVN file hack
# format - A strftime() formatted string to use as a template for
-# the version string. The sequence "%#" will substitute
+# the version string. The sequence "%#" will substitute
# the SVN revision number.
-# pkg_enable - Enable or disable package versioning.
-# pkg_format - Like "format", but used for the package version.
+# pkg_enable - Enable or disable local package versioning.
+# pkg_format - Like "format", but used for the local package version.
#
-# 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 (it will also not be generated if 'is_release' is set
-# in version.conf).
+# If run with the "-r" or "--set-release" 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.
#
# Default configuration:
#
my $revision = 0;
my $repo_path = "unknown";
my $get_svn = 0;
+my $set_svn = 0;
my $set_version = 0;
my $set_release = 0;
my %version_pref = (
if ($revision == 0) {
# Fall back to config.nmake
$info_source = "Prodding config.nmake";
- my $filepath = "config.nmake";
+ my $filepath = "$srcdir/config.nmake";
open(CFGNMAKE, "< $filepath") || die "Can't read $filepath!";
while ($line = <CFGNMAKE>) {
if ($line =~ /^SVN_REVISION=(\d+)/) {
my $line;
my $contents = "";
my $version = "";
- my $filepath = "configure.in";
+ my $filepath = "$srcdir/configure.in";
return if (!$set_version && $package_string eq "");
open(CFGIN, "< $filepath") || die "Can't read $filepath!";
while ($line = <CFGIN>) {
- if ($line =~ /^AC_INIT\(wireshark, (\d+)\.(\d+).(\d+)/) {
- $line = sprintf("AC_INIT\(wireshark, %d.%d.%d%s)\n",
+ if ($line =~ /^AC_INIT\(wireshark, (\d+)\.(\d+).(\d+).*([\r\n]+)$/) {
+ $line = sprintf("AC_INIT\(wireshark, %d.%d.%d%s)$4",
$set_version ? $version_pref{"version_major"} : $1,
$set_version ? $version_pref{"version_minor"} : $2,
$set_version ? $version_pref{"version_micro"} : $3,
- $set_release ? $package_string : ""
+ $package_string
);
}
my $line;
my $contents = "";
my $version = "";
- my $filepath = "config.nmake";
+ my $filepath = "$srcdir/config.nmake";
open(CFGNMAKE, "< $filepath") || die "Can't read $filepath!";
while ($line = <CFGNMAKE>) {
- if ($line =~ /^SVN_REVISION=/) {
- $line = sprintf("SVN_REVISION=%d\n", $revision);
- } elsif ($set_version && $line =~ /^VERSION_MAJOR=/) {
- $line = sprintf("VERSION_MAJOR=%d\n", $version_pref{"version_major"});
- } elsif ($set_version && $line =~ /^VERSION_MINOR=/) {
- $line = sprintf("VERSION_MINOR=%d\n", $version_pref{"version_minor"});
- } elsif ($set_version && $line =~ /^VERSION_MICRO=/) {
- $line = sprintf("VERSION_MICRO=%d\n", $version_pref{"version_micro"});
- } elsif ($line =~ /^VERSION_EXTRA=/) {
- $line = "VERSION_EXTRA=$package_string\n";
+ if ($line =~ /^SVN_REVISION=.*([\r\n]+)$/) {
+ $line = sprintf("SVN_REVISION=%d$1", $revision);
+ } elsif ($set_version && $line =~ /^VERSION_MAJOR=.*([\r\n]+)$/) {
+ $line = sprintf("VERSION_MAJOR=%d$1", $version_pref{"version_major"});
+ } elsif ($set_version && $line =~ /^VERSION_MINOR=.*([\r\n]+)$/) {
+ $line = sprintf("VERSION_MINOR=%d$1", $version_pref{"version_minor"});
+ } elsif ($set_version && $line =~ /^VERSION_MICRO=.*([\r\n]+)$/) {
+ $line = sprintf("VERSION_MICRO=%d$1", $version_pref{"version_micro"});
+ } elsif ($line =~ /^VERSION_EXTRA=.*([\r\n]+)$/) {
+ $line = "VERSION_EXTRA=$package_string$1";
}
$contents .= $line
}
my $line;
my $contents = "";
my $version = "";
- my $filepath = "docbook/release-notes.xml";
+ my $filepath = "$srcdir/docbook/release-notes.xml";
return if (!$set_version);
while ($line = <RELNOTES>) {
# <!ENTITY WiresharkCurrentVersion "1.7.1">
- if ($line =~ /<\!ENTITY\s+WiresharkCurrentVersion\s+/) {
- $line = sprintf("<!ENTITY WiresharkCurrentVersion \"%d.%d.%d\"\n",
+ if ($line =~ /<\!ENTITY\s+WiresharkCurrentVersion\s+.*([\r\n]+)$/) {
+ $line = sprintf("<!ENTITY WiresharkCurrentVersion \"%d.%d.%d\">$1",
$version_pref{"version_major"},
$version_pref{"version_minor"},
$version_pref{"version_micro"},
my $line;
my $contents = "";
my $version = "";
- my $filepath = "debian/changelog";
+ my $filepath = "$srcdir/debian/changelog";
return if ($set_version == 0);
print "$filepath has been updated.\n";
}
+# Read debian/wireshark-common.files, then write back out an updated version.
+# The libraries updated here MUST match the updates made by update_lib_releases
+# below. We should do this automatically.
+sub update_debian_wcf
+{
+ my $line;
+ my $contents = "";
+ my $version = "";
+ my $filepath = "$srcdir/debian/wireshark-common.files";
+
+ return if (!$set_version);
+
+ open(DWCF, "< $filepath") || die "Can't read $filepath!";
+ while ($line = <DWCF>) {
+ # /usr/lib/wireshark/libwireshark.so.1.1.0
+
+ if ($line =~ qr{^(/usr/lib/wireshark/lib(wireshark|wiretap).so\.\d+\.\d+\.)\d+$}) {
+ $line = sprintf("$1%d\n", $version_pref{"version_micro"});
+ }
+ $contents .= $line
+ }
+
+ open(DWCF, "> $filepath") || die "Can't write $filepath!";
+ print(DWCF $contents);
+ close(DWCF);
+ print "$filepath has been updated.\n";
+}
+
+# Read Makefile.am for each library, then write back out an updated version.
+sub update_lib_releases
+{
+ my $line;
+ my $contents = "";
+ my $version = "";
+ my $filedir;
+ my $filepath;
+
+ return if (!$set_version);
+
+ # The Libtool manual says
+ # "If the library source code has changed at all since the last
+ # update, then increment revision (‘c:r:a’ becomes ‘c:r+1:a’)."
+ # epan changes with each minor release, almost by definition. wiretap
+ # changes with *most* releases.
+ #
+ # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
+ for $filedir ("epan", "wiretap") { # "wsutil"
+ $contents = "";
+ $filepath = $filedir . "/Makefile.am";
+ open(MAKEFILE_AM, "< $filepath") || die "Can't read $filepath!";
+ while ($line = <MAKEFILE_AM>) {
+ # libwireshark_la_LDFLAGS = -version-info 2:1:1 -export-symbols
+
+ if ($line =~ /^(lib\w+_la_LDFLAGS.*version-info\s+\d+:)\d+(:\d+.*)/) {
+ $line = sprintf("$1%d$2\n", $version_pref{"version_micro"});
+ }
+ $contents .= $line
+ }
+
+ open(MAKEFILE_AM, "> $filepath") || die "Can't write $filepath!";
+ print(MAKEFILE_AM $contents);
+ close(MAKEFILE_AM);
+ print "$filepath has been updated.\n";
+ }
+}
+
# Update distributed files that contain any version information
sub update_versioned_files
{
&update_config_nmake;
&update_release_notes;
&update_debian_changelog;
+ &update_debian_wcf;
+ &update_lib_releases;
}
# Print the SVN version to $version_file.
close OLDREV;
}
- if (! $set_version && ! $set_release) { return; }
+ if (! $set_svn) { return; }
if ($needs_update) {
# print "Updating $version_file so it contains:\n$svn_revision";
my $show_help = 0;
# Get our command-line args
+ # XXX - Do we need an option to undo --set-release?
GetOptions(
"help|h", \$show_help,
"get-svn|g", \$get_svn,
+ "set-svn|s", \$set_svn,
"set-version|v", \$set_version,
"set-release|r|package-version|p", \$set_release
) || pod2usage(2);
if ($show_help) { pod2usage(1); }
- if ( !( $show_help || $get_svn || $set_release ) ) {
- $set_version = 1;
+ if ( !( $show_help || $get_svn || $set_svn || $set_version || $set_release ) ) {
+ $set_svn = 1;
}
if ($#ARGV >= 0) {
if ($set_release) {
print "Generating release information\n";
} else {
- print "Clobbering release information\n";
+ print "Resetting release information\n";
$revision = 0;
$package_string = "";
}
--help, -h This help message
--get-svn, -g Print the SVN revision and source.
- --set-version, -v Set the major, minor, and micro versions.
+ --set-svn, -s Set the information in svnversion.h
+ --set-version, -v Set the major, minor, and micro versions in
+ configure.in, config.nmake, debian/changelog,
+ and docbook/release_notes.xml.
Resets the release information when used by
itself.
- --set-release, -r Set the release information.
+ --set-release, -r Set the release information in configure.in
+ and config.nmake
--package-version, -p Deprecated. Same as --set-release.
-Options can be used in any combination. If none are specified B<--set-version>
+Options can be used in any combination. If none are specified B<--set-svn>
is assumed.
git.samba.org / obnox / wireshark / wip.git / blobdiff