Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched.
One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging.
Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run.
Bug: 11816
Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9
Reviewed-on: https://code.wireshark.org/review/28291
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
We don't support building with autotools (except for building the
support libraries using macos-setup.sh), and we don't support GTK+ and
thus don't require X11.
Change-Id: If9da937285016fc178a0153d38212404b0ff2c59
Reviewed-on: https://code.wireshark.org/review/27148
Reviewed-by: Guy Harris <guy@alum.mit.edu>
MaxMind is discontinuing its legacy databases in April in favor of
GeoIP2, which use a newer database format (MaxMind DB). The reference C
library (libmaxminddb) is available under the Apache 2.0 license which
isn't quite compatible with ours.
Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin
and prints resolved information on stdout. Place it under a liberal
license (MIT) so that we can keep libmaxminddb at arm's length. Add
epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it
via stdio.
Migrate the preferences and documentation to MaxMindDB.
Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the
geographic coordinate fields to FT_DOUBLEs.
Bug: 10658
Change-Id: I24aeed637bea1b41d173270bda413af230f4425f
Reviewed-on: https://code.wireshark.org/review/26214
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
The configure script 1) can't find newer versions of Qt, thanks to the
Qt developers not supplying any .pc files and 2) doesn't look for useful
frameworks, so it's not the best way to build Wireshark on macOS any
more. Discuss CMake instead.
Change-Id: I28befffab010221e2e17e37f5beaf8b732974190
Reviewed-on: https://code.wireshark.org/review/23990
Reviewed-by: Guy Harris <guy@alum.mit.edu>
The OS is now called just macOS, and the rest of the setup scripts are
in tools, so move this one there as well.
Update the documentation to reflect the change.
Change-Id: I4d9ebf0797ffe8862e82c4bcfdeec1d2eabae6ae
Reviewed-on: https://code.wireshark.org/review/22918
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Say it builds "as needed".
Change-Id: I85ce2062da7f168785d0d22160b8f19b85d554e3
Reviewed-on: https://code.wireshark.org/review/22909
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X
10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was
sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS
X" from 10.8 to 10.11.
Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3
Reviewed-on: https://code.wireshark.org/review/20933
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$)
Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688
Reviewed-on: https://code.wireshark.org/review/876
Reviewed-by: Evan Huus <eapache@gmail.com>
PKG_CONFIG_PATH must include /usr/X11/lib/pkgconfig (the man page for
pkg-config 0.26 seems to indicate that pkg-config searches the
directories in PKG_CONFIG_PATH *in addition to* the standard
directories, so it *might* be sufficient to set PKG_CONFIG_PATH to
/usr/X11/lib/pkgconfig).
svn path=/trunk/; revision=38725
"macos", to fix some bugs, to use "sudo" if necessary when installing,
to make the library version numbers variables, and to download the
optional libraries, by default, as well. Also add his patches to make
GLib build and work.
Update README.macos to reflect that.
svn path=/trunk/; revision=38053
Suggest that the user completely clean out their build trees and start
from scratch after an OS major version upgrade. (That might well be a
good idea on *all* UN*Xes.)
Note some issues that show up with support libraries on Snow Leopard due
to builds being 64-bit by default (and note that you *get* a 64-bit
Wireshark by default).
svn path=/trunk/; revision=31328
and not try to use the shiny new routines on those systems, so you
shouldn't get the "`pcap_if_t' undeclared" error any more.
svn path=/trunk/; revision=11757
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.
svn path=/trunk/; revision=11400
installed in order to build Ethereal.
Michael Tuexen indicated how to successfully build GTK+ 2.4 on Mac OS X
(10.3[.x], at least) - update the directions to give the latest versions
of GLib/Pango/GTK+/ATK and to give instructions on how to make them
build.
svn path=/trunk/; revision=10449
Enumerate the dependencies for GLib 2.4/GTK+ 2.4, and indicate that GNU
gettext is also required, even though it's not in the set of
dependencies on the GTK+ site (after all, the ENTIRE WORLD runs Linux,
RIGHT?).
Give a (partial) order for the dependencies.
Note some issues with building and installing the JPEG and libpng
libraries.
svn path=/trunk/; revision=10443
Note that Ethereal doesn't work on pre-X Mac OS, in case somebody sees
".macos" and thinks it'll work on OS 9 or earlier versions.
Explain that GLib and GTK+ now need to be shared libraries, and that
the GLib 1.x and GTK+ 1.x release tarballs were built with an older
version of libtool that didn't support building them as shared libraries
on OS X.
svn path=/trunk/; revision=10384
Roland Knall