aboutsummaryrefslogtreecommitdiffstats
path: root/macosx-setup.sh
Commit message (Collapse)AuthorAgeFilesLines
* Download the Qt dmg and just do a binary installation.Guy Harris2015-04-171-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>
* Mount the CMake dmg we downloaded, don't download it again.Guy Harris2015-04-171-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>
* Fix copy-and-pasteo.Guy Harris2015-04-161-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>
* Change a lot of http:// URLs to https://.Gerald Combs2015-03-101-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>
* Go back to installing 5.2.3 for now.Guy Harris2015-01-281-1/+5
| | | | | | Change-Id: I1c798cd1a74aee559225fea1e4bc3694466de861 Reviewed-on: https://code.wireshark.org/review/6836 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Remove a mysterious comment that no longer applies.Guy Harris2015-01-221-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>
* Lua 5.3.0 is now out; install it. (It has better 64-bit integer support.)Guy Harris2015-01-221-1/+1
| | | | | | Change-Id: I99cad6bd6c5646bfbaddfdde317673cf749766a8 Reviewed-on: https://code.wireshark.org/review/6737 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Un-install and re-install if the installed and specified versions differ.Guy Harris2015-01-221-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>
* Remove autotools packages if something they depend on changes.Guy Harris2015-01-221-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>
* When uninstalling a library, first uninstall what depends on it.Guy Harris2015-01-221-0/+52
| | | | | | Change-Id: I80a719acd90e225b28ca16a24ca74030498a5a42 Reviewed-on: https://code.wireshark.org/review/6734 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Rename install_libpixman to install_pixman, to match uninstall_pixman.Guy Harris2015-01-221-2/+2
| | | | | | Change-Id: If71895cae49000ff4a4b5bb8211f0b21feed82bc Reviewed-on: https://code.wireshark.org/review/6733 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Do tests in the order the comment before them implies.Guy Harris2015-01-221-1/+1
| | | | | | Change-Id: Ie82ce54915866bdf635da832dd2f4c4ae1f2937e Reviewed-on: https://code.wireshark.org/review/6732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Give PortAudio a versioned -done file.Guy Harris2015-01-221-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>
* Make the individual install_ and uninstall_ functions idempotent.Guy Harris2015-01-221-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>
* Pull the installs into a function.Guy Harris2015-01-221-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>
* Pull the install and uninstall sequences into functions.Guy Harris2015-01-221-656/+849
| | | | | | | | | | 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>
* Fix handling of 3-component OS version numbers.Guy Harris2014-12-201-2/+3
| | | | | | | | | | | | | | | 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>
* Set CXXFLAGS to include $VERSION_MIN_FLAGS.Guy Harris2014-11-011-19/+19
| | | | | | | | | 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>
* Don't force a verbose build.Guy Harris2014-10-311-1/+1
| | | | | | | | | 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>
* Undo my personal disabling of the Qt download/build/install.Guy Harris2014-10-311-1/+1
| | | | | | | | | | | | | | | | 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>
* For OS X, don't rigidly tie the SDK version to the minimum target version.Guy Harris2014-10-311-23/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Fix name of C-Ares source directory & make the name of the -done file match it.Guy Harris2014-10-311-5/+5
| | | | | | | | | 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>
* The C-Ares "done" file should have a name beginning with cares-.Guy Harris2014-10-311-2/+2
| | | | | | | | Fix a presumed copy-and-pasteo. Change-Id: I6953bfb46741923507bb58b4e48a72d92313e07c Reviewed-on: https://code.wireshark.org/review/5012 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Update a comment as per the previous commit.Guy Harris2014-09-261-2/+2
| | | | | | Change-Id: Ic7adba4302d4d4abff7012cf09d68246ebade922 Reviewed-on: https://code.wireshark.org/review/4296 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Renaming libtool* to glibtool* might require root permission.Guy Harris2014-09-261-4/+6
| | | | | | | | | | 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>
* Don't fail if unmounting the CMake disk image fails.Guy Harris2014-07-271-1/+1
| | | | | | | | | | 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>
* Download and install a binary package of CMake from Kitware.Guy Harris2014-07-261-14/+25
| | | | | | Change-Id: Ia7e5576ff64e1c31682006a023f1bd2ff1d3ccb1 Reviewed-on: https://code.wireshark.org/review/3204 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Continue to remove $Id$ from top of fileAlexis La Goutte2014-03-311-2/+0
| | | | | | | | (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>
* Print a message in case we don't have an X11 SDK installed about whereJoerg Mayer2014-03-161-0/+8
| | | | | | | | to find xquartz. Change-Id: I76548fba0b01f8274d12bbb55f4f16622d9a7eff Reviewed-on: https://code.wireshark.org/review/704 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
* CMake updates:Joerg Mayer2014-03-161-2/+2
| | | | | | | | | - build by default - update to 2.8.12.2 which actually builds on Mavericks Change-Id: I60b539613e13d2cdccbd083b28f641ff1ce363c4 Reviewed-on: https://code.wireshark.org/review/703 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
* Change libsmi url and Lua version in macosx-setup.shHadriel Kaplan2014-02-251-4/+3
| | | | | | | | | | | 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>
* Qt 5.2.1 - now with added native OS X toolbar!Guy Harris2014-02-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | To quote https://qt.gitorious.org/qt/qtbase/source/62feb088a30045e7fbd2a3074c64d18035b84a97: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>
* From Ville Skyttä: Spelling FixesBill Meier2013-12-231-1/+1
| | | | | | | https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591 svn path=/trunk/; revision=54387
* Support building and installing both Qt and GTK+.Guy Harris2013-10-291-101/+157
| | | | | | | | 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
* Add c-ares. Untested, but it *should* work.Gerald Combs2013-10-281-0/+26
| | | | svn path=/trunk/; revision=52936
* Pass -sdk, not that it actually *works*.Guy Harris2013-10-231-1/+1
| | | | svn path=/trunk/; revision=52782
* Default to GTK+ 3, not Qt, for now.Guy Harris2013-10-231-1/+1
| | | | svn path=/trunk/; revision=52777
* First cut at having this handle Qt. Adds a TOOLKIT variable that youGuy Harris2013-10-231-240/+281
| | | | | | | | | | | | 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
* Add information about building Qt.Gerald Combs2013-10-221-0/+23
| | | | svn path=/trunk/; revision=52769
* Add copyright (Michael, Joerg and Guy) and license (GPL2+)Jörg Mayer2013-09-141-3/+18
| | | | svn path=/trunk/; revision=52035
* To handle the hypothetical case of an OS X release offering a choice ofGuy Harris2013-08-231-143/+155
| | | | | | | | | 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
* Put back missing space between --disable-cups and --without-libtiff. Guy Harris2013-08-231-1/+1
| | | | | | Should fix bug 9073. svn path=/trunk/; revision=51498
* Put the GTK2 vs. GTK3 and autofoo vs. CMake options at the beginning,Guy Harris2013-07-311-13/+14
| | | | | | | | | | | 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
* If no target OS version was specified, default to the major version onGuy Harris2013-07-311-150/+150
| | | | | | | | 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
* Change default gtk build from version 2 to version 3 forJörg Mayer2013-07-241-1/+1
| | | | | | | autotool, cmake and nmake. No idea what it takes to change the visual project stuff svn path=/trunk/; revision=50863
* When building for 10.6, force the build to use libpng12.Guy Harris2013-07-121-1/+16
| | | | svn path=/trunk/; revision=50538
* Fix uninstallation of Cairo - uninstall, don't install!Guy Harris2013-07-091-1/+1
| | | | svn path=/trunk/; revision=50461
* Fix missing $ before variable name.Guy Harris2013-07-091-4/+5
| | | | | | | Look at the lua-*-done file to get the version number of the version of Lua we installed. svn path=/trunk/; revision=50460
* Fix the uninstall procedure for Lua - the man pages are installed intoGuy Harris2013-07-091-1/+1
| | | | | | /usr/local/man/man1, not /usr/local/man. svn path=/trunk/; revision=50458
* Use older versions of some libraries, and build 32-bit, when buildingGuy Harris2013-07-091-179/+261
| | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 15:34:16 +0000