packet-dcerpc: nca_s_fault_sec_pkg_error

[metze/wireshark/wip.git] / make-version.pl

diff --git a/make-version.pl b/make-version.pl
index 660583b2b653f69739a0d025b0d0fbac7501e6dd..f12f8bc590a0bd35c35a99eb7e20808b067e4432 100755 (executable)
--- a/make-version.pl
+++ b/make-version.pl
@@ -2,8 +2,6 @@
 #
 # Copyright 2004 Jörg Mayer (see AUTHORS file)
 #
 #
 # Copyright 2004 Jörg Mayer (see AUTHORS file)
 #

-# $Id$
-#

 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs


@@ -27,27 +25,32 @@
 # If "version.conf" is present, it is parsed for configuration values.
 # Possible values are:
 #
 # If "version.conf" is present, it is parsed for configuration values.
 # Possible values are:
 #

-#   enable     - Enable or disable versioning.  Zero (0) disables, nonzero
-#               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 SVN revision number.
-#   pkg_enable - Enable or disable local package versioning.
-#   pkg_format - Like "format", but used for the local package version.
+#   enable       - Enable or disable versioning.  Zero (0) disables, nonzero
+#                 enables.
+#   svn_client   - Use svn client i.s.o. ugly internal SVN file hack
+#   tortoise_svn - Use TortoiseSVN client instead of ugly internal SVN
+#                 file hack
+#   format       - A strftime() formatted string to use as a template for
+#                 the version string. The sequence "%#" will substitute
+#                 the number of commits for Git or the revision number
+#                 for SVN.
+#   pkg_enable   - Enable or disable local package versioning.
+#   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
 #
 # 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
-# pkg_format template appended to the version number. svnversion.h will
+# 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.
 #
 # Default configuration:
 #
 # enable: 1
 # _not_ be generated if either argument is present.
 #
 # Default configuration:
 #
 # enable: 1

-# svn_client: 1
-# format: SVN %Y%m%d%H%M%S
+# git_client: 0
+# svn_client: 0
+# tortoise_svn: 0
+# format: git %Y%m%d%H%M%S

 # pkg_enable: 1
 # pkg_enable: 1

-# pkg_format: -SVN-%#
+# pkg_format: -%#

 
 # XXX - We're pretty dumb about the "%#" substitution, and about having
 # spaces in the package format.
 
 # XXX - We're pretty dumb about the "%#" substitution, and about having
 # spaces in the package format.


@@ -55,38 +58,45 @@
 use strict;
 
 use Time::Local;
 use strict;
 
 use Time::Local;

+use File::Basename;
+use File::Spec;

 use POSIX qw(strftime);
 use Getopt::Long;
 use Pod::Usage;
 use IO::Handle;
 use English;
 
 use POSIX qw(strftime);
 use Getopt::Long;
 use Pod::Usage;
 use IO::Handle;
 use English;
 

-my $version_file = 'svnversion.h';
+my $version_file = 'version.h';

 my $package_string = "";
 my $vconf_file = 'version.conf';
 my $package_string = "";
 my $vconf_file = 'version.conf';

+my $vcs_name = "Git";

 my $tortoise_file = "tortoise_template";
 my $last_change = 0;
 my $tortoise_file = "tortoise_template";
 my $last_change = 0;

