There's only one expert info dialog now; dispense with the "composite" part

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

diff --git a/make-version.pl b/make-version.pl
index 74f2a10ad1ad92de0af0ce37d4091c1dcf9029f3..33f44fd9bf1db3af5da6ff8a4be5389eef9e5f97 100755 (executable)
--- a/make-version.pl
+++ b/make-version.pl
@@ -35,12 +35,17 @@
 #               the SVN revision number.
 #   pkg_enable - Enable or disable package versioning.
 #   pkg_format - Like "format", but used for the package version.
+#   is_release - Specifies that we're building from a release tarball;
+#               svnversion.h is not updated.  This should be added only
+#               to the *released* version.conf, not the one used to build
+#               the release (IOW it should be added by automake's dist-hook).
 #
 # If run with the "-p" or "--package-version" argument, the
 # AC_INIT macro in configure.in and the VERSION macro in
 # config.nmake will have the pkg_format template appended to the 
 # version number.  svnversion.h will _not_ be generated if either
-# argument is present.
+# argument is present (it will also not be generated if 'is_release' is set
+# in version.conf).
 #
 # Default configuration:
 #
@@ -70,6 +75,7 @@ my %version_pref = (
        "enable"     => 1,
        "svn_client" => 1,
        "format"     => "SVN %Y%m%d%H%M%S",
+       "is_release" => 0,
 
        # Normal development builds
        "pkg_enable" => 1,
@@ -248,7 +254,7 @@ sub print_svn_version
        my $svn_version;
        my $needs_update = 1;
 
-       if ($pkg_version) { return; }
+       if ($pkg_version || $version_pref{"is_release"} == 1) { return; }
 
        if ($last_change && $revision) {
                $svn_version = "#define SVNVERSION \"SVN Rev " . 
@@ -288,7 +294,6 @@ sub get_config {
                $srcdir = $ARGV[0]
        }
 
-
        if (! open(FILE, "<$vconf_file")) {
                print STDERR "Version configuration file $vconf_file not "
                . "found.  Using defaults.\n";
@@ -314,7 +319,7 @@ sub get_config {
 if (-d "$srcdir/.svn") {
        $svn_info_cmd = "svn info $srcdir";
 } elsif (-d "$srcdir/.git/svn") {
-       $svn_info_cmd = "git svn info $srcdir";
+       $svn_info_cmd = "(cd $srcdir; git svn info)";
 }
 
 if ($svn_info_cmd) {