packet-dcerpc: nca_s_fault_sec_pkg_error
[metze/wireshark/wip.git] / make-version.pl
index 684581bdfeb2d646bd7dd6ac387a2321345c8e2f..f12f8bc590a0bd35c35a99eb7e20808b067e4432 100755 (executable)
@@ -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
-# 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.
 #
@@ -84,7 +84,7 @@ my $set_version = 0;
 my $set_release = 0;
 my %version_pref = (
        "version_major" => 2,
-       "version_minor" => 1,
+       "version_minor" => 3,
        "version_micro" => 0,
        "version_build" => 0,
 
@@ -137,12 +137,12 @@ sub read_repo_info {
                $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_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)";
@@ -255,21 +255,7 @@ sub read_repo_info {
                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 {
@@ -405,9 +391,6 @@ sub update_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 "");
 
@@ -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"});
-               } elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION\b.*\) *$/) {
-                       $line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")\n", $cmake_package_string);
+               } elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION .*([\r\n]+)$/) {
+                       $line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $package_string);
                }
                $contents .= $line
        }
@@ -464,41 +447,6 @@ sub update_configure_ac
        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
@@ -512,8 +460,8 @@ sub update_release_notes
        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"},
@@ -622,9 +570,13 @@ sub update_cmake_lib_releases
 # 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;
        if ($set_version) {
                &update_release_notes;
                &update_debian_changelog;
@@ -756,7 +708,7 @@ sub get_config {
 
 if ($set_version || $set_release) {
        if ($set_version) {
-               print "Generating version information\n";
+               print "Generating version information.\n";
        }
 
        if ($version_pref{"enable"} == 0) {
@@ -765,7 +717,7 @@ if ($set_version || $set_release) {
        }
 
        if ($set_release) {
-               print "Generating release information\n";
+               print "Generating release information.\n";
        } else {
                print "Resetting release information\n";
                $num_commits = 0;
@@ -793,15 +745,13 @@ 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,
-                               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
-                               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.