diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-02-07 11:14:52 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-02-07 23:03:03 +0000 |
| commit | f966980937abd4899a9c43329041bb00798ab18e (patch) | |
| tree | e31210350fa778765b6d2d4711fc5cc6c27f2aae /config.nmake | |
| parent | 217f9fd0d9f2d6a9084da3fc945cce001414eea3 (diff) | |
Replace "svn" with "git" all over the place.
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.
Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96
Reviewed-on: https://code.wireshark.org/review/139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index 52cec4fc26..8a01829858 100644 --- a/config.nmake +++ b/config.nmake @@ -29,15 +29,15 @@ WIRESHARK_TARGET_PLATFORM=win32 ##### Versions ##### -# The SVN revision of our build. Updated by make-version.pl -SVN_REVISION=0 +# The Git description of our build. Updated by make-version.pl +GIT_REVISION=0 # The current Wireshark version. Recommended: Leave unchanged. # Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=11 VERSION_MICRO=3 -VERSION_BUILD=$(SVN_REVISION) +VERSION_BUILD=$(GIT_REVISION) # Local build information. Recommended: Unique string for your # environment, e.g. "-JackStackBarbecue". Updated by make-version.pl @@ -1308,7 +1308,7 @@ LYNX=lynx # The RC_VERSION should be comma-separated, not dot-separated, # as per Graham Bloice's message in # -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html +# http://www.wireshark.org/lists/ethereal-dev/200303/msg00283.html # # "The RC_VERSION variable in config.nmake should be comma separated. # This allows the resources to be built correctly and the version |