-my $revision = 0;
-my $repo_path = "unknown";
-my $get_svn = 0;
-my $set_svn = 0;
+my $num_commits = 0;
+my $commit_id = '';
+my $repo_branch = "unknown";
+my $git_executable = "git";
+my $git_description = undef;
+my $get_vcs = 0;
+my $set_vcs = 0;
+my $print_vcs = 0;

 my $set_version = 0;
 my $set_release = 0;
 my %version_pref = (
 my $set_version = 0;
 my $set_release = 0;
 my %version_pref = (

-       "version_major" => 1,
-       "version_minor" => 9,
+       "version_major" => 2,
+       "version_minor" => 3,

        "version_micro" => 0,
        "version_build" => 0,
 
        "enable"        => 1,
        "version_micro" => 0,
        "version_build" => 0,
 
        "enable"        => 1,

-       "svn_client"    => 1,
+       "git_client"    => 0,   # set if .git found and .git/svn not found
+       "svn_client"    => 0,   # set if .svn found

        "tortoise_svn"  => 0,
        "tortoise_svn"  => 0,

-       "format"        => "SVN %Y%m%d%H%M%S",
-       "is_release"    => 0,
+       "format"        => "git %Y%m%d%H%M%S",

 
        # Normal development builds
        "pkg_enable" => 1,
 
        # Normal development builds
        "pkg_enable" => 1,

-       "pkg_format" => "-SVN-%#",
+       "pkg_format" => "-%#",

 
        # Development releases
        #"pkg_enable" => 0,
 
        # Development releases
        #"pkg_enable" => 0,


@@ -94,38 +104,109 @@ my %version_pref = (
        );
 my $srcdir = ".";
 my $info_cmd = "";
        );
 my $srcdir = ".";
 my $info_cmd = "";

+my $verbose = 0;
+my $devnull = File::Spec->devnull();

 
 # Ensure we run with correct locale
 $ENV{LANG} = "C";
 $ENV{LC_ALL} = "C";
 
 # Ensure we run with correct locale
 $ENV{LANG} = "C";
 $ENV{LC_ALL} = "C";

+$ENV{GIT_PAGER} = "";
+
+sub print_diag {
+       print STDERR @_ if $verbose;
+}

 
 

-# Run "svn info".  Parse out the most recent modification time and the
-# revision number.
-sub read_svn_info {
+# Attempt to get revision information from the repository.
+sub read_repo_info {

        my $line;
        my $version_format = $version_pref{"format"};
        my $package_format = "";
        my $in_entries = 0;
        my $svn_name;
        my $repo_version;
        my $line;
        my $version_format = $version_pref{"format"};
        my $package_format = "";
        my $in_entries = 0;
        my $svn_name;
        my $repo_version;

-       my $repo_root = undef;
-       my $repo_url = undef;

        my $do_hack = 1;
        my $info_source = "Unknown";
 
        my $do_hack = 1;
        my $info_source = "Unknown";
 

-       if ($version_pref{"pkg_enable"}) {
+       # 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"};
        }
 
                $package_format = $version_pref{"pkg_format"};
        }
 

-       if (-d "$srcdir/.svn") {
+       if (-e "$srcdir/.git" && ! -d "$srcdir/.git/svn") {
+               $info_source = "Command line (git)";
+               $version_pref{"git_client"} = 1;
+       } elsif (-d "$srcdir/.svn" or -d "$srcdir/../.svn") {

                $info_source = "Command line (svn info)";
                $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)";
        } elsif (-d "$srcdir/.git/svn") {
                $info_source = "Command line (git-svn)";

-               $info_cmd = "(cd $srcdir; git svn info)";
+               $info_cmd = "(cd $srcdir; $git_executable svn info)";

        }
 
        }
 

-       if ($version_pref{"svn_client"}) {
+       #Git can give us:
+       #
+       # A big ugly hash: git rev-parse HEAD
+       # 1ddc83849075addb0cac69a6fe3782f4325337b9
+       #
+       # A small ugly hash: git rev-parse --short HEAD
+       # 1ddc838
+       #
+       # The upstream branch path: git rev-parse --abbrev-ref --symbolic-full-name @{upstream}
+       # origin/master
+       #
+       # A version description: git describe --tags --dirty
+       # wireshark-1.8.12-15-g1ddc838
+       #
+       # Number of commits in this branch: git rev-list --count HEAD
+       # 48879
+       #
+       # Number of commits since 1.8.0: git rev-list --count 5e212d72ce098a7fec4332cbe6c22fcda796a018..HEAD
+       # 320
+       #
+       # Refs: git ls-remote code.wireshark.org:wireshark
+       # ea19c7f952ce9fc53fe4c223f1d9d6797346258b (r48972, changed version to 1.11.0)
+
+       if ($version_pref{"git_client"}) {
+               eval {
+                       use warnings "all";
+                       no warnings "all";
+
+                       chomp($line = qx{$git_executable --git-dir="$srcdir"/.git log -1 --pretty=format:%at});
+                       if ($? == 0 && length($line) > 1) {
+                               $last_change = $line;
+                       }
+
+                       # Commits since last annotated tag.
+                       chomp($line = qx{$git_executable --git-dir="$srcdir"/.git describe --long --always --match "v*"});
+                       if ($? == 0 && length($line) > 1) {
+                               my @parts = split(/-/, $line);
+                               $git_description = $line;
+                               $num_commits = $parts[-2];
+                               $commit_id = $parts[-1];
+                       }
+
+                       # This will break in some cases. Hopefully not during
+                       # official package builds.
+                       chomp($line = qx{$git_executable --git-dir="$srcdir"/.git rev-parse --abbrev-ref --symbolic-full-name \@\{upstream\} 2> $devnull});
+                       if ($? == 0 && length($line) > 1) {
+                               $repo_branch = basename($line);
+                       }
+
+                       1;
+               };
+
+               if ($last_change && $num_commits && $repo_branch) {
+                       $do_hack = 0;
+               }
+       } elsif ($version_pref{"svn_client"}) {
+               my $repo_root = undef;
+               my $repo_url = undef;

                eval {
                        use warnings "all";
                        no warnings "all";
                eval {
                        use warnings "all";
                        no warnings "all";


@@ -135,7 +216,7 @@ sub read_svn_info {
                                        $last_change = timegm($6, $5, $4, $3, $2 - 1, $1);
                                }
                                if ($line =~ /Last Changed Rev: (\d+)/) {
                                        $last_change = timegm($6, $5, $4, $3, $2 - 1, $1);
                                }
                                if ($line =~ /Last Changed Rev: (\d+)/) {

-                                       $revision = $1;
+                                       $num_commits = $1;

                                }
                                if ($line =~ /URL: (\S+)/) {
                                        $repo_url = $1;
                                }
                                if ($line =~ /URL: (\S+)/) {
                                        $repo_url = $1;


@@ -143,18 +224,23 @@ sub read_svn_info {
                                if ($line =~ /Repository Root: (\S+)/) {
                                        $repo_root = $1;
                                }
                                if ($line =~ /Repository Root: (\S+)/) {
                                        $repo_root = $1;
                                }

+                               $vcs_name = "SVN";

                        }
                        1;
                };
 
                        }
                        1;
                };
 

-               if ($last_change && $revision && $repo_url && $repo_root) {
+               if ($repo_url && $repo_root && index($repo_url, $repo_root) == 0) {
+                       $repo_branch = substr($repo_url, length($repo_root));
+               }
+
+               if ($last_change && $num_commits && $repo_url && $repo_root) {

                        $do_hack = 0;
                }
        } elsif ($version_pref{"tortoise_svn"}) {
                # Dynamically generic template file needed by TortoiseSVN
                open(TORTOISE, ">$tortoise_file");
                        $do_hack = 0;
                }
        } elsif ($version_pref{"tortoise_svn"}) {
                # Dynamically generic template file needed by TortoiseSVN
                open(TORTOISE, ">$tortoise_file");

-               print TORTOISE "#define SVNVERSION \"\$WCREV\$\"\r\n";
-               print TORTOISE "#define SVNPATH \"\$WCURL\$\"\r\n";
+               print TORTOISE "#define VCSVERSION \"\$WCREV\$\"\r\n";
+               print TORTOISE "#define VCSBRANCH \"\$WCURL\$\"\r\n";

                close(TORTOISE);
 
                $info_source = "Command line (SubWCRev)";
                close(TORTOISE);
 
                $info_source = "Command line (SubWCRev)";


@@ -163,26 +249,13 @@ sub read_svn_info {
                if ($tortoise == 0) {
                        $do_hack = 0;
                }
                if ($tortoise == 0) {
                        $do_hack = 0;
                }

+               $vcs_name = "SVN";

 
                #clean up the template file
                unlink($tortoise_file);
        }
 
 
                #clean up the template file
                unlink($tortoise_file);
        }
 

-       if ($revision == 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 =~ /^SVN_REVISION=(\d+)/) {
-                               $revision = $1;
-                               $do_hack = 0;
-                               last;
-                       }
-               }
-               close (CFGNMAKE);
-       }
-       if ($revision == 0 and -d "$srcdir/.git") {
+       if ($num_commits == 0 and -e "$srcdir/.git") {

 
                # Try git...
                eval {
 
                # Try git...
                eval {


@@ -190,32 +263,32 @@ sub read_svn_info {
                        no warnings "all";
                        # If someone had properly tagged 1.9.0 we could also use
                        # "git describe --abbrev=1 --tags HEAD"
                        no warnings "all";
                        # If someone had properly tagged 1.9.0 we could also use
                        # "git describe --abbrev=1 --tags HEAD"

-                       
-                       $info_cmd = "(cd $srcdir; git log --format='%b' -n 1)";
+
+                       $info_cmd = "(cd $srcdir; $git_executable log --format='%b' -n 1)";

                        $line = qx{$info_cmd};
                        if (defined($line)) {
                                if ($line =~ /svn path=.*; revision=(\d+)/) {
                        $line = qx{$info_cmd};
                        if (defined($line)) {
                                if ($line =~ /svn path=.*; revision=(\d+)/) {

-                                       $revision = $1;
+                                       $num_commits = $1;

                                }
                        }
                                }
                        }

-                       $info_cmd = "(cd $srcdir; git log --format='%ad' -n 1 --date=iso)";
+                       $info_cmd = "(cd $srcdir; $git_executable log --format='%ad' -n 1 --date=iso)";

                        $line = qx{$info_cmd};
                        if (defined($line)) {
                                if ($line =~ /(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/) {
                                        $last_change = timegm($6, $5, $4, $3, $2 - 1, $1);
                                }
                        }
                        $line = qx{$info_cmd};
                        if (defined($line)) {
                                if ($line =~ /(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/) {
                                        $last_change = timegm($6, $5, $4, $3, $2 - 1, $1);
                                }
                        }

-                       $info_cmd = "(cd $srcdir; git branch)";
+                       $info_cmd = "(cd $srcdir; $git_executable branch)";

                        $line = qx{$info_cmd};
                        if (defined($line)) {
                                if ($line =~ /\* (\S+)/) {
                        $line = qx{$info_cmd};
                        if (defined($line)) {
                                if ($line =~ /\* (\S+)/) {

-                                       $repo_path = $1;
+                                       $repo_branch = $1;

                                }
                        }
                        1;
                        };
        }
                                }
                        }
                        1;
                        };
        }

-       if ($revision == 0 and -d "$srcdir/.bzr") {
+       if ($num_commits == 0 and -d "$srcdir/.bzr") {

 
                # Try bzr...
                eval {
 
                # Try bzr...
                eval {


@@ -228,9 +301,10 @@ sub read_svn_info {
                                        $last_change = timegm($6, $5, $4, $3, $2 - 1, $1);
                                }
                                if ($line =~ /svn revno: (\d+) \(on (\S+)\)/) {
                                        $last_change = timegm($6, $5, $4, $3, $2 - 1, $1);
                                }
                                if ($line =~ /svn revno: (\d+) \(on (\S+)\)/) {

-                                       $revision = $1;
-                                       $repo_path = $2;
+                                       $num_commits = $1;
+                                       $repo_branch = $2;

                                }
                                }

+                               $vcs_name = "Bzr";

                        }
                        1;
                        };
                        }
                        1;
                        };


@@ -241,7 +315,7 @@ sub read_svn_info {
        if ($do_hack) {
                # Start of ugly internal SVN file hack
                if (! open (ENTRIES, "< $srcdir/.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");
+                       print STDERR "Unable to open $srcdir/.svn/entries\n";

                } else {
                        $info_source = "Prodding .svn";
                        # We need to find out whether our parser can handle the entries file
                } else {
                        $info_source = "Prodding .svn";
                        # We need to find out whether our parser can handle the entries file


@@ -267,11 +341,11 @@ sub read_svn_info {
                                                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 =~ /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 =~ /revision="(\d+)"/) { $num_commits = $1; }

                                        }
                                        if ($line =~ /\/>/) {
                                                if (($svn_name eq "" || $svn_name eq "svn:this_dir") &&
                                        }
                                        if ($line =~ /\/>/) {
                                                if (($svn_name eq "" || $svn_name eq "svn:this_dir") &&

-                                                               $last_change && $revision) {
+                                                               $last_change && $num_commits) {

                                                        $in_entries = 0;
                                                        last;
                                                }
                                                        $in_entries = 0;
                                                        last;
                                                }


@@ -285,47 +359,53 @@ sub read_svn_info {
 
        # If we picked up the revision and modification time,
        # generate our strings.
 
        # If we picked up the revision and modification time,
        # generate our strings.

-       if ($revision && $last_change) {
-               $version_format =~ s/%#/$revision/;
-               $package_format =~ s/%#/$revision/;
+       if ($version_pref{"pkg_enable"}) {
+               $version_format =~ s/%#/$num_commits/;
+               $package_format =~ s/%#/$num_commits-$commit_id/;

                $package_string = strftime($package_format, gmtime($last_change));
        }
 
                $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));
-       }
-
-       if ($get_svn) {
+       if ($get_vcs) {

                print <<"Fin";
                print <<"Fin";

-SVN revision    : $revision
+Commit distance : $num_commits
+Commit ID       : $commit_id

 Revision source : $info_source
 Release stamp   : $package_string
 Fin
 Revision source : $info_source
 Release stamp   : $package_string
 Fin

+       } elsif ($print_vcs) {
+               print new_version_h();

        }
 }
 
 
        }
 }
 
 

-# Read configure.ac, then write it back out with an updated
-# "AC_INIT" line.
-sub update_configure_ac
+# Read CMakeLists.txt, then write it back out with updated "set(PROJECT_..._VERSION ...)
+# lines
+# set(GIT_REVISION 999)
+# set(PROJECT_MAJOR_VERSION 1)
+# set(PROJECT_MINOR_VERSION 99)
+# set(PROJECT_PATCH_VERSION 0)
+# set(PROJECT_VERSION_EXTENSION "-rc5")
+sub update_cmakelists_txt

 {
        my $line;
        my $contents = "";
        my $version = "";
 {
        my $line;
        my $contents = "";
        my $version = "";

-       my $filepath = "$srcdir/configure.ac";
+       my $filepath = "$srcdir/CMakeLists.txt";

 
        return if (!$set_version && $package_string eq "");
 
        open(CFGIN, "< $filepath") || die "Can't read $filepath!";
        while ($line = <CFGIN>) {
 
        return if (!$set_version && $package_string eq "");
 
        open(CFGIN, "< $filepath") || die "Can't read $filepath!";
        while ($line = <CFGIN>) {

-               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]+)$/) {
-                       $line = sprintf("m4_define([version_minor], [%d])$1", $version_pref{"version_minor"});
-               } 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);
+               if ($line =~ /^set *\( *GIT_REVISION .*([\r\n]+)$/) {
+                       $line = sprintf("set(GIT_REVISION %d)$1", $num_commits);
+               } 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]+)$/) {
+                       $line = sprintf("set(PROJECT_MINOR_VERSION %d)$1", $version_pref{"version_minor"});
+               } 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", $package_string);

                }
                $contents .= $line
        }
                }
                $contents .= $line
        }


