# pkg_format - Like "format", but used for the local package version.
#
# If run with the "-r" or "--set-release" argument the AC_INIT macro in
-# configure.ac and the VERSION macro in config.nmake will have the
+# configure.ac and the VERSION macro in CMakeLists.txt will have the
# pkg_format template appended to the version number. version.h will
# _not_ be generated if either argument is present.
#
my $set_release = 0;
my %version_pref = (
"version_major" => 2,
- "version_minor" => 1,
+ "version_minor" => 3,
"version_micro" => 0,
"version_build" => 0,
my $srcdir = ".";
my $info_cmd = "";
my $verbose = 0;
+my $devnull = File::Spec->devnull();
+my $enable_vcsversion = 1;
# Ensure we run with correct locale
$ENV{LANG} = "C";
my $repo_version;
my $do_hack = 1;
my $info_source = "Unknown";
- my $devnull = File::Spec->devnull();
+ my $is_git_repo = 0;
+ my $git_cdir;
- # Make sure git is available.
- if (!`$git_executable --version`) {
- print STDERR "Git unavailable. Git revision will be missing from version string.\n";
- return;
- }
if ($version_pref{"pkg_enable"} > 0) {
$package_format = $version_pref{"pkg_format"};
}
- if (-d "$srcdir/.git" && ! -d "$srcdir/.git/svn") {
+ # For tarball releases, do not invoke git at all and instead rely on
+ # versioning information that was provided at tarball creation time.
+ if ($version_pref{"git_description"}) {
+ $info_source = "version.conf file";
+ } elsif (-e "$srcdir/.git" && ! -d "$srcdir/.git/svn") {
$info_source = "Command line (git)";
$version_pref{"git_client"} = 1;
+ $is_git_repo = 1;
} elsif (-d "$srcdir/.svn" or -d "$srcdir/../.svn") {
$info_source = "Command line (svn info)";
- $info_cmd = "svn info $srcdir";
+ $info_cmd = "cd $srcdir; svn info";
$version_pref{"svn_client"} = 1;
} elsif (-d "$srcdir/.git/svn") {
$info_source = "Command line (git-svn)";
$info_cmd = "(cd $srcdir; $git_executable svn info)";
+ $is_git_repo = 1;
+ }
+
+ # Make sure git is available.
+ if ($is_git_repo && !`$git_executable --version`) {
+ print STDERR "Git unavailable. Git revision will be missing from version string.\n";
+ return;
+ }
+
+ # Check whether to include VCS version information in version.h
+ if ($is_git_repo) {
+ chomp($git_cdir = qx{git --git-dir="$srcdir/.git" rev-parse --git-common-dir 2> $devnull});
+ if ($git_cdir && -f "$git_cdir/wireshark-disable-versioning") {
+ print_diag "Header versioning disabled using git override.\n";
+ $enable_vcsversion = 0;
+ }
}
#Git can give us:
# Refs: git ls-remote code.wireshark.org:wireshark
# ea19c7f952ce9fc53fe4c223f1d9d6797346258b (r48972, changed version to 1.11.0)
- if ($version_pref{"git_client"}) {
+ if ($version_pref{"git_description"}) {
+ $git_description = $version_pref{"git_description"};
+ $do_hack = 0;
+ # Assume format like v2.3.0rc0-1342-g7bdcf75
+ $commit_id = ($git_description =~ /([0-9a-f]+)$/)[0];
+ } elsif ($version_pref{"git_client"}) {
eval {
use warnings "all";
no warnings "all";
unlink($tortoise_file);
}
- if ($num_commits == 0) {
- # Fall back to config.nmake
- $info_source = "Prodding config.nmake";
- my $filepath = "$srcdir/config.nmake";
- open(CFGNMAKE, "< $filepath") || die "Can't read $filepath!";
- while ($line = <CFGNMAKE>) {
- if ($line =~ /^VCS_REVISION=(\d+)/) {
- $num_commits = $1;
- $do_hack = 0;
- last;
- }
- }
- close (CFGNMAKE);
- }
- if ($num_commits == 0 and -d "$srcdir/.git") {
+ if ($num_commits == 0 and -e "$srcdir/.git") {
# Try git...
eval {
my $contents = "";
my $version = "";
my $filepath = "$srcdir/CMakeLists.txt";
- my $cmake_package_string = "\$ENV{WIRESHARK_VERSION_EXTRA}";
-
- if ($package_string ne "") { $cmake_package_string = $package_string; }
return if (!$set_version && $package_string eq "");
open(CFGIN, "< $filepath") || die "Can't read $filepath!";
while ($line = <CFGIN>) {
- if ($line =~ /^set *\( *GIT_REVISION .*([\r\n]+)$/) {
+ if ($line =~ /^set *\( *GIT_REVISION .*?([\r\n]+)$/) {
$line = sprintf("set(GIT_REVISION %d)$1", $num_commits);
- } elsif ($line =~ /^set *\( *PROJECT_MAJOR_VERSION .*([\r\n]+)$/) {
+ } elsif ($line =~ /^set *\( *PROJECT_MAJOR_VERSION .*?([\r\n]+)$/) {
$line = sprintf("set(PROJECT_MAJOR_VERSION %d)$1", $version_pref{"version_major"});
- } elsif ($line =~ /^set *\( *PROJECT_MINOR_VERSION .*([\r\n]+)$/) {
+ } elsif ($line =~ /^set *\( *PROJECT_MINOR_VERSION .*?([\r\n]+)$/) {
$line = sprintf("set(PROJECT_MINOR_VERSION %d)$1", $version_pref{"version_minor"});
- } elsif ($line =~ /^set *\( *PROJECT_PATCH_VERSION .*([\r\n]+)$/) {
+ } elsif ($line =~ /^set *\( *PROJECT_PATCH_VERSION .*?([\r\n]+)$/) {
$line = sprintf("set(PROJECT_PATCH_VERSION %d)$1", $version_pref{"version_micro"});
- } elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION.*([\r\n]+)$/) {
- $line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $cmake_package_string);
+ } elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION .*?([\r\n]+)$/) {
+ $line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $package_string);
}
$contents .= $line
}
open(CFGIN, "< $filepath") || die "Can't read $filepath!";
while ($line = <CFGIN>) {
- if ($line =~ /^m4_define\( *\[?version_major\]? *,.*([\r\n]+)$/) {
+ if ($line =~ /^m4_define\( *\[?version_major\]? *,.*?([\r\n]+)$/) {
$line = sprintf("m4_define([version_major], [%d])$1", $version_pref{"version_major"});
- } elsif ($line =~ /^m4_define\( *\[?version_minor\]? *,.*([\r\n]+)$/) {
+ } elsif ($line =~ /^m4_define\( *\[?version_minor\]? *,.*?([\r\n]+)$/) {
$line = sprintf("m4_define([version_minor], [%d])$1", $version_pref{"version_minor"});
- } elsif ($line =~ /^m4_define\( *\[?version_micro\]? *,.*([\r\n]+)$/) {
+ } elsif ($line =~ /^m4_define\( *\[?version_micro\]? *,.*?([\r\n]+)$/) {
$line = sprintf("m4_define([version_micro], [%d])$1", $version_pref{"version_micro"});
- } elsif ($line =~ /^m4_append\( *\[?version_micro_extra\]? *,.*([\r\n]+)$/) {
- $line = sprintf("m4_append([version_micro_extra], [%s])$1", $package_string);
+ } elsif ($line =~ /^m4_define\( *\[?version_extra\]? *,.*?([\r\n]+)$/) {
+ $line = sprintf("m4_define([version_extra], [%s])$1", $package_string);
}
$contents .= $line
}
print "$filepath 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 = "";
- my $filepath = "$srcdir/config.nmake";
- my $win_package_string = "\$(WIRESHARK_VERSION_EXTRA)";
-
- if ($package_string ne "") { $win_package_string = $package_string; }
-
-
- open(CFGNMAKE, "< $filepath") || die "Can't read $filepath!";
- while ($line = <CFGNMAKE>) {
- if ($line =~ /^VCS_REVISION=.*([\r\n]+)$/) {
- $line = sprintf("VCS_REVISION=%d$1", $num_commits);
- } 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=$win_package_string$1";
- }
- $contents .= $line
- }
-
- open(CFGNMAKE, "> $filepath") || die "Can't write $filepath!";
- print(CFGNMAKE $contents);
- close(CFGNMAKE);
- print "$filepath has been updated.\n";
-}
-
-# Read docbook/asciidoc.conf, then write it back out with an updated
+# Read docbook/attributes.asciidoc, then write it back out with an updated
# wireshark-version replacement line.
-sub update_release_notes
+sub update_attributes_asciidoc
{
my $line;
my $contents = "";
my $version = "";
- my $filepath = "$srcdir/docbook/asciidoc.conf";
-
- return if (!$set_version);
+ my $filepath = "$srcdir/docbook/attributes.asciidoc";
open(ADOC_CONF, "< $filepath") || die "Can't read $filepath!";
while ($line = <ADOC_CONF>) {
- # wireshark-version:\[\]=1.9.1
+ # :wireshark-version: 2.3.1
- if ($line =~ /^wireshark-version:\\\[\\\]=.*([\r\n]+)$/) {
- $line = sprintf("wireshark-version:\\\[\\\]=%d.%d.%d$1",
+ if ($line =~ /^:wireshark-version:.*?([\r\n]+)$/) {
+ $line = sprintf(":wireshark-version: %d.%d.%d$1",
$version_pref{"version_major"},
$version_pref{"version_minor"},
$version_pref{"version_micro"},
- );
+ );
}
$contents .= $line
}
my $version = "";
my $filepath = "$srcdir/debian/changelog";
- return if ($set_version == 0);
-
open(CHANGELOG, "< $filepath") || die "Can't read $filepath!";
while ($line = <CHANGELOG>) {
if ($set_version && CHANGELOG->input_line_number() == 1) {
- $line = sprintf("wireshark (%d.%d.%d) unstable; urgency=low\n",
+ $line =~ /^.*?([\r\n]+)$/;
+ $line = sprintf("wireshark (%d.%d.%d) unstable; urgency=low$1",
$version_pref{"version_major"},
$version_pref{"version_minor"},
$version_pref{"version_micro"},
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’)."
# changes with *most* releases.
#
# http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
- for $filedir ("epan", "wiretap") { # "wsutil"
+ for $filedir ("$srcdir/epan", "$srcdir/wiretap") { # "$srcdir/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"});
+ if ($line =~ /^(lib\w+_la_LDFLAGS.*version-info\s+\d+:)\d+(:\d+.*[\r\n]+)$/) {
+ $line = sprintf("$1%d$2", $version_pref{"version_micro"});
}
$contents .= $line
}
my $filedir;
my $filepath;
- return if (!$set_version);
-
- for $filedir ("epan", "wiretap") { # "wsutil"
+ for $filedir ("$srcdir/epan", "$srcdir/wiretap") { # "$srcdir/wsutil"
$contents = "";
$filepath = $filedir . "/CMakeLists.txt";
open(CMAKELISTS_TXT, "< $filepath") || die "Can't read $filepath!";
while ($line = <CMAKELISTS_TXT>) {
# set(FULL_SO_VERSION "0.0.0")
- if ($line =~ /^(set\s*\(\s*FULL_SO_VERSION\s+"\d+\.\d+\.)\d+(".*)/) {
- $line = sprintf("$1%d$2\n", $version_pref{"version_micro"});
+ if ($line =~ /^(set\s*\(\s*FULL_SO_VERSION\s+"\d+\.\d+\.)\d+(".*[\r\n]+)$/) {
+ $line = sprintf("$1%d$2", $version_pref{"version_micro"});
}
$contents .= $line
}
# Update distributed files that contain any version information
sub update_versioned_files
{
+ # Matches CMakeLists.txt
+ printf "GR: %d, MaV: %d, MiV: %d, PL: %d, EV: %s\n",
+ $num_commits, $version_pref{"version_major"},
+ $version_pref{"version_minor"}, $version_pref{"version_micro"},
+ $package_string;
&update_cmakelists_txt;
&update_configure_ac;
- &update_config_nmake;
- &update_release_notes;
- &update_debian_changelog;
- &update_automake_lib_releases;
- &update_cmake_lib_releases;
+ if ($set_version) {
+ &update_attributes_asciidoc;
+ &update_debian_changelog;
+ &update_automake_lib_releases;
+ &update_cmake_lib_releases;
+ }
}
sub new_version_h
{
- my $VCS_REVISION;
+ if (!$enable_vcsversion) {
+ return "/* #undef VCSVERSION */\n";
+ }
if ($git_description) {
- $VCS_REVISION = "#define VCSVERSION \"" .
- $git_description . "\"\n" .
- "#define VCSBRANCH \"" . $repo_branch . "\"\n";
- } elsif ($last_change && $num_commits) {
- $VCS_REVISION = "#define VCSVERSION \"" . $vcs_name . " Rev " .
- $num_commits . "\"\n" .
- "#define VCSBRANCH \"" . $repo_branch . "\"\n";
- } else {
- $VCS_REVISION = "#define VCSVERSION \"" . $vcs_name .
- " Rev Unknown\"\n" .
- "#define VCSBRANCH \"unknown\"\n";
+ # Do not bother adding the git branch, the git describe output
+ # normally contains the base tag and commit ID which is more
+ # than sufficient to determine the actual source tree.
+ return "#define VCSVERSION \"$git_description\"\n";
}
- return $VCS_REVISION;
+ if ($last_change && $num_commits) {
+ return "#define VCSVERSION \"$vcs_name Rev $num_commits from $repo_branch\"\n";
+ }
+
+ return "#define VCSVERSION \"$vcs_name Rev Unknown from unknown\"\n";
}
# Print the version control system's version to $version_file.
# Don't change the file if it is not needed.
sub print_VCS_REVISION
{
- my $VCS_REVISION = new_version_h();
+ my $VCS_REVISION;
my $needs_update = 1;
+
+ $VCS_REVISION = new_version_h();
if (open(OLDREV, "<$version_file")) {
- my $old_VCS_REVISION = <OLDREV> . <OLDREV>;
+ my $old_VCS_REVISION = <OLDREV>;
if ($old_VCS_REVISION eq $VCS_REVISION) {
$needs_update = 0;
}
print VER "$VCS_REVISION";
close VER;
print "$version_file has been updated.\n";
+ } elsif (!$enable_vcsversion) {
+ print "$version_file disabled.\n";
} else {
print "$version_file unchanged.\n";
}
}
if (! open(FILE, "<$vconf_file")) {
- print_diag "Version configuration file $vconf_file not "
- . "found. Using defaults.\n";
- return 1;
+ if (! open(FILE, "<$srcdir/$vconf_file")) {
+ print_diag "Version configuration file $vconf_file not "
+ . "found. Using defaults.\n";
+ return 1;
+ }
}
while (<FILE>) {
if ($set_version || $set_release) {
if ($set_version) {
- print "Generating version information\n";
+ print "Generating version information.\n";
}
if ($version_pref{"enable"} == 0) {
}
if ($set_release) {
- print "Generating release information\n";
+ print "Generating release information.\n";
} else {
print "Resetting release information\n";
$num_commits = 0;
--print-vcs Print the vcs version to standard output
--set-version, -v Set the major, minor, and micro versions in
the top-level CMakeLists.txt, configure.ac,
- config.nmake, docbook/asciidoc.conf,
- debian/changelog, the Makefile.am for all
- libraries, and the CMakeLists.txt for all
- libraries.
+ docbook/attributes.asciidoc, debian/changelog,
+ the Makefile.am for all libraries, and the
+ CMakeLists.txt for all libraries.
Resets the release information when used by
itself.
--set-release, -r Set the release information in the top-level
- CMakeLists.txt, configure.ac, and
- config.nmake.
+ CMakeLists.txt, configure.ac
--package-version, -p Deprecated. Same as --set-release.
--verbose Print diagnostic messages to STDERR.
git.samba.org / metze / wireshark / wip.git / blobdiff