Age | Commit message (Collapse) | Author | Files | Lines |
|
It may have been part of the "build Qt Wireshark as C++" hacks, and is
now causing build problems.
Change-Id: If471bf3dca01f1bc6e9b5b871d0de3159e4c8e1c
Reviewed-on: https://code.wireshark.org/review/6200
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: Ib4684264363593372b3bf078cf17cae1a1cb10d6
Reviewed-on: https://code.wireshark.org/review/6199
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
if it is ever created during the build process.
Change-Id: Ib3131f63c965ae243f25f98f6209e049323d8360
Reviewed-on: https://code.wireshark.org/review/6030
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
|
|
It will be reused form generate AUTHORS file
Change-Id: I43c388df34551b898f15913c2625b1996ace0cbc
Reviewed-on: https://code.wireshark.org/review/5841
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
|
|
Use it to check whether we need -lm for various math functions -
including floorl(). Let it handle adding -lm, rather than having that
in the various _LDADD macros.
Change-Id: Ic5d24ec35e060306351f4981c92e26879e597d81
Reviewed-on: https://code.wireshark.org/review/5908
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: I685b9376342087182cc0dc8d9b8ed8e17a5ff8e7
Reviewed-on: https://code.wireshark.org/review/5833
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: Iae5ffac472c6d013cf5dd37310278f203a04f8d3
Reviewed-on: https://code.wireshark.org/review/5831
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Add convenience targets for generating the release notes and the NEWS
file. Make sure we don't run multiple instances of a2x + AsciiDoc at the
same time.
Add the docbook directory to the build by default unless we're running
Windows. Explain why we don't yet build docs on Windows. Make each
docbook makefile target optional.
Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and
ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on.
Remove the Debian patch that hacked around the PDF requirement.
Copy ws.css to the docbook build directory. Don't build PDF release
notes. I'm not sure we ever used them and I don't want to install Java
and FOP just to make a release.
Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553
Reviewed-on: https://code.wireshark.org/review/5712
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I5a9ba1314b0c93098e7b802618f73c7fca608b04
Reviewed-on: https://code.wireshark.org/review/5692
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Our "make install" process does nothing with 'alternatives'. Our RPMs do use
alternatives but they do the necessary update-alternatives stuff already.
(If someone wants to set up Linux "make install"s to use alternatives it would
make sense to put these notes to the user back in.)
Change-Id: Ib7f4655a222ccaee83830a97b213656856cee73e
Reviewed-on: https://code.wireshark.org/review/5622
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
|
|
Wireshark is the desktop app; if we're not building it (i.e., we're only
building the command-line TShark), we don't need any desktop files.
Change-Id: Id8244b417fd53c9d55b4d77fe3ad748c98868ad7
Reviewed-on: https://code.wireshark.org/review/5615
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
It doesn't need it, so don't install those files, or uninstall them, or
suggest running various unnecessary commands after the installation
finishes.
Change-Id: Ieecab22884723670f47f2fc7cc1ac827f48c1967
Reviewed-on: https://code.wireshark.org/review/5614
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
This covers a bunch of commands that might have to be run after "make
install". ("might" - none are needed on OS X, for example, as it's a
different desktop and its dynamic loader doesn't have a cache that you
have to manually update whenever you install a new shared library.)
Change-Id: I21e1728bdde26a7ab1585fdfb54f63fdc1c25dd6
Reviewed-on: https://code.wireshark.org/review/5606
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
line.
Change-Id: Ie17e83504e7fbccb71190b3fdbfb6ad3507a806e
Reviewed-on: https://code.wireshark.org/review/5584
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
(And remove them with "make uninstall".)
Change-Id: I76b554bf1a1272813d61c8d2c96cda0a152eebb5
Reviewed-on: https://code.wireshark.org/review/5582
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
We're not necessarily running from the top-level source directory.
Change-Id: I0bb815275f85630e5316bf593f4ac098d9475308
Reviewed-on: https://code.wireshark.org/review/5579
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Just in case not all shells expand {list}, create the apps/icons and
apps/mimetypes directories separately; that makes it a bit clearer in
any case.
Change-Id: I25b3426a17a2ca7e1ce3ce1f7f9e1c650db511a7
Reviewed-on: https://code.wireshark.org/review/5578
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: Ia0eecbbe1ff1778d5c34338e042c0518895663b4
Reviewed-on: https://code.wireshark.org/review/5577
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
We always install them because of bug 10737.
We install them under $(datadir) because that's where we should install
our data - if your desktop environment can't find the icons there,
either it's broken (file a bug) or misconfigured (fix the configuration
or, if you didn't configure it, file a bug).
Bug: 10737
Change-Id: I567269d8e45e6543d9e39dbedc49830adf7edb9f
Reviewed-on: https://code.wireshark.org/review/5576
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
commit 30dac6d3dc87aaaa9c29ecdb33874fa57c2bcbc6
Author: Alan T. DeKok <aland@freeradius.org>
Date: Tue Nov 25 16:45:45 2014 -0500
as found on the net
commit ee79c59d3a1cae76fcb1940710d9a0f7fbdf8427
Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu Nov 13 17:39:46 2014 -0500
Add memcached rlm_cache_driver
commit 6277960bc830891123b00400af56912e51d4d311
Author: Alan T. DeKok <aland@freeradius.org>
Date: Tue Oct 28 17:01:49 2014 -0400
Add FreeRADIUS-Response-Delay-USec
Change-Id: I705d0e852d38eaace4f71cfc0a38ecdd41c0b58f
Reviewed-on: https://code.wireshark.org/review/5510
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
c++ compiler to automatically create a dummy.cpp file and remove it when
make clean is issued. This allows make tags to work again since the
file isn't missing.
Change-Id: I17191ad2acc281734fa12da4d347fd3116018f67
Reviewed-on: https://code.wireshark.org/review/5494
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
|
|
This reverts commit 6b8fe87ef48abb95dd303871d0835c153cf8c891.
Change-Id: Ie4f681186c1555e6ab966e7db687035f7fc5e60f
Reviewed-on: https://code.wireshark.org/review/5472
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
|
|
Change-Id: Idcff82aceedbf42652741564e06ca53984078361
Reviewed-on: https://code.wireshark.org/review/5413
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
|
|
Change-Id: Ib6e9098a4b411eeb1e5f597f3ec5f55e98632ad3
Reviewed-on: https://code.wireshark.org/review/5117
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Update includes all new/renamed dictionaries in radius, but does not cover any differences in already included dictionaries, which will be handled in a separate update.
Change-Id: I6d1e1cc1815423fb71ec940366964a366ab41a25
Reviewed-on: https://code.wireshark.org/review/4947
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Optimize the toolbar PNGs.
To do: The rest of the PNGs.
Change-Id: Ieed8b0d099655994d43cdc9cf6c9a094d84c1802
Reviewed-on: https://code.wireshark.org/review/4978
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I1802fd4e53132e76534b6dadbaa9713249af42e5
Reviewed-on: https://code.wireshark.org/review/4966
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Add a -cb/--create-bundle option to osx-app.sh which builds the
application bundle. Use it in Autotools. (CMake does this by default.)
Copy over linker flags from configure.ac to CMakeLists.txt to support
rpathification and code signing.
Add an osx-app custom target to CMake.
Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803
Reviewed-on: https://code.wireshark.org/review/4918
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I73d269c67a0ad5bb6f67fef8da5fc4ca86f169e3
Reviewed-on: https://code.wireshark.org/review/4263
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I68963f000dc927398d7d41193674e55050e7c634
Reviewed-on: https://code.wireshark.org/review/4248
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Set the main window icon to the "wsiconcap" version while we're capturing
similar to the GTK+ version. Verified on Windows. Not sure if this will
do anything on other platforms.
Change-Id: I9b082601a2c47e5f52cc38ac8d9b4d9f5fb9a4d9
Reviewed-on: https://code.wireshark.org/review/4230
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Add ".on" versions of the x-capture-start icon along with corresponding
code in the StockIcon constructor to look for ".on" variants and add
them with the QIcon::On state.
Make the plain versions of x-capture-start blue to match the general
application icon. The goal is to make the toolbar and app icon fins blue
when Wireshark is "at rest" and green when it's capturing.
Change-Id: I31f4f9d910fc99c41d7c63bd9a722db1611760c7
Reviewed-on: https://code.wireshark.org/review/4225
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
The new icons are patterned after the existing capture icons. They could
probably benefit from some adjustments here and there.
Start moving toward icon names and a directory layout compliant with
freedesktop.org's Icon Naming Specification and Icon Theme
Specification. We aren't fully compliant and might never be but anyone
with exposure to FDO icon themes should at least know where everything
is.
Make Capture Start (x-capture-start) the first icon in the toolbar.
Define the Colorize Packets, Auto Scroll, and zoom icons even though the
Qt UI doesn't use them yet.
Leave the Capture Filter, Display Filter, Coloring Rules, Preferences,
and Help icons off for now. The GTK+ toolbar is overly cluttered and I'm
not sure they're necessary.
Try not to break ui/gtk/toolbar_icons.h.
Remove welcome.qrc. I initially added it in case we needed to overlay
the welcome screen with translucent .pngs but that never happened.
To do:
- Move the old GTK+ icons to their own directory.
- Find a better name for the "toolbar" directory. "stock"?
- Make the toolbar configurable.
Change-Id: Ie07592113d307b8db786aedace672312a870fe38
Reviewed-on: https://code.wireshark.org/review/4182
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
The main site URI scheme is now https. Update the URL in some other
places while we're here.
Change-Id: Ib03d4fd1c58dabd3cf5050dc4f79216e0b94d525
Reviewed-on: https://code.wireshark.org/review/4133
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
If it's not there, "make distcheck" fails. In addition, 1) "make
distclean" doesn't clean out the Makefile.in files under asn1 and 2) you
don't get to see the source from which the ASN.1 dissectors were built
if you have a source tarball.
Change-Id: Ied59d42950373476a535fcf9cfccece46de92599
Reviewed-on: https://code.wireshark.org/review/4013
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: Icd480491670de9d8495a95861b18a8a5cb9724b4
Reviewed-on: https://code.wireshark.org/review/4006
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".
It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.
Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).
Tested:
- Nmake builds
- NSIS packaging
- CMake builds (Windows, OS X)
- Autotools build and distcheck
- RPM packaging
To do:
- Test Debian packaging
- Fix PortableApps
Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: If6ef48fbcceaf0b3a3591086015b021c6a80956b
Reviewed-on: https://code.wireshark.org/review/3911
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
|
|
Change-Id: I7197f84472139c99bafa5b68f724abaab0453faa
Reviewed-on: https://code.wireshark.org/review/3908
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
|
|
files necessary to do a cmake build."
We can't know, in autofoo, what arguments are necessary to make 'cmake' actually run successfully on a given system. We should probably just add a buildbot step to build cmake from the source tarball.
This reverts commit 70a6d204a7f0b4039ee986cd6557cd7242e5ff0c.
Change-Id: I1961b79ece2e26bafad3eddb189bd0cfab2af846
Reviewed-on: https://code.wireshark.org/review/3460
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
|
|
don't verify that it can build Wireshark."
This change doesn't help: we can't get cmake to run properly.
This reverts commit 956f4423df447f2e7c0f9691ba9928f104d79820.
Change-Id: If1c0ec13ff35fdaa266dcd491350477e2bd91bd1
Reviewed-on: https://code.wireshark.org/review/3459
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
|
|
that it can build Wireshark.
The purpose of the cmake check is to ensure we are distributing all the of
necessary cmake files. We don't want to get into the business of giving cmake
all the options required to actually build Wireshark (e.g., which version of
Qt is installed and where).
This also means that distcheck doesn't compile Wireshark twice.
Change-Id: I62f5c42df7c710f7695bd020b0dda80e54435829
Reviewed-on: https://code.wireshark.org/review/3432
Reviewed-by: Evan Huus <eapache@gmail.com>
|
|
necessary to do a cmake build.
Note that this does mean that anyone doing "make distcheck" needs cmake.
Bug: 10331
Change-Id: I4360a305aa7f6ffc1b5a5dffad24b928eed45016
Reviewed-on: https://code.wireshark.org/review/3326
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
|
|
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: Ifc552ac74b84bce2a695189794440c905bf140a5
Reviewed-on: https://code.wireshark.org/review/3323
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
|
|
Bug: 10331
Change-Id: I81e0d224917cd4b38215e28ec146cd80efdb99d2
Reviewed-on: https://code.wireshark.org/review/3316
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
|
|
Change-Id: I02ce275154979ff56f8f8929e5909f3035f62c47
Reviewed-on: https://code.wireshark.org/review/3286
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Files from the debian directory, documents from the doc directory,
graphics from the docbook/wsug_graphics directory, and the echld
Makefile.nmake.
Change-Id: Iccccc58811753581b0b180053defd937aea22f95
Reviewed-on: https://code.wireshark.org/review/3283
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: I67ca59bb77766f4625e64b9042cdcb5d03cd7994
Reviewed-on: https://code.wireshark.org/review/3281
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
You have to run macosx-support-lib-patches/qt-fix-pc-files manually,
telling it where Qt was installed, but so it goes....
Change-Id: I8668a1fc4254cc002aee068749edb3cf3bdb854f
Reviewed-on: https://code.wireshark.org/review/3215
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|