@@ -336,54 +416,52 @@ sub update_configure_ac
        print "$filepath has been updated.\n";
 }
 
        print "$filepath has been updated.\n";
 }
 

-# Read config.nmake, then write it back out with an updated
-# "VERSION" line.
-sub update_config_nmake
+# Read configure.ac, then write it back out with an updated
+# "AC_INIT" line.
+sub update_configure_ac

 {
        my $line;
        my $contents = "";
        my $version = "";
 {
        my $line;
        my $contents = "";
        my $version = "";

-       my $filepath = "$srcdir/config.nmake";
-
-       open(CFGNMAKE, "< $filepath") || die "Can't read $filepath!";
-       while ($line = <CFGNMAKE>) {
-               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";
+       my $filepath = "$srcdir/configure.ac";
+
+       return if (!$set_version && $package_string eq "");
+
+       open(CFGIN, "< $filepath") || die "Can't read $filepath!";
+       while ($line = <CFGIN>) {
+               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]+)$/) {
+                       $line = sprintf("m4_define([version_minor], [%d])$1", $version_pref{"version_minor"});
+               } elsif ($line =~ /^m4_define\( *\[?version_micro\]? *,.*([\r\n]+)$/) {
+                       $line = sprintf("m4_define([version_micro], [%d])$1", $version_pref{"version_micro"});
+               } elsif ($line =~ /^m4_define\( *\[?version_extra\]? *,.*([\r\n]+)$/) {
+                       $line = sprintf("m4_define([version_extra], [%s])$1", $package_string);

                }
                $contents .= $line
        }
 
                }
                $contents .= $line
        }
 

