Age | Commit message (Collapse) | Author | Files | Lines |
|
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>
|
|
Change-Id: I458f1d398b4eb566dd73e879ea3236a4de67da63
Reviewed-on: https://code.wireshark.org/review/6776
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: I230e3914bcd902dd481b59637f5ea21afc496978
Reviewed-on: https://code.wireshark.org/review/6775
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>
|
|
Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98
Reviewed-on: https://code.wireshark.org/review/5705
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: Ic6dcbfc880817ad4bcc07a21ec88d14c8c92df58
Reviewed-on: https://code.wireshark.org/review/5703
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I8580be0bfe88e33df333f0397f51762f4af819f6
Reviewed-on: https://code.wireshark.org/review/4532
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: Idc813297e5e27680b13a6b81adcf18ae4ef4d4e4
Reviewed-on: https://code.wireshark.org/review/4523
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>
|
|
Change-Id: I848b80cd8126d93cbf3ce02a333345f4ea6b4e92
Reviewed-on: https://code.wireshark.org/review/2231
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
|
|
Change-Id: I1615364071563c4f56b071d7d68e4660dd989296
Reviewed-on: https://code.wireshark.org/review/2198
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit fd017eeae358fbcbb3f51f2765bd31777aa513d1)
Reviewed-on: https://code.wireshark.org/review/2201
|
|
Also remove trailing white space.
Change-Id: Ic56140f617a2cbf9fa93fb427282eab0b6cff9c6
Reviewed-on: https://code.wireshark.org/review/2113
Reviewed-by: Evan Huus <eapache@gmail.com>
|
|
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044
Reviewed-on: https://code.wireshark.org/review/1761
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019
Reviewed-on: https://code.wireshark.org/review/1154
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I8c8f1c22a2cba97e69b27e5fb0b4de9981668966
Reviewed-on: https://code.wireshark.org/review/1153
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Matches versioning behavior in stable branches.
Change-Id: Ic4d451e7e9941b65d24a76bfaf57de2b4fb58239
Reviewed-on: https://code.wireshark.org/review/1124
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)
Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: Icd00c62d9b908771bf2b73b8e5b49d519570ff8b
Reviewed-on: https://code.wireshark.org/review/142
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
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>
|
|
make-version.pl wasn't using the right source dir for git commands when not compiling from inside source tree.
add --git-dir=$srcdir/.git parameter.
Change-Id: I45ca4874d96abaed1c559c022d0ace66239652c8
Reviewed-on: https://code.wireshark.org/review/122
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
|
|
Change-Id: Ic6a704013b38e9be130be40098e9293e9196bfec
|
|
svn path=/trunk/; revision=54810
|
|
modifications.
------------------------------------------------------------------------
r54807 | gerald | 2014-01-14 16:35:34 -0800 (Tue, 14 Jan 2014) | 2 lines
Start using the output of 'git describe'.
------------------------------------------------------------------------
r54805 | gerald | 2014-01-14 15:38:16 -0800 (Tue, 14 Jan 2014) | 2 lines
Start adding support for plain git.
------------------------------------------------------------------------
svn path=/trunk/; revision=54809
|
|
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607)
This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it)
This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!).
svn path=/trunk/; revision=54646
|
|
svn path=/trunk/; revision=53412
|
|
svn path=/trunk/; revision=53411
|
|
svn path=/trunk/; revision=53346
|
|
svn path=/trunk/; revision=53344
|
|
svn path=/trunk/; revision=52629
|
|
svn path=/trunk/; revision=52628
|
|
just one at the top level. So on my system, /trunk no longer
contains a .svn directory. Check in parent directory as well.
svn path=/trunk/; revision=51566
|
|
svn path=/trunk/; revision=48972
|
|
svn path=/trunk/; revision=48627
|
|
svn path=/trunk/; revision=48625
|
|
definition to asciidoc.conf. Add support for asciidoc.conf to
make-version.pl. Set some SVN keywords.
Fill in the new protocol list.
svn path=/trunk/; revision=48405
|