aboutsummaryrefslogtreecommitdiffstats
path: root/macosx-setup.sh
AgeCommit message (Collapse)AuthorFilesLines
2016-11-02Add snappy compression library setupJoerg Mayer1-0/+52
Change-Id: I060d3056dc386f44aec703ddd0fe024866a51fcf Reviewed-on: https://code.wireshark.org/review/18611 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-11-02Add lz4 setup.Joerg Mayer1-0/+52
Change-Id: If3b51e719a0a745eac0862f882b912e1d0f72587 Reviewed-on: https://code.wireshark.org/review/18608 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-30Update libssh to 0.7.3.Guy Harris1-18/+3
Also, don't try to uninstall it, as CMake helpfully provides no uninstall target. Change-Id: I936a8adeecc3c1f0ca71d044467846ffc33ae7b2 Reviewed-on: https://code.wireshark.org/review/18574 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-20Support setting up sbc on macOS.Joerg Mayer1-0/+52
Not tested with an actual capture file. Should not be too hard to get this working on Windows as well. Change-Id: Iae4b744361f0c4b62e919ad77e3d2b69ba45a8f3 Reviewed-on: https://code.wireshark.org/review/18331 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-17Fix typo in a messageJoerg Mayer1-1/+1
Change-Id: Ic1651c4ff0fd7ba7f13cd52b596f3d54cf6c3e00 Reviewed-on: https://code.wireshark.org/review/18245 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-13Remove nghttp2 code and use system' nghttp2Balint Reczey1-0/+53
Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-29macosx-setup: Upgrade c-ares to 1.12.0.Gerald Combs1-2/+2
Change the download protocol to https as well. Change-Id: Id2043141d3b89449f2a0c739c05142af0a7b46ba Reviewed-on: https://code.wireshark.org/review/17983 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-22Fix the "do we have Xcode?" test for older versions of Xcode.Guy Harris1-2/+4
Change-Id: I35853b6cb2985bf9bc36175ec8085929e66db349 Reviewed-on: https://code.wireshark.org/review/17872 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-22Point people to the Mac App Store for Xcode.Guy Harris1-2/+2
Don't give a URL that doesn't work any more. Change-Id: I3d2dbef2dda4a96aff9382e687eb8eb64218d14d Reviewed-on: https://code.wireshark.org/review/17859 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-22Make it detect command-line-toos-only installations.Guy Harris1-8/+6
/usr/bin/xcodebuild is present, but appears not to work, if you have only the command-line tools for Xcode 8 installed, not Xcode 8 itself. Change-Id: I4a55e30f8afcc7e575e661d2b4ea944c967790ec Reviewed-on: https://code.wireshark.org/review/17856 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-22Don't mention a particular version of XQuartz.Guy Harris1-8/+3
The version we were using is out of date and, because we don't download it in the script, we don't *need* the version, we can just point people to http://www.xquartz.org. Change-Id: I049e55c11a6877a1ad888288a157cc8527740b16 Reviewed-on: https://code.wireshark.org/review/17850 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-15Fix a test to work with Xcode 8.Guy Harris1-1/+9
(Hopefully it still does what it's supposed to; I don't have any machine, real or virtual, that has the command-line tools installed without Xcode being installed on which to test it.) Change-Id: I0ce8ce4f8532fcc6ab121641dde238180dfa69ce Reviewed-on: https://code.wireshark.org/review/17704 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-09Update to Lua 5.2.4.Guy Harris1-2/+2
Change-Id: Icadf4001799a58c5bc686caff4ffa99289bf08a8 Reviewed-on: https://code.wireshark.org/review/16980 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-29Upgrade to libtool 2.4.6.Guy Harris1-1/+1
As per bug 12689, earlier versions of libtool had a bug wherein they assumed a 1-digit second component of the OS version number, and thought OS X 10.10 was OS X 10.1 and used the wrong linker flags. A build from Git would succeed, but a build from the source tarball wouldn't. Change-Id: I412d1e0b02976f44c573f9ff1b62465f5eeaeb05 Ping-Bug: 12689 Reviewed-on: https://code.wireshark.org/review/16773 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-30Install GNU autotools even on Snow Leopard.Guy Harris1-6/+5
The Snow Leopard versions are too old for current Wireshark. Change-Id: I25936370164d69d6b0eaca4ac9e3253772e0ac73 Reviewed-on: https://code.wireshark.org/review/14712 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-01HTTPS is now needed to download the pkg-config source.Guy Harris1-1/+1
Bug: 12214 Change-Id: Ic23632d19733b7504dcde3735af36942803ceac9 Reviewed-on: https://code.wireshark.org/review/14272 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-01Update the current XZ version.Guy Harris1-1/+1
5.0.4 is no longer available; the current version is 5.0.8. Change-Id: I982a4809ae87362837561297967a8eb63485676c Ping-Bug: 12214 Reviewed-on: https://code.wireshark.org/review/14257 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-13Add support for libssh.Michael Tüxen1-0/+55
Change-Id: Iffb0ea15c76659f5c1f73e2b7b11bcfdeb859c6a Reviewed-on: https://code.wireshark.org/review/13925 Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2016-01-02Update PNG_VERSION to the only version that actually exists.Joerg Mayer1-2/+2
At least with Qt5.5.1 there is no duplicate clang_64 in the qt path. Change-Id: I2ac66f246b3c9dbe2155ee8394d31e7d560faaf9 Reviewed-on: https://code.wireshark.org/review/13000 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-12-30Expand a comment.Guy Harris1-5/+5
Also fix the capitalization of "Qt", and don't have a commented-out definition of GTK_VERSION to 3.5.2; if you want GTK+ 3.5.2, you'd do it by setting the environment variable GTK_VERSION to 3.5.2 when running the script. Change-Id: I71a5d8caf87c08a5f98730aea65f994aff611590 Reviewed-on: https://code.wireshark.org/review/12939 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-29CMake updatesJoerg Mayer1-3/+3
- make CMAKE_VERSION configurable via environment variable - Fix download URL (no www. and httpS) Change-Id: Id347b2f837d26063d889667f69bb1b4418e8e86d Reviewed-on: https://code.wireshark.org/review/12934 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-12-29Allow overriding of the GTK and QT versions without modifying the script.Joerg Mayer1-8/+8
Change-Id: I6e43845ee199232b53887d970996ca273564338c Reviewed-on: https://code.wireshark.org/review/12923 Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-14Build Lua with all the appropriate flags.Guy Harris1-1/+1
It doesn't use a configure script, so we have to pass in -arch flags, minimum version flags, "where's the SDK" flags, etc. by setting MYCFLAGS and MYLDFLAGS for the make, rather than for the configure script. Change-Id: I8c95851051cd2a9ddd7a9caf6faccd2e9fd2b4a7 Reviewed-on: https://code.wireshark.org/review/10995 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-11On 10.5, don't set GTK+ etc. versions if we haven't already set them.Guy Harris1-4/+16
When building for 10.5, if the version numbers of GTK+ and its support libraries haven't been set, don't override the settings to get older versions; that way, if you've changed macosx-setup.sh not to bother installing GTK+, this won't force it to be installed. Change-Id: Ia05f45fb6bd469b568a28a8769f3130a99180d7e Reviewed-on: https://code.wireshark.org/review/10945 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-11Handle installing Qt 4.x.Guy Harris1-8/+26
Or, at least, 4.8.6. I guess they had to do an updated build or something, as the actual dmg has "4.8.6-1", so handle that extra versioning. Clean up some white space while we're at it. Change-Id: I62b99dd99e7e5cb84cca68bdc59b02e4bf65411f Reviewed-on: https://code.wireshark.org/review/10943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-09-30It's "-Wno-XXX", not "-WnoXXX".Guy Harris1-1/+1
Change-Id: I90ac4872e2a792dac07a6c12c8f059795f7f6bc3 Reviewed-on: https://code.wireshark.org/review/10712 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-09-30Another big hammer to shut Apple's deprecation squealing up.Guy Harris1-1/+4
Change-Id: Ifeb37566468fca0afceab1d74baa23fd05a46057 Reviewed-on: https://code.wireshark.org/review/10711 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-11Note the Qt bugs about the broken .pc files.Guy Harris1-1/+3
Change-Id: I050caef2a20b0c6c567f810465a3bcfe40b04a11 Reviewed-on: https://code.wireshark.org/review/9603 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-11Update to Qt 5.5.0, to fix context menu issues.Guy Harris1-2/+7
This requires still *more* .pc file fixes. Change-Id: I74a385e272063b3342a29122c87331bc8191f7f5 Ping-Bug: 11355 Reviewed-on: https://code.wireshark.org/review/9601 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-281.5.17 seems to be a typo. Change it to the probably intended 1.6.17Joerg Mayer1-1/+1
Change-Id: I43fc4962e1fdc9fb264b313afd3f5612de42116a Reviewed-on: https://code.wireshark.org/review/9196 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-26Disabling GTK by default in the official source was not intentionalJoerg Mayer1-1/+1
(but maybe it should be). Change-Id: I9dba032951265204e1ced517ad7eb331ec71a6a2 Reviewed-on: https://code.wireshark.org/review/9167 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-26Make autotools install optional.Joerg Mayer1-17/+25
Reformat build and install instructions at the end a bit. Change-Id: I0f6be9e4b58f3987615abcec6521f59ba33b3b0a Reviewed-on: https://code.wireshark.org/review/9166 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-24Add a bunch of " I missed in my previous patch.Joerg Mayer1-3/+3
Change-Id: Ia94034bdb2148bca641b7c9bc6ec3f900c7574d3 Reviewed-on: https://code.wireshark.org/review/9097 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-24Update build instructions for cmake near the end a bitJoerg Mayer1-3/+8
Change-Id: I7d5b8ab3479cc4268b6cc5ae7822066a69b740dc Reviewed-on: https://code.wireshark.org/review/9085 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-24Handle downloading and installing CMake 3.x.Guy Harris1-15/+91
Change-Id: I2347e3e36008fee006e9f66997d45b562eacc7dc Reviewed-on: https://code.wireshark.org/review/9084 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-17Download the Qt dmg and just do a binary installation.Guy Harris1-42/+39
That's a *lot* faster than building from source. That means we should suggest adding the Qt pkg-config directory to PKG_CONFIG_PATH; do so. Change-Id: I9a70ea73fbace1f736cad8a4da11b62df8e5818e Reviewed-on: https://code.wireshark.org/review/8105 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-17Mount the CMake dmg we downloaded, don't download it again.Guy Harris1-1/+1
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>
2015-04-16Fix copy-and-pasteo.Guy Harris1-1/+1
"Recursion(n). See "recursion"." Change-Id: Ic0acab13a6da8e0e00ead32653498d13edf212ac Reviewed-on: https://code.wireshark.org/review/8098 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-10Change a lot of http:// URLs to https://.Gerald Combs1-7/+3
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>
2015-01-28Go back to installing 5.2.3 for now.Guy Harris1-1/+5
Change-Id: I1c798cd1a74aee559225fea1e4bc3694466de861 Reviewed-on: https://code.wireshark.org/review/6836 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-22Remove a mysterious comment that no longer applies.Guy Harris1-1/+0
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>
2015-01-22Lua 5.3.0 is now out; install it. (It has better 64-bit integer support.)Guy Harris1-1/+1
Change-Id: I99cad6bd6c5646bfbaddfdde317673cf749766a8 Reviewed-on: https://code.wireshark.org/review/6737 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-22Un-install and re-install if the installed and specified versions differ.Guy Harris1-10/+498
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>
2015-01-22Remove autotools packages if something they depend on changes.Guy Harris1-0/+11
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>
2015-01-22When uninstalling a library, first uninstall what depends on it.Guy Harris1-0/+52
Change-Id: I80a719acd90e225b28ca16a24ca74030498a5a42 Reviewed-on: https://code.wireshark.org/review/6734 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-22Rename install_libpixman to install_pixman, to match uninstall_pixman.Guy Harris1-2/+2
Change-Id: If71895cae49000ff4a4b5bb8211f0b21feed82bc Reviewed-on: https://code.wireshark.org/review/6733 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-22Do tests in the order the comment before them implies.Guy Harris1-1/+1
Change-Id: Ie82ce54915866bdf635da832dd2f4c4ae1f2937e Reviewed-on: https://code.wireshark.org/review/6732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-22Give PortAudio a versioned -done file.Guy Harris1-4/+20
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>
2015-01-22Make the individual install_ and uninstall_ functions idempotent.Guy Harris1-811/+844
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>
2015-01-22Pull the installs into a function.Guy Harris1-171/+172
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 10:44:37 +0000