Add a "flavor" (for lack of a better word) banner, which can be set at
build time via WIRESHARK_VERSION_FLAVOR / VERSION_FLAVOR. Set it to
"Development Build" by default. This effectively migrates the
"DEVELOPMENT VERSION" logo image text from the GTK+ UI.
Add full release and automatic update information at the bottom.
Remove the short version from the welcome banner (top left).
To do:
- Add back support for gui_version_placement.
- Move the version and repository branch to the flavor label?
- Add update links as appropriate to the bottom.
- Clean up layout and spacing.
Change-Id: I28af33e6c2beb855f803a2dfedef49f3e8389057
Reviewed-on: https://code.wireshark.org/review/7071
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Squelch warnings due to (char *) casts.
Use "include_directories(SYSTEM..." in CMakeLists.txt so that we
don't get pedantic warnings about things we can't easily fix such
as QList loop optimizations. Not sure if there's an easy way to do
this in Autotools.
Pass get_gui_compiled_info to init_progfile_dir. C++ don't have to
show you any stinkin' ::main.
warning: ISO C++ forbids taking address of function ‘::main’ [-Wpedantic]
Change-Id: If1c77284ab0d1b4786bce4e926a4109dd9b1ae34
Reviewed-on: https://code.wireshark.org/review/7207
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Test the compiler for "-Wpedantic" instead of "-pedantic" since DIAG_OFF
and DIAG_ON expect a "-W" flag prefix. Be more strict about the compiler
versions that DIAG_OFF and DIAG_ON support.
Change-Id: I9304c544912102f1719b79e9250f97b40a324430
Reviewed-on: https://code.wireshark.org/review/7123
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Hopefully Gerald's change will fix this annoyance once and for all.
Change-Id: I547b221a670f1435fa86cb96b084cfa5b788c57f
Reviewed-on: https://code.wireshark.org/review/6971
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Semi-blind attempt to fix what appears to be a race condition on the OS
X x86 buildbot.
Change-Id: I379c7dec26c2bca092d0c9a49465ee56a01d15ec
Reviewed-on: https://code.wireshark.org/review/6969
Reviewed-by: Gerald Combs <gerald@wireshark.org>
It didn't fail with cp, so maybe that's just random luck, or maybe the
built-in copy functions have an issue, or maybe just copy_if_different
has an issue (64-bit inode number issues?). Try just copy, and see what
happens.
Change-Id: I84abf3846af9305c19ad4a78d5c9df31b1e1e61e
Reviewed-on: https://code.wireshark.org/review/6961
Reviewed-by: Guy Harris <guy@alum.mit.edu>
The 32-bit OS X build is failing rather often due to cmake -E
copy_if_different failing to copy wireshark.html, and to call cmake's
copy functions completely crappy at reporting errors is to insult
software that's merely completely crappy at reporting errors. Try using
cp in the hopes that it'll actually tell us *WHY* the copy is failing
and see if we can fix it.
Change-Id: I723150c52c2ec0fe704d54191ef27fb6caf47fba
Reviewed-on: https://code.wireshark.org/review/6960
Reviewed-by: Guy Harris <guy@alum.mit.edu>
As it turns out, building the app bundle makes wireshark-gtk unusable.
Change-Id: Ic3608f0a485c3ec4ea21fbc2e7194553eda8c806
Reviewed-on: https://code.wireshark.org/review/6938
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Run osx-app.sh by default on OS X. Aside from giving us a fully portable
application bundle after building this should let us clear our library
path at startup should the need arise. Change the name of the osx-app
target to app_bundle.
Search ../Frameworks before ../lib. Create PkgInfo at configure time
instead of compile time. Build our program list as we go.
Change-Id: If5511ee921108b1c079cef67026eac9e47211be1
Reviewed-on: https://code.wireshark.org/review/6896
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Create DATAFILE_DIR when we're building an application bundle. Hopefully
this will fix the build error on the OS X x86 builder.
Change-Id: I57414bcd87ab21958ae8131a8cd77951b29e02f7
Reviewed-on: https://code.wireshark.org/review/6763
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Move all the SSE 4.2 stuff to wsutil/CMakeLists.txt.
Don't put ws_mempbrk_sse42.c in WSUTIL_FILES by default; add it if we
think the compiler supports compiling for SSE 4.2.
Add -msse4.2 to its COMPILE_FLAGS, but don't add it to any other
compiler flags - we don't want to build anything else with -msse4.2 by
default, as the only code that uses SSE 4.2 instructions but *only* does
so if the processor supports it is our mempbrk implementation. (And
*add* it, don't *replace* the existing flags with -msse4.2; that way,
-Werror is left in there as well.)
Change-Id: I979b37a37e4b88b3af11e2275e89441118c8ce0a
Reviewed-on: https://code.wireshark.org/review/6698
Reviewed-by: Guy Harris <guy@alum.mit.edu>
When building an application bundle, create wrapper scripts at the top
level instead of symlinking to each executable.
Change-Id: I080e43de545a709b29c1d6b6c6ec416e5a5a8247
Reviewed-on: https://code.wireshark.org/review/6683
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all
platforms. Add WiresharkPlugin.cmake so that we can start defining common
macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds.
Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2
Reviewed-on: https://code.wireshark.org/review/6640
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add a "pdb_zip_package" target similar to the NMake pdb_zip target.
Change-Id: I23d114a63fa05f722ee90b77ea458d9e496e5bf9
Reviewed-on: https://code.wireshark.org/review/6673
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Set DATAFILE_DIR to a value that includes the build configuration. Add a
copy_data_files target that copies AUTHORS-SHORT, the default filters,
and other support files to the run directory. Add FindPowerShell.cmake
and require it on Windows. Remove some OS X BUNDLE_RESOURCE_
declarations which are now covered by copy_data_files.
Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4
Reviewed-on: https://code.wireshark.org/review/6561
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: Gerald Combs <gerald@wireshark.org>
The windeployqt variable name ends up in the cache. Change it to
QT_WINDEPLOYQT_EXECUTABLE, which follows conventions used in the Qt
CMake modules.
Change-Id: I14998b921009e44e5ca743e2915fe84447b22df0
Reviewed-on: https://code.wireshark.org/review/6549
Reviewed-by: Gerald Combs <gerald@wireshark.org>
The copy-qt-dll custom command should ensure the qt bin dir is on
the path.
Modify the flags passed to windeployqt depending on the configuration.
Change-Id: I12860d415f80cee323c72aa8a4892eaa6126f165
Reviewed-on: https://code.wireshark.org/review/6537
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: Gerald Combs <gerald@wireshark.org>
The flags that are deleted are already supplied by the CMake generator.
Change-Id: Ifafc2343ac0c5d365a39f4a181b23f54c65bce74
Reviewed-on: https://code.wireshark.org/review/6538
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Update the comments and add a URL. Use HINTS, which is more correct
according to the documentation.
Change-Id: I82a7e2790dfa0b398e2b534f9f45851f55bdc0d2
Reviewed-on: https://code.wireshark.org/review/6536
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add a "copy_qt_dlls" target similar to "copy_cli_dlls". Wireshark.exe
must exist before windeployqt can be run, so we can't create a PRE_BUILD
target. Add copy_qt_dlls to the default target instead.
Change-Id: If85d89478472b10b31229413465955fe98b0ef02
Reviewed-on: https://code.wireshark.org/review/6529
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add a "copy_cli_dlls" target which copies the DLLs required to run our
command line programs to the run directory.
Fix the spelling of "KERBEROS". Start filling in variables so that we
can populate config.nsh.
Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521
Reviewed-on: https://code.wireshark.org/review/6513
Reviewed-by: Gerald Combs <gerald@wireshark.org>
CMake now generates local copies of .rc files for all the Windows
components and uses the files in the build of the components.
The .rc.in files that include an icon were modified to allow the icon
path to be set by CMake. The path is removed for nmake builds.
Updated build architecture detection, required for wireshark.manifest.in
Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8
Reviewed-on: https://code.wireshark.org/review/6482
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
This gives a more structured layout in Visual Studio
Change-Id: I0da87a3e5ec759c69aeee031366cf287485cdac2
Reviewed-on: https://code.wireshark.org/review/6485
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
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>
Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt. It's used
by a couple of our modules and will be used for NSIS packaging.
Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11
Reviewed-on: https://code.wireshark.org/review/6458
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add a wrapper script and CMake macros which lets us run Cygwin's a2x
from Windows. Add *another* wrapper script that ignores the return value
of hhc.exe.
Move the ASCIIDOC2DOCBOOK macro to FindASCIIDOC.cmake. Add FindHHC.cmake.
Add hints to FindFOP.cmake.
Use unique file names in the HTML Help chain in an attempt to avoid a
race condition.
To do:
- Fix curly quote in HHC title.
Change-Id: I9b154b7fbd02703656e2ab380199ec0a6db4e36d
Reviewed-on: https://code.wireshark.org/review/6379
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Currently Visual Studio-only. Enabling it adds /analyze:WX- to
LOCAL_CFLAGS, similar to config.nmake.
Change-Id: Ida68831e85f5f04b9f84faa95a39fed24e5f490d
Reviewed-on: https://code.wireshark.org/review/6346
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Before this patch it was not possible to override e.g. the optimization
or debug flags in case the build type was set.
Change-Id: I53bfddd27f87ad5482227f786af8c4728c5774fc
Reviewed-on: https://code.wireshark.org/review/6327
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
If a file in the same directory as config.h, e.g. wireshark-qt.cpp
has a #include "config.h", or another header it includes also has
a #include "config.h", then an out-of-tree build, e.g. CMake will
pick up any in-tree config.h and odd things may happen. The correct
form is #include <config.h> which will pick up the out-of-tree
version.
To find this, introduce a deliberate error and then make an out-of-tree
build, noting where it fails and fix that file. If that file includes
other files that still cause the build to fail, set the compiler
to emit the pre-processed version so you can locate the include with
the next errant "config.h". Repeat ad nauseum.
Possibly all includes of "config.h" should be changed to <config.h>
Revert "CMake: Clobber the top-level config.h before we build."
This reverts commit 1f3849ce61.
Ping-Bug: 10301
Change-Id: Ie567e7cc696fd48f3e730fc27032c5d2a7d8f341
Reviewed-on: https://code.wireshark.org/review/6285
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: Gerald Combs <gerald@wireshark.org>
If you use the same source directory for in-tree Autotools or Nmake
builds and out-of-tree CMake builds you can end up with a conflicting
config.h a the top of your source tree. Try to remove it in CMake before
building our config.h
Ping-Bug: 10301
Change-Id: I7ebeb31c92022fd28cbfca05fdb6931ffa2d9cae
Reviewed-on: https://code.wireshark.org/review/6282
Reviewed-by: Gerald Combs <gerald@wireshark.org>
"stat name" has been official changed to "endpoints" for all dissectors, rather than a mixture of "host"/"endpoints" based on dissector.
Change-Id: If34bcb5165b493948e784ba038ab202803a59843
Reviewed-on: https://code.wireshark.org/review/6154
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
It's not a GTK+ Wireshark source file, so don't include it in
wireshark-gtk.
Change-Id: I0affa1fab1a29e10e1cf446e49182c9c4f218b87
Reviewed-on: https://code.wireshark.org/review/6203
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Added /Zo flag for VS2013 builds to add more debugging info
Removed obsolete comment on unused /GS flag and obsolete
/FR flag.
Removed '#ifdef WIRESHARK_GENERATE_BSC_FILE' and related
(which specified the obsolete /FR flag).
Added /RELEASE flag to linker to set checksum in PE header
Fixed an old typo.
CMake added /INCREMENTAL:NO flag to linker to overide default
and prevent warning messages.
Change-Id: I039b884657d2886acc273dc6dd099d07a7b8ec7d
Reviewed-on: https://code.wireshark.org/review/6110
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This reuses existing functionality and thereby making FindAsn2Wrs.cmake obsolete, resulting in a reduction of the cmake module maintaince load
Change-Id: Ic6ae53e65236246c0cbe86f8c2f066a2d034e0b9
Reviewed-on: https://code.wireshark.org/review/5805
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Add make-dissector-reg.py to the Debian packages.
Making it possible to generate out-of-source wireshark plugins.
Change-Id: I0bbe5b46205d39e229d31812341540b26a7336d6
Reviewed-on: https://code.wireshark.org/review/5802
Reviewed-by: Anders Broman <a.broman58@gmail.com>
GLib is always/mostly required when building wireshark plugins. These cmake fiels help finding the install glib components
Change-Id: Ie59b50bf8c53c367d4bf89f53db5ae31e97e0575
Reviewed-on: https://code.wireshark.org/review/5252
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>