-       open(CFGNMAKE, "> $filepath") || die "Can't write $filepath!";
-       print(CFGNMAKE $contents);
-       close(CFGNMAKE);
+       open(CFGIN, "> $filepath") || die "Can't write $filepath!";
+       print(CFGIN $contents);
+       close(CFGIN);

        print "$filepath has been updated.\n";
 }
 
        print "$filepath has been updated.\n";
 }
 

-# Read docbook/release_notes.xml, then write it back out with an updated
-# "WiresharkCurrentVersion" line.
+# Read docbook/asciidoc.conf, then write it back out with an updated
+# wireshark-version replacement line.

 sub update_release_notes
 {
        my $line;
        my $contents = "";
        my $version = "";
 sub update_release_notes
 {
        my $line;
        my $contents = "";
        my $version = "";

-       my $filepath = "$srcdir/docbook/release-notes.xml";
+       my $filepath = "$srcdir/docbook/asciidoc.conf";

 
 

-       return if (!$set_version);
+       open(ADOC_CONF, "< $filepath") || die "Can't read $filepath!";
+       while ($line = <ADOC_CONF>) {
+               # wireshark-version:\[\]=1.9.1

 
 

-       open(RELNOTES, "< $filepath") || die "Can't read $filepath!";
-       while ($line = <RELNOTES>) {
-               #   <!ENTITY WiresharkCurrentVersion "1.7.1">
-
-               if ($line =~ /<\!ENTITY\s+WiresharkCurrentVersion\s+.*([\r\n]+)$/) {
-                       $line = sprintf("<!ENTITY WiresharkCurrentVersion \"%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"},
                                        $version_pref{"version_major"},
                                        $version_pref{"version_minor"},
                                        $version_pref{"version_micro"},


@@ -392,9 +470,9 @@ sub update_release_notes
                $contents .= $line
        }
 
                $contents .= $line
        }
 

-       open(RELNOTES, "> $filepath") || die "Can't write $filepath!";
-       print(RELNOTES $contents);
-       close(RELNOTES);
+       open(ADOC_CONF, "> $filepath") || die "Can't write $filepath!";
+       print(ADOC_CONF $contents);
+       close(ADOC_CONF);

        print "$filepath has been updated.\n";
 }
 
        print "$filepath has been updated.\n";
 }
 


@@ -406,8 +484,6 @@ sub update_debian_changelog
        my $version = "";
        my $filepath = "$srcdir/debian/changelog";
 
        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) {
        open(CHANGELOG, "< $filepath") || die "Can't read $filepath!";
        while ($line = <CHANGELOG>) {
                if ($set_version && CHANGELOG->input_line_number() == 1) {


@@ -426,36 +502,8 @@ sub update_debian_changelog
        print "$filepath has been updated.\n";
 }
 
        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.
 # Read Makefile.am for each library, then write back out an updated version.

-sub update_lib_releases
+sub update_automake_lib_releases

 {
        my $line;
        my $contents = "";
 {
        my $line;
        my $contents = "";


@@ -463,8 +511,6 @@ sub update_lib_releases
        my $filedir;
        my $filepath;
 
        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’)."
        # 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’)."


@@ -492,48 +538,115 @@ sub update_lib_releases
        }
 }
 
        }
 }
 

