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 6f6ce5052fff06916a8d8bd8c3a16e13a3bb5f9f..f12f8bc590a0bd35c35a99eb7e20808b067e4432 100755 (executable)
--- a/make-version.pl
+++ b/make-version.pl
@@ -38,7 +38,7 @@
 #   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
 #   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.
 #
 # pkg_format template appended to the version number. version.h will
 # _not_ be generated if either argument is present.
 #


@@ -84,7 +84,7 @@ my $set_version = 0;
 my $set_release = 0;
 my %version_pref = (
        "version_major" => 2,
 my $set_release = 0;
 my %version_pref = (
        "version_major" => 2,

-       "version_minor" => 1,
+       "version_minor" => 3,

        "version_micro" => 0,
        "version_build" => 0,
 
        "version_micro" => 0,
        "version_build" => 0,
 


@@ -105,6 +105,7 @@ my %version_pref = (
 my $srcdir = ".";
 my $info_cmd = "";
 my $verbose = 0;
 my $srcdir = ".";
 my $info_cmd = "";
 my $verbose = 0;

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

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


@@ -125,7 +126,6 @@ sub read_repo_info {
        my $repo_version;
        my $do_hack = 1;
        my $info_source = "Unknown";
        my $repo_version;
        my $do_hack = 1;
        my $info_source = "Unknown";

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

 
        # Make sure git is available.
        if (!`$git_executable --version`) {
 
        # Make sure git is available.
        if (!`$git_executable --version`) {


@@ -137,12 +137,12 @@ sub read_repo_info {
                $package_format = $version_pref{"pkg_format"};
        }
 
                $package_format = $version_pref{"pkg_format"};
        }
 

-       if (-d "$srcdir/.git" && ! -d "$srcdir/.git/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 (git)";
                $version_pref{"git_client"} = 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)";
                $version_pref{"svn_client"} = 1;
        } elsif (-d "$srcdir/.git/svn") {
                $info_source = "Command line (git-svn)";


@@ -255,21 +255,7 @@ sub read_repo_info {
                unlink($tortoise_file);
        }
 
                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 {
 
                # Try git...
                eval {


@@ -405,9 +391,6 @@ sub update_cmakelists_txt
        my $contents = "";
        my $version = "";
        my $filepath = "$srcdir/CMakeLists.txt";
        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 "");
 
 
        return if (!$set_version && $package_string eq "");
 


@@ -421,8 +404,8 @@ sub update_cmakelists_txt
                        $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"});
                        $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", $cmake_package_string);
+               } elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION .*([\r\n]+)$/) {
+                       $line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $package_string);

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


@@ -452,8 +435,8 @@ sub update_configure_ac
                        $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"});
                        $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);
+               } elsif ($line =~ /^m4_define\( *\[?version_extra\]? *,.*([\r\n]+)$/) {
+                       $line = sprintf("m4_define([version_extra], [%s])$1", $package_string);

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


@@ -464,41 +447,6 @@ 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
-{
-       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
 # wireshark-version replacement line.
 sub update_release_notes
 # Read docbook/asciidoc.conf, then write it back out with an updated
 # wireshark-version replacement line.
 sub update_release_notes


@@ -508,14 +456,12 @@ sub update_release_notes
        my $version = "";
        my $filepath = "$srcdir/docbook/asciidoc.conf";
 
        my $version = "";
        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(ADOC_CONF, "< $filepath") || die "Can't read $filepath!";
        while ($line = <ADOC_CONF>) {
                # wireshark-version:\[\]=1.9.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"},
                                        $version_pref{"version_major"},
                                        $version_pref{"version_minor"},
                                        $version_pref{"version_micro"},


@@ -538,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) {


@@ -567,8 +511,6 @@ sub update_automake_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’)."


@@ -605,8 +547,6 @@ sub update_cmake_lib_releases
        my $filedir;
        my $filepath;
 
        my $filedir;
        my $filepath;
 

-       return if (!$set_version);
-

        for $filedir ("epan", "wiretap") {      # "wsutil"
                $contents = "";
                $filepath = $filedir . "/CMakeLists.txt";
        for $filedir ("epan", "wiretap") {      # "wsutil"
                $contents = "";
                $filepath = $filedir . "/CMakeLists.txt";


@@ -630,18 +570,31 @@ sub update_cmake_lib_releases
 # 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_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_release_notes;
+               &update_debian_changelog;
+               &update_automake_lib_releases;
+               &update_cmake_lib_releases;
+       }

 }
 
 sub new_version_h
 {
        my $VCS_REVISION;
 }
 
 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 \"" .
 
        if ($git_description) {
                $VCS_REVISION = "#define VCSVERSION \"" .


@@ -664,8 +617,18 @@ sub new_version_h
 # Don't change the file if it is not needed.
 sub print_VCS_REVISION
 {
 # 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;
        my $needs_update = 1;

+       my $set_header = 1;
+       my $git_cdir;
+
+       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")) {
                my $old_VCS_REVISION = <OLDREV> . <OLDREV>;
                if ($old_VCS_REVISION eq $VCS_REVISION) {
        if (open(OLDREV, "<$version_file")) {
                my $old_VCS_REVISION = <OLDREV> . <OLDREV>;
                if ($old_VCS_REVISION eq $VCS_REVISION) {


@@ -682,6 +645,8 @@ sub print_VCS_REVISION
                print VER "$VCS_REVISION";
                close VER;
                print "$version_file has been updated.\n";
                print VER "$VCS_REVISION";
                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";
        }


@@ -743,7 +708,7 @@ sub get_config {
 
 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) {


@@ -752,7 +717,7 @@ 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";
                $num_commits = 0;
        } else {
                print "Resetting release information\n";
                $num_commits = 0;


@@ -780,19 +745,17 @@ make-version.pl [options] [source directory]
     --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,
     --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/asciidoc.conf, 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
                                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.
 
     --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.
 
 =cut
 is assumed.
 
 =cut