Move the definition of MAX_NUM_COLOR_CONVERSATION_COLORS.

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

diff --git a/make-version.pl b/make-version.pl
index e32a1595d8112f957756e7c8f5711788feea4fa4..0eee0beabafe54d25c2e6c6ca29bf217286b5533 100755 (executable)
--- a/make-version.pl
+++ b/make-version.pl
@@ -45,7 +45,8 @@
 # Default configuration:
 #
 # enable: 1
-# svn_client: 1
+# git_client: 0
+# svn_client: 0
 # tortoise_svn: 0
 # format: git %Y%m%d%H%M%S
 # pkg_enable: 1
@@ -76,27 +77,28 @@ my $repo_branch = "unknown";
 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 = (
-       "version_major" => 1,
-       "version_minor" => 99,
-       "version_micro" => 4,
+       "version_major" => 2,
+       "version_minor" => 1,
+       "version_micro" => 0,
        "version_build" => 0,
 
        "enable"        => 1,
        "git_client"    => 0,   # set if .git found and .git/svn not found
-       "svn_client"    => 1,
+       "svn_client"    => 0,   # set if .svn found
        "tortoise_svn"  => 0,
        "format"        => "git %Y%m%d%H%M%S",
 
        # Normal development builds
-       #"pkg_enable" => 1,
-       #"pkg_format" => "-%#",
+       "pkg_enable" => 1,
+       "pkg_format" => "-%#",
 
        # Development releases
-       "pkg_enable" => 0,
-       "pkg_format" => "",
+       #"pkg_enable" => 0,
+       #"pkg_format" => "",
        );
 my $srcdir = ".";
 my $info_cmd = "";
@@ -114,8 +116,6 @@ sub read_repo_info {
        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";
 
@@ -129,6 +129,7 @@ sub read_repo_info {
        } elsif (-d "$srcdir/.svn" or -d "$srcdir/../.svn") {
                $info_source = "Command line (svn info)";
                $info_cmd = "svn info $srcdir";
+               $version_pref{"svn_client"} = 1;
        } elsif (-d "$srcdir/.git/svn") {
                $info_source = "Command line (git-svn)";
                $info_cmd = "(cd $srcdir; git svn info)";
@@ -176,11 +177,6 @@ sub read_repo_info {
                                $commit_id = $parts[-1];
                        }
 
-                       chomp($line = qx{git --git-dir=$srcdir/.git ls-remote --get-url origin});
-                       if (defined($line)) {
-                               $repo_url = $line;
-                       }
-
                        # This will break in some cases. Hopefully not during
                        # official package builds.
                        chomp($line = qx{git --git-dir=$srcdir/.git rev-parse --abbrev-ref --symbolic-full-name \@\{upstream\}});
@@ -191,10 +187,12 @@ sub read_repo_info {
                        1;
                };
 
-               if ($last_change && $num_commits && $repo_url && $repo_branch) {
+               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";
@@ -217,6 +215,10 @@ sub read_repo_info {
                        1;
                };
 
+               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;
                }
@@ -313,7 +315,7 @@ sub read_repo_info {
        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
@@ -363,10 +365,6 @@ sub read_repo_info {
                $package_string = strftime($package_format, gmtime($last_change));
        }
 
-       if ($repo_url && $repo_root && index($repo_url, $repo_root) == 0) {
-               $repo_branch = substr($repo_url, length($repo_root));
-       }
-
        if ($get_vcs) {
                print <<"Fin";
 Commit distance : $num_commits
@@ -374,6 +372,8 @@ Commit ID       : $commit_id
 Revision source : $info_source
 Release stamp   : $package_string
 Fin
+       } elsif ($print_vcs) {
+               print new_version_h();
        }
 }
 
@@ -625,12 +625,9 @@ sub update_versioned_files
        &update_cmake_lib_releases;
 }
 
-# Print the version control system's version to $version_file.
-# Don't change the file if it is not needed.
-sub print_VCS_REVISION
+sub new_version_h
 {
        my $VCS_REVISION;
-       my $needs_update = 1;
 
        if ($git_description) {
                $VCS_REVISION = "#define VCSVERSION \"" .
@@ -645,6 +642,16 @@ sub print_VCS_REVISION
                        " Rev Unknown\"\n" .
                        "#define VCSBRANCH \"unknown\"\n";
        }
+
+       return $VCS_REVISION;
+}
+
+# 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 $needs_update = 1;
        if (open(OLDREV, "<$version_file")) {
                my $old_VCS_REVISION = <OLDREV> . <OLDREV>;
                if ($old_VCS_REVISION eq $VCS_REVISION) {
@@ -677,13 +684,14 @@ sub get_config {
                   "help|h", \$show_help,
                   "get-vcs|get-svn|g", \$get_vcs,
                   "set-vcs|set-svn|s", \$set_vcs,
+                  "print-vcs", \$print_vcs,
                   "set-version|v", \$set_version,
                   "set-release|r|package-version|p", \$set_release
                   ) || pod2usage(2);
 
        if ($show_help) { pod2usage(1); }
 
-       if ( !( $show_help || $get_vcs || $set_vcs || $set_version || $set_release ) ) {
+       if ( !( $show_help || $get_vcs || $set_vcs || $print_vcs || $set_version || $set_release ) ) {
                $set_vcs = 1;
        }
 
@@ -753,6 +761,7 @@ make-version.pl [options] [source directory]
     --help, -h                 This help message
     --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
                                configure.ac, config.nmake, debian/changelog,
                               and docbook/asciidoc.conf.