+# Read CMakeLists.txt for each library, then write back out an updated version.
+sub update_cmake_lib_releases
+{
+       my $line;
+       my $contents = "";
+       my $version = "";
+       my $filedir;
+       my $filepath;
+
+       for $filedir ("epan", "wiretap") {      # "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"});
+                       }
+                       $contents .= $line
+               }
+
+               open(CMAKELISTS_TXT, "> $filepath") || die "Can't write $filepath!";
+               print(CMAKELISTS_TXT $contents);
+               close(CMAKELISTS_TXT);
+               print "$filepath has been updated.\n";
+       }
+}
+

 # Update distributed files that contain any version information
 sub update_versioned_files
 {
 # 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_configure_ac;

-       &update_config_nmake;
-       &update_release_notes;
-       &update_debian_changelog;
-       &update_debian_wcf;
-       &update_lib_releases;
+       if ($set_version) {
+               &update_release_notes;
+               &update_debian_changelog;
+               &update_automake_lib_releases;
+               &update_cmake_lib_releases;
+       }
+}
+
+sub new_version_h
+{
+       my $VCS_REVISION;
+       my $set_header = shift @_;
+
+       if (!$set_header) {
+               $VCS_REVISION = "/* #undef VCSVERSION */\n";
+               $VCS_REVISION .= "/* #undef VCSBRANCH */\n";
+               return $VCS_REVISION;
+       }
+
+       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";
+       }
+
+       return $VCS_REVISION;

 }
 
 }
 

