Amazingly, "hdiutil attach" can take a URL as an argument; it will
attempt to download the file in question and mount it. We've already
downloaded the file, so there's no point in downloading it again
(especially not with a URL with "v2.8" coded in).
Change-Id: I106fc0c32a378aeead66ed32bceb454d23efa297
Reviewed-on: https://code.wireshark.org/review/8103
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Most of our sites are now HTTPS-only. Update URLs accordingly. Update
other URLs while we're at it. Remove or comment out dead links.
Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33
Reviewed-on: https://code.wireshark.org/review/7621
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
There's nothing special about LUA_VERSION when it comes to the user
overriding it - they'd do that by changing it, the same as with any
other _VERSION variable. Remove the comment about it, which is now out
of date in any case.
Change-Id: I414ddaff43c96304f49b81bdbd135d85536c17dc
Reviewed-on: https://code.wireshark.org/review/6739
Reviewed-by: Guy Harris <guy@alum.mit.edu>
If, for a package, the version specified by the _VERSION variable
doesn't match the version installed (as indicated by a -done file),
un-install it, and remove the downloaded version, before doing any
installs, so that the specified version replaces the installed version.
Change-Id: I32021c7be8cdc277ad51c9f11cfdb57e3bb542c4
Reviewed-on: https://code.wireshark.org/review/6736
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Uninstall automake if autoconf is going to be changed; remove libtool if
autoconf or automake is going to be changed.
Change-Id: I4aced967cb7bed197d3f1a4be851a0bc78c8f12d
Reviewed-on: https://code.wireshark.org/review/6735
Reviewed-by: Guy Harris <guy@alum.mit.edu>
If there's an unversioned -done file, make it a versioned file under the
assumption that the requested version is what's installed.
Create a versioned file when installing. Use the installed version when
uninstalling, and remove the versioned file.
Change-Id: Ic21e0f139bb35df8f159a5ba7732706357a099fb
Reviewed-on: https://code.wireshark.org/review/6731
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Move the "do I want this and, if so, is it already installed?" checks
into the install_ functions.
Move the "is this already installed?" checks into the uninstall_
functions, and have them clear the appropriate installed version
variable when finished.
Also, fetch the installed versions early in the main line.
Change-Id: I9e5d8ca48285c6d424a4a2a5f53f4aa449a891d3
Reviewed-on: https://code.wireshark.org/review/6730
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Call it install_all to avoid collision with the OS's install command, if
any; rename the uninstall function to uninstall_all to match.
Change-Id: I9383424ff3910f04244493569fed3e5bc5d3d99d
Reviewed-on: https://code.wireshark.org/review/6729
Reviewed-by: Guy Harris <guy@alum.mit.edu>
That lets us put the install and uninstall sequences for a particular
tool or library together, and separates them from the overall
installation and uninstallation flow.
Change-Id: I5e7def9983b587ba7c3276a9d5762db340a04802
Reviewed-on: https://code.wireshark.org/review/6728
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Get rid of doubled square brackets (what were those for?), and match
dots in the version number with "\.", so we only match dots.
This fixes the handling of version numbers such as 10.10.1.
(A 2-component version number doesn't match, but that's OK - the sed
command doesn't use -n, so that just means it's unchanged by the
command.)
Change-Id: I3046133de732c80410592272d1f7b961a64d9289
Reviewed-on: https://code.wireshark.org/review/5915
Reviewed-by: Guy Harris <guy@alum.mit.edu>
You never know when some library might start using C++, so set CXXFLAGS
everywhere.
Change-Id: I7e49a3446bb6b587e20058be48e06a5f345679c3
Reviewed-on: https://code.wireshark.org/review/5036
Reviewed-by: Guy Harris <guy@alum.mit.edu>
That was probably something I put in while debugging. It can be put
back - or added to some other make command - as necessary.
Change-Id: I184a5b8537c43c87844e6e75f65dd3c0accde9ac
Reviewed-on: https://code.wireshark.org/review/5033
Reviewed-by: Guy Harris <guy@alum.mit.edu>
I did that because I didn't want to wait a day for Qt to build, but
didn't intend to make that change in the official source.
In the longer term, we should perhaps change the script to download and
install a binary package; sadly, their installers can't be made 100%
command-line and automated, but, well, the CMake installer pops up a
dialog, too, and if you don't have Java installed, some of the configure
scripts that check for Java pop up non-blocking "do you want to install
Java?" dialogs from OS X.
Change-Id: I99781d5e54529955bf9363a7ee9d4122403fa955
Reviewed-on: https://code.wireshark.org/review/5032
Reviewed-by: Guy Harris <guy@alum.mit.edu>
According to
https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html#//apple_ref/doc/uid/10000163i-CH1-SW1
the deployment target (minimum target OS version) and SDK version aren't
necessarily the same and, in fact, Apple typically only ship two SDKs
with each Xcode release, so if you want to build for 10.6 with the 10.6
SDK, you have to use a version of Xcode sufficiently old to have the
10.6 SDK.
Here, we instead search for the oldest SDK for an OS whose version is
greater than or equal to the deployment target. Note that this may not
work for X11-based Wireshark, as the X11 libraries can change
incompatibly between releases. (Fortunately, our plan is to kick
X11-based Wireshark to the curb for OS X, removing a large pile of
aggravation for users.)
This also requires some fixes when building Qt and gdk-pixbuf, as some
cases where we were using the minimum OS target version we needed to be
using the SDK version.
For CMake, we're using its native "deployment target" support for OS X,
and hope that it will somehow do the right thing.
Change-Id: Ie8f42c5e4719e7ebdc56b9ba5a330665bee06280
Reviewed-on: https://code.wireshark.org/review/5031
Reviewed-by: Guy Harris <guy@alum.mit.edu>
The directory's name begins with "c-ares-", not "cares-". Fix that, and
make the -done file's name begin with "c-ares-" as well.
Change-Id: Ifa178c638ca634ca6b762b12290ccfcc4fa928f9
Reviewed-on: https://code.wireshark.org/review/5015
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Define DO_MV as "mv" or "sudo mv", depending on whether the user has
write access to /usr/local/bin, and use it to rename libtool* to
glibtool* and vice versa.
Change-Id: Ifbef4daa4521852bc200522743df9d23e7f0d1c2
Reviewed-on: https://code.wireshark.org/review/4295
Reviewed-by: Guy Harris <guy@alum.mit.edu>
I don't know why, but sometimes it fails - the most recent failure was
due to it having already been unmounted! Maybe the CMake installer
unmounts it some times but not others. Just drive on if it fails.
Change-Id: I1b31356f08695b8d3b9e425f8475a422e1da0783
Reviewed-on: https://code.wireshark.org/review/3220
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(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>
The libsmi url in macosx-setup.sh was dead, it's now an https site not ftp.
Also we were pulling down Lua 5.1.5 but should be pullsing down 5.2.3.
Lastly, macosx-setup cerates macosx-support-libs directory, which needs
to be ignored.
Change-Id: I79dc833dbc54fda8b237c5ada64f3564ce4f4cde
Reviewed-on: https://code.wireshark.org/review/360
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
To quote
62feb088a3:dist/changes-5.2.1
"****************************************************************************
* Platform Specific Changes
*
****************************************************************************
...
OS X
----
- [QTBUG-34411] Implemented QMainWindow::setUnifiedTitleAndToolBarOnMac."
Also get rid of a commented-out setting of QT_VERSION to 5.1.1 while
we're at it.
Change-Id: I957fdfecb70954723cfd3160f40758f722dc56c8
Reviewed-on: https://code.wireshark.org/review/136
Reviewed-by: Guy Harris <guy@alum.mit.edu>
When forcing CFLAGS and CXXFLAGS, add -g and -O2; newer versions of
autoconf do so for GCC-compatible compilers (clang is GCC-compatible in
that sense), but only do so when those variables aren't forced.
svn path=/trunk/; revision=52939
set to "qt", "gtk2", or "gtk3".
Work done on a machine with the command-line build tools, but not Full
Frontal Xcode, installed, so it couldn't build Qt, so it hasn't been
tested. It *has* been fixed to complain in that case, rather than
letting the Qt build fail with a somewhat less useful message talking
about Xcode licensing.
svn path=/trunk/; revision=52776
installing command-line developer tools with no SDKs but with a standard
UN*Xy /usr/include or of installing Full Frontal Xcode, check to see
whether we *have* any SDKs and, if not, don't try to find the
appropriate SDK for the release and use it.
svn path=/trunk/; revision=51499
before either of them are tested.
Put the code to get the OS major version number just before we first use
it.
Fix indentation.
svn path=/trunk/; revision=51054
which we're running, so we *always* build against an SDK. (The "10" in
"10.x.y" is not *really* part of the version number, so the "major
version" includes the "10" and the major version number following it.)
svn path=/trunk/; revision=51049
for Leopard. Fix some issues that came up with the older versions.
We don't support building *on* Leopard - we check for that up front - so
eliminate some code to handle that.
When uninstalling, check for the installed version by looking at the
name of the -done file, so we don't have to trust the _VERSION settings.
We don't appear to need to build our own versions of libpng or pixman
when building *on* Snow Leopard *for* Leopard.
The libffi configure patch for GLib appears not to be necessary -
perhaps building and installing pkg-config *before* building GLib makes
it no longer necessary - and it doesn't work with older versions of
GLib, so don't apply it.
svn path=/trunk/; revision=50456
"use your internal version of GLib" flag for pkg-config's configure
script. This simplifies things a little bit.
Fix an indentation error while we're at it.
svn path=/trunk/; revision=50453
shipped with those versions of OS X, and I had some problems with the
newer versions on Snow Leopard (the Makefile was doing weird stuff that
caused build failures in wsutil, moving .Tlo files to .Plo files; I
didn't investigate futher).
svn path=/trunk/; revision=50418
causes a -mmacosx-version-min flag to be used, to keep the compiler and
linker from using features not supported by that OS version, and causes
the support libraries to be built against the SDK for that OS version,
so they don't request library versions later than the one shipped with
that version.
svn path=/trunk/; revision=50402
to run pkg-config to get their values; they should be set equal to the
values that would be returned by pkg-config for libffi with the --cflags
and --libs arguments, respectively. They should *NOT* include the
values of CFLAGS and LDFLAGS supplied in the environment; those should
be handled separately.
svn path=/trunk/; revision=50389
if no make options are given to the macosx-setup.sh script by the user, the
script sets the number of parallel make jobs to 1.5x CPU cores.
Bonus enhancement: print the "export PKG_CONFIG_PATH" information in autogen.sh
on OsX, so people don't have to remember it.
svn path=/trunk/; revision=50070
actually is (it's not an OS X version number, e.g. 10.7 for Leopard,
it's a Darwin version number, e.g. 9 for Leopard). Add comments before
checks to indicate what we're checking for.
Put in a big long comment giving details about the issues I ran into
when trying to make this work on Leopard.
Fail if you try to run this on anything before Snow Leopard - note that
I said "trying" in the previous comment, and, yes, it was a very trying
experience....
Bump the libpng version - 1.5.12 isn't available any more.
Add some comments explaining why the code for Leopard was downloading
and installing libpng and libpixman.
Add some code to handle packages where older versions weren't compressed
with xz and newer versions were.
Add a hack to avoid finding the version of libpng that comes with X11
when trying to build Cairo on Leopard.
svn path=/trunk/; revision=47206
/usr/include/ffi/fficonfig.h doesn't define MACOSX, which causes the
build of GLib to fail. If we don't find "#define.*MACOSX" in
/usr/include/ffi/fficonfig.h, explictly define it.
svn path=/trunk/; revision=44693
it can depend on, among other things, having the the relevant .pc files
in one of the directories in PKG_CONFIG_PATH. Instead, just don't
request a fat build of PortAudio.
svn path=/trunk/; revision=44457
- unpack an xz file with xzcat instead of gzcat
- remove some trailing whitespace
- the update of gnutls required two changes in the gnutls
build stuff: a) gnutls.pc is now generated from gnutls.pc.in
and b) we now need to build with --without-p11-kit
svn path=/trunk/; revision=42861
- Newer versions of glib etc require xz. At least Snow Leopard
does not provide xz, so (unconditionally) download and install this first.
- Put in infrastructure to set up a GTK3 environment instead of GTK2
(not active by default because configure'ing Wireshark still fails for some
reason with GTK3 installed).
svn path=/trunk/; revision=40352
developer.apple.com, and the current version is available, at least for
Lion, from the Mac App Store.
While we're at it, make sure the X11 SDK is present, by checking for
/usr/X11/include.
svn path=/trunk/; revision=38712
it supplies zlib, doesn't supply a pkgconfig file for it, so we don't
want it to say "requires zlib".
This script is part of the Wireshark source, so giving "download
Wireshark source" as the next step doesn't make sense.
svn path=/trunk/; revision=38055
"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
Guy Harris