aboutsummaryrefslogtreecommitdiffstats
path: root/make-version.pl
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2011-11-17 20:09:07 +0000
committerGerald Combs <gerald@wireshark.org>2011-11-17 20:09:07 +0000
commita8cc73a4e5f66d260a390bf87f743af2e00f0ae4 (patch)
tree352e4aa8eb68a366253431655f3e447f871d00ec /make-version.pl
parent9518cb7c7c04d1334a68271e29222855592d10cb (diff)
Update some comments.
svn path=/trunk/; revision=39913
Diffstat (limited to 'make-version.pl')
-rwxr-xr-xmake-version.pl17
1 files changed, 8 insertions, 9 deletions
diff --git a/make-version.pl b/make-version.pl
index f90ac4f06a..97c04d8903 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -31,17 +31,15 @@
# 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 version string. The sequence "%#" will substitute
# the SVN revision number.
-# pkg_enable - Enable or disable package versioning.
-# pkg_format - Like "format", but used for the package version.
+# pkg_enable - Enable or disable local package versioning.
+# pkg_format - Like "format", but used for the local package version.
#
-# 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 (it will also not be generated if 'is_release' is set
-# in version.conf).
+# If run with the "-r" or "--set-release" 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.
#
# Default configuration:
#
@@ -422,6 +420,7 @@ sub get_config {
my $show_help = 0;
# Get our command-line args
+ # XXX - Do we need an option to undo --set-release?
GetOptions(
"help|h", \$show_help,
"get-svn|g", \$get_svn,