-# Print the SVN version to $version_file.
+# Print the version control system's version to $version_file.

 # Don't change the file if it is not needed.
 # Don't change the file if it is not needed.

-sub print_svn_revision
+sub print_VCS_REVISION

 {
 {

-       my $svn_revision;
+       my $VCS_REVISION;

        my $needs_update = 1;
        my $needs_update = 1;

+       my $set_header = 1;
+       my $git_cdir;

 
 

-       if ($last_change && $revision) {
-               $svn_revision = "#define SVNVERSION \"SVN Rev " .
-                       $revision . "\"\n" .
-                       "#define SVNPATH \"" . $repo_path . "\"\n";
-       } else {
-               $svn_revision = "#define SVNVERSION \"SVN Rev Unknown\"\n" .
-                       "#define SVNPATH \"unknown\"\n";
+       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";
+               $set_header = 0;

        }
        }

+
+       $VCS_REVISION = new_version_h($set_header);

        if (open(OLDREV, "<$version_file")) {
        if (open(OLDREV, "<$version_file")) {

-               my $old_svn_revision = <OLDREV> . <OLDREV>;
-               if ($old_svn_revision eq $svn_revision) {
+               my $old_VCS_REVISION = <OLDREV> . <OLDREV>;
+               if ($old_VCS_REVISION eq $VCS_REVISION) {

                        $needs_update = 0;
                }
                close OLDREV;
        }
 
                        $needs_update = 0;
                }
                close OLDREV;
        }
 

-       if (! $set_svn) { return; }
+       if (! $set_vcs) { return; }

 
        if ($needs_update) {
 
        if ($needs_update) {

-               # print "Updating $version_file so it contains:\n$svn_revision";
+               # print "Updating $version_file so it contains:\n$VCS_REVISION";

                open(VER, ">$version_file") || die ("Cannot write to $version_file ($!)\n");
                open(VER, ">$version_file") || die ("Cannot write to $version_file ($!)\n");

-               print VER "$svn_revision";
+               print VER "$VCS_REVISION";

                close VER;
                print "$version_file has been updated.\n";
                close VER;
                print "$version_file has been updated.\n";

+       } elsif (!$set_header) {
+               print "$version_file disabled.\n";

        } else {
                print "$version_file unchanged.\n";
        }
        } else {
                print "$version_file unchanged.\n";
        }


@@ -548,16 +661,19 @@ sub get_config {
        # XXX - Do we need an option to undo --set-release?
        GetOptions(
                   "help|h", \$show_help,
        # 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,
+                  "get-vcs|get-svn|g", \$get_vcs,
+                  "set-vcs|set-svn|s", \$set_vcs,
+                  "git-bin", \$git_executable,
+                  "print-vcs", \$print_vcs,

                   "set-version|v", \$set_version,
                   "set-version|v", \$set_version,

-                  "set-release|r|package-version|p", \$set_release
+                  "set-release|r|package-version|p", \$set_release,
+                  "verbose", \$verbose

                   ) || pod2usage(2);
 
        if ($show_help) { pod2usage(1); }
 
                   ) || pod2usage(2);
 
        if ($show_help) { pod2usage(1); }
 

-       if ( !( $show_help || $get_svn || $set_svn || $set_version || $set_release ) ) {
-               $set_svn = 1;
+       if ( !( $show_help || $get_vcs || $set_vcs || $print_vcs || $set_version || $set_release ) ) {
+               $set_vcs = 1;

        }
 
        if ($#ARGV >= 0) {
        }
 
        if ($#ARGV >= 0) {


@@ -565,13 +681,13 @@ sub get_config {
        }
 
        if (! open(FILE, "<$vconf_file")) {
        }
 
        if (! open(FILE, "<$vconf_file")) {

-               print STDERR "Version configuration file $vconf_file not "
-               . "found.  Using defaults.\n";
+               print_diag "Version configuration file $vconf_file not "
+               . "found. Using defaults.\n";

                return 1;
        }
 
        while (<FILE>) {
                return 1;
        }
 
        while (<FILE>) {

-               chomp;
+               s/^\s+|\s+$//g; # chomp() may not handle CR

                next if (/^#/);
                next unless (/^(\w+)(:|=)\s*(\S.*)/);
                $version_pref{$1} = $3;
                next if (/^#/);
                next unless (/^(\w+)(:|=)\s*(\S.*)/);
                $version_pref{$1} = $3;


@@ -586,13 +702,13 @@ sub get_config {
 
 &get_config();
 
 
 &get_config();
 

-&read_svn_info();
+&read_repo_info();

 
 

-&print_svn_revision;
+&print_VCS_REVISION;

 
 if ($set_version || $set_release) {
        if ($set_version) {
 
 if ($set_version || $set_release) {
        if ($set_version) {

-               print "Generating version information\n";
+               print "Generating version information.\n";

        }
 
        if ($version_pref{"enable"} == 0) {
        }
 
        if ($version_pref{"enable"} == 0) {


@@ -601,10 +717,10 @@ if ($set_version || $set_release) {
        }
 
        if ($set_release) {
        }
 
        if ($set_release) {

-               print "Generating release information\n";
+               print "Generating release information.\n";

        } else {
                print "Resetting release information\n";
        } else {
                print "Resetting release information\n";

-               $revision = 0;
+               $num_commits = 0;

                $package_string = "";
        }
 
                $package_string = "";
        }
 


@@ -624,20 +740,26 @@ make-version.pl [options] [source directory]
   Options:
 
     --help, -h                 This help message
   Options:
 
     --help, -h                 This help message

-    --get-svn, -g              Print the SVN revision and source.
-    --set-svn, -s              Set the information in svnversion.h
+    --get-vcs, -g              Print the VCS revision and source.
+    --set-vcs, -s              Set the information in version.h
+    --print-vcs                Print the vcs version to standard output

     --set-version, -v          Set the major, minor, and micro versions in
     --set-version, -v          Set the major, minor, and micro versions in

-                               configure.ac, config.nmake, debian/changelog,
-                              and docbook/release_notes.xml.
+                               the top-level CMakeLists.txt, configure.ac,
+                               docbook/asciidoc.conf, debian/changelog,
+                               the Makefile.am for all libraries, and the
+                               CMakeLists.txt for all libraries.

                                Resets the release information when used by
                                Resets the release information when used by

-                              itself.
-    --set-release, -r          Set the release information in configure.ac
-                               and config.nmake
+                               itself.
+    --set-release, -r          Set the release information in the top-level
+                               CMakeLists.txt, configure.ac

     --package-version, -p      Deprecated. Same as --set-release.
     --package-version, -p      Deprecated. Same as --set-release.

+    --verbose                  Print diagnostic messages to STDERR.

 
 

-Options can be used in any combination. If none are specified B<--set-svn>
+Options can be used in any combination. If none are specified B<--set-vcs>

 is assumed.
 
 is assumed.
 

+=cut
+

 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #