Age | Commit message (Collapse) | Author | Files | Lines |
|
When using git worktrees, the .git file is a regular file pointing to
the original git repository. Accept this case too. Also ignore the fact
that the original repo could be a git-svn repo, that is very unlikely.
Example workflow (requires git 2.5):
# Assume work in progress in current tree. Goal is to quickly do a
# fix in another branch and publish the changes without interfering
# with the WIP and without marking all files out of date (which
# slows down re-compilation).
git worktree add /tmp/wireshark-2.2 master-2.2
pushd /tmp/wireshark-2.2 # go to temporary tree
git cherry-pick -x COMMIT # backport the fix
git review # submit for review
popd # go back to original tree
rm -rf /tmp/wireshark-2.2 && git worktree prune # cleanup
# now continue working where you left work
Change-Id: Iba3c723142d9cbd8b07e76647594b5699ecafc67
Reviewed-on: https://code.wireshark.org/review/17002
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Change-Id: I133af2d3d05ae77c1030cf35812bb1f969f6a68b
Reviewed-on: https://code.wireshark.org/review/16575
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: If1a7f1232bbb23b27063d4ef618c2059293ff0c4
Reviewed-on: https://code.wireshark.org/review/16441
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
|
|
Change-Id: If03589159cbf7c1a0de97fd50edd06d1cd0e63bd
Reviewed-on: https://code.wireshark.org/review/16440
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I2895d29415bb191bf2d7fc0a4468f085085bd4d9
Reviewed-on: https://code.wireshark.org/review/16437
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Reviewed-on: https://code.wireshark.org/review/15777
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
|
|
The intent was to allow all sorts of overrides but, ugly.
I don't think we need $cmake_package_string either, at least with
these changes.
Follow-up to 7c6e859ccf210a45e1cc0f6da17692845e6b5a23.
(And bdec712166ba924a2cdeaaca8ae580c343eaf02c).
Change-Id: I808b6bd3a3c64d2a67165344e8fe23e8314c27db
Reviewed-on: https://code.wireshark.org/review/15835
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Change-Id: Ib8aab341be406d3c6e9139ae670489bd9e3edcc5
Reviewed-on: https://code.wireshark.org/review/15785
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I3fe4a2bc580b5788462f832abf62b53afb5d8ae1
Reviewed-on: https://code.wireshark.org/review/15782
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Many of our AsciiDoc "macros" are simple string replacements. Start
converting them to attributes.
Update the release notes.
Change-Id: I23d9ffd311f13a34c16cde3b4898b7f7bb8ba638
Reviewed-on: https://code.wireshark.org/review/15778
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
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>
|
|
Change-Id: I6b77c919e92af83c48bf02c49d865523f0a97d83
Reviewed-on: https://code.wireshark.org/review/15141
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
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>
|
|
Change-Id: I017a11e03ac705b3fe24c34b70105c51c4e18a49
Reviewed-on: https://code.wireshark.org/review/14962
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>
|
|
Change-Id: If8b9d7e356ebfe2cbb263a4cb67b18bafdd1b8ee
Reviewed-on: https://code.wireshark.org/review/13690
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
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>
|
|
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5
Reviewed-on: https://code.wireshark.org/review/10810
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d
Reviewed-on: https://code.wireshark.org/review/10363
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I6892f8ae21e927a6ab9281d952b96a54da94781e
Reviewed-on: https://code.wireshark.org/review/10358
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
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>
|
|
Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552
Reviewed-on: https://code.wireshark.org/review/9780
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I30b5797579335e414295be3996878a30aaef7d6b
Reviewed-on: https://code.wireshark.org/review/9772
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17
Reviewed-on: https://code.wireshark.org/review/8979
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: Ia990ad2c9a56ef41b1ed82509afe18079bdc451f
Reviewed-on: https://code.wireshark.org/review/8978
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I8c431f162d199c8507ba57d84e496dce5f5a0933
Reviewed-on: https://code.wireshark.org/review/8677
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I8db40aea6c208d0badfc7d178b642328264e6c10
Reviewed-on: https://code.wireshark.org/review/8676
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: Iff642606bdb9858dc54b90abe02bf1572f44fc25
Reviewed-on: https://code.wireshark.org/review/7766
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I50505b48db1f14523f36a19a5e8232caff1e712a
Reviewed-on: https://code.wireshark.org/review/7765
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: Ifa1a57ac2db5d921d9b53dbe997cfa1916720c26
Reviewed-on: https://code.wireshark.org/review/7759
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: Id2d98cc5def03fd54d69c54db4565c6ecd27c552
Reviewed-on: https://code.wireshark.org/review/7755
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
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>
|
|
Change-Id: I96953b6ca34140972a783c3066614399981ca1e2
Reviewed-on: https://code.wireshark.org/review/7549
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: Ibf1ee5a11adb907c0d749763117fe291d92c47c7
Reviewed-on: https://code.wireshark.org/review/7548
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: Ifd011288ca23263738ca50842d59a23cc25e7952
Reviewed-on: https://code.wireshark.org/review/7532
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>
|
|
Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638
Reviewed-on: https://code.wireshark.org/review/6956
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: If4a4fb9009da61bd67a8577f17c9e0dedcb6de6d
Reviewed-on: https://code.wireshark.org/review/6955
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I9747b746ed7c38ed3aa78f19ae20b61e142b94cc
Reviewed-on: https://code.wireshark.org/review/6785
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: I6376ce5eab43443314e73116161a24111f8c46d7
Reviewed-on: https://code.wireshark.org/review/6784
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
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>
|
|
Change-Id: Ibd298b9665214e8af137a05ffb0c0aee67af91bf
Reviewed-on: https://code.wireshark.org/review/6777
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|