Make sure we replace a line using the same line endings.
Change-Id: I73b07a773bc39b05ba7a73b3c3c984a73c545a48
Reviewed-on: https://code.wireshark.org/review/15157
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Print our various version variables when we set versions.
Change-Id: I9212369c17f3d2a040e83900945eb57670d4992d
Reviewed-on: https://code.wireshark.org/review/15156
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add a static "-git" extra version tag for VCS snapshot builds, to be
replaced when running 'make-version -r'.
Change-Id: If29fca04029ed3129aa2332492dc536091049955
Reviewed-on: https://code.wireshark.org/review/15032
Reviewed-by: João Valverde <j@v6e.pt>
If the file '.git/wireshark-disable-versioning' exists then version.h
will be commented out.
Change-Id: If481b673463408a69c2ecf7c2e66d08c5855537f
Reviewed-on: https://code.wireshark.org/review/14932
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
That makes it clearer what of the stuff we do for -v is also done, and
what of it is not done, for -r.
Change-Id: I23e8e8510f879e7430d2387a772691530fbd2f46
Reviewed-on: https://code.wireshark.org/review/14965
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Replace tabs with spaces in that message while we're at it.
Change-Id: I33354e6d1c3b4a6bbba232fe2270a5a6728cc889
Reviewed-on: https://code.wireshark.org/review/14960
Reviewed-by: Guy Harris <guy@alum.mit.edu>
git rev-parse @{upstream} will (obviously) fail if there is no
upstream set for the current branch. This is fairly common and
not problematic. Don't emit an error message to stderr when it
fails.
Change-Id: I4989fb19b25fefff83335061151e360c78652e88
Reviewed-on: https://code.wireshark.org/review/14151
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
This change allows make-version.pl to run correctly on Windows
without having the git binary dir in PATH. This prevents problems when
installing "Git for Windows" with default settings (git only available
via the bundled shell (bash).
Details:
* Add Git to the list of packages to be looked up by CMake.
* If Git is found by CMake, pass the full path to make-version.pl
* make-version.pl: Test whether git is available, and display a warning if git is missing.
On Unix-type systems this should have no impact.
Tested on Windows Server 2012 R2 and Ubuntu 15.04.
Change-Id: I7f7be2035c262658801586cb24c82b912848e31d
Reviewed-on: https://code.wireshark.org/review/13111
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
It may contain spaces (it does on my Windows 7 VM), so it must be
quoted. (There are probably other places where it needs to be quoted in
this script.)
Change-Id: If363691b0f94bbe75755072fd5245266566c3360
Reviewed-on: https://code.wireshark.org/review/12043
Reviewed-by: Guy Harris <guy@alum.mit.edu>
In subversion, the URL was needed to find the branch. This is not needed
for git where a 'git branch' command suffices.
Remove the unused URL handling from git, this fixes a warning during
cmake on RHEL6 and avoids a fallback to SVN:
Version configuration file version.conf not found. Using defaults.
usage: git ls-remote [--heads] [--tags] [-u <exec> | --upload-pack <exec>] <repository> <refs>...
Unable to open ./.svn/entries
#define VCSVERSION "v2.1.0rc0-69-g2eb7e87"
#define VCSBRANCH "master"
Print the SVN warning to stderr, this avoids a compilation failure due
to a syntax error in version.h.
Change-Id: Idb28e74b7a9bf592686b45349cf5e81f85f6c358
Reviewed-on: https://code.wireshark.org/review/11041
Reviewed-by: Gerald Combs <gerald@wireshark.org>
The 2.0.0rc0 Gtk+ GUI, when built from a source tarball, currently puts the
version in the title bar with the string "SVN Rev Unknown". This changes it
to say "Git Rev Unknown".
(I think there's a Better Way but that will come later.)
Change-Id: I04c903f20554cf681bac09a51a3ef46bb41696f1
Reviewed-on: https://code.wireshark.org/review/10984
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
It wasn't working on my system: I kept seeing the old git revision
in '...shark -v' even after deleting version.h
Change-Id: I75f41a7afcee4b9384f33a56014e4af6b527fec5
Reviewed-on: https://code.wireshark.org/review/10265
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include
file. Add macros to generate packaging-related targets and invoke them
from the top-level CMakeLists.txt.
Add a top-level "plugins" target. Copy plugins to "plugins" in each of
our staging directories instead of "plugins/$VERSION".
Add missing files to the copy_data_files and copy_cli_dlls targets.
Add all files in the NSIS package from the staging directory.
Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT.
Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa
Reviewed-on: https://code.wireshark.org/review/6459
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
PROJECT_VERSION_EXTENSION was updated to match g528a857 config.nmake.
Try to preserve it if it's set.
Change-Id: I48edfcd149ef5adafff7ece68e0d43a9cdec0b59
Reviewed-on: https://code.wireshark.org/review/6957
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Rename the --get-svn and --set-svn options to --get-vcs and --set-vcs;
continue to support --get-svn and --set-svn as aliases, for backwards
compatibility. Change variable names as well.
Change-Id: If25d81dae747f9825f7e3e5e937749f078f63d27
Reviewed-on: https://code.wireshark.org/review/6783
Reviewed-by: Guy Harris <guy@alum.mit.edu>
That makes it more VCS-neutral - apparently some people maintain private
versions under VCSes other than Git, and make-version.pl still handles
those VCSes.
Change-Id: Ie4914b16fea8ce800582729260c5e9b9cf1111f4
Reviewed-on: https://code.wireshark.org/review/6779
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Set the version variables in CMakeLists.txt directly from
make-version.pl instead of pulling them from configure.ac.
Use the correct default value for VERSION_EXTRA in config.nmake.
wireshark-common.files was removed in g97e1491. We don't need to update
it any more.
Change-Id: I751b6df9ac16e19090712aa79a68e308397c1d25
Reviewed-on: https://code.wireshark.org/review/6483
Reviewed-by: Gerald Combs <gerald@wireshark.org>
We decided at sharkfest that this wasn't the right design for file dissection;
we have more-or-less settled on way forward, but nobody's shown interest in
implementing it. Whether or not that ever happens, this code is effectively
dead and should be removed.
Change-Id: I14d6086df3204fffb6485228db39d9f407661417
Reviewed-on: https://code.wireshark.org/review/3400
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Gerald Combs