diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-11-17 00:19:03 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-11-17 00:19:03 +0000 |
| commit | 3f12c48aced9cc097cd792a4d4ac37d152fa2be4 (patch) | |
| tree | b3d4e1e923b43b0d867775a85b00f9a8e4ed27df /config.nmake | |
| parent | 8a630d8e37464518dfe7c5a9943ad612d0544b89 (diff) | |
Add an SVN_REVISION variable to config.nmake. This can be used to
retrieve our SVN revision in releases.
Use make-version.pl to set all version information. Be more explicit
about the tasks it performs:
- Fetching the SVN revision which corresponds to our code. The
revision can be fetched via "svn info", "git svn info", SubWCRev",
config.nmake, or by prodding .svn.
- Setting the version numbers (the "major.minor.micro" triplet).
- Setting the release information (revision/build number, local build
identifier)
Remove the "is_release" configuration option and dist-hook target.
When run with a "--set-*" option or no options make sure we leave a
valid svnversion.h behind.
svn path=/trunk/; revision=39891
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/config.nmake b/config.nmake index ad7ad4f3e7..fd84500a75 100644 --- a/config.nmake +++ b/config.nmake @@ -12,22 +12,25 @@ WIRESHARK_TARGET_PLATFORM=win32 ##### Versions ##### -# The current Wireshark version -# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged +# The SVN revision of our build. Updated by make-version.pl +SVN_REVISION=0 + +# The current Wireshark version. Recommended: Leave unchanged. +# Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=7 VERSION_MICRO=1 -VERSION_BUILD=0 -# It's recommended to change VERSION_EXTRA for your own custom builds -# e.g. "-SVN-12345" -VERSION_EXTRA= +VERSION_BUILD=$(SVN_REVISION) -# The version of the wiretap library (recommended: leave unchanged) -WTAP_VERSION_MAJOR=1 -WTAP_VERSION_MINOR=7 -WTAP_VERSION_MICRO=0 +# Local build information. Recommended: Unique string for your +# environment, e.g. "-JackStackBarbecue". Updated by make-version.pl +VERSION_EXTRA= +# The version of the wiretap library. Recommended: Leave unchanged. +WTAP_VERSION_MAJOR=$(VERSION_MAJOR) +WTAP_VERSION_MINOR=$(VERSION_MINOR) +WTAP_VERSION_MICRO=0 ##### Directories ##### |