aboutsummaryrefslogtreecommitdiffstats
path: root/macosx-setup.sh
AgeCommit message (Collapse)AuthorFilesLines
2014-12-20Fix handling of 3-component OS version numbers.Guy Harris1-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>
2014-11-01Set CXXFLAGS to include $VERSION_MIN_FLAGS.Guy Harris1-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>
2014-10-31Don't force a verbose build.Guy Harris1-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>
2014-10-31Undo my personal disabling of the Qt download/build/install.Guy Harris1-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>
2014-10-31For OS X, don't rigidly tie the SDK version to the minimum target version.Guy Harris1-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>
2014-10-31Fix name of C-Ares source directory & make the name of the -done file match it.Guy Harris1-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>
2014-10-31The C-Ares "done" file should have a name beginning with cares-.Guy Harris1-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>
2014-09-26Update a comment as per the previous commit.Guy Harris1-2/+2
Change-Id: Ic7adba4302d4d4abff7012cf09d68246ebade922 Reviewed-on: https://code.wireshark.org/review/4296 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26Renaming libtool* to glibtool* might require root permission.Guy Harris1-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>
2014-07-27Don't fail if unmounting the CMake disk image fails.Guy Harris1-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>
2014-07-26Download and install a binary package of CMake from Kitware.Guy Harris1-14/+25
Change-Id: Ia7e5576ff64e1c31682006a023f1bd2ff1d3ccb1 Reviewed-on: https://code.wireshark.org/review/3204 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-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>
2014-03-16Print a message in case we don't have an X11 SDK installed about whereJoerg Mayer1-0/+8
to find xquartz. Change-Id: I76548fba0b01f8274d12bbb55f4f16622d9a7eff Reviewed-on: https://code.wireshark.org/review/704 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-03-16CMake updates:Joerg Mayer1-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>
2014-02-25Change libsmi url and Lua version in macosx-setup.shHadriel Kaplan1-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>
2014-02-07Qt 5.2.1 - now with added native OS X toolbar!Guy Harris1-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>
2013-12-23From Ville Skyttä: Spelling FixesBill Meier1-1/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591 svn path=/trunk/; revision=54387
2013-10-29Support building and installing both Qt and GTK+.Guy Harris1-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
2013-10-28Add c-ares. Untested, but it *should* work.Gerald Combs1-0/+26
svn path=/trunk/; revision=52936
2013-10-23Pass -sdk, not that it actually *works*.Guy Harris1-1/+1
svn path=/trunk/; revision=52782
2013-10-23Default to GTK+ 3, not Qt, for now.Guy Harris1-1/+1
svn path=/trunk/; revision=52777
2013-10-23First cut at having this handle Qt. Adds a TOOLKIT variable that youGuy Harris1-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
2013-10-22Add information about building Qt.Gerald Combs1-0/+23
svn path=/trunk/; revision=52769
2013-09-14Add copyright (Michael, Joerg and Guy) and license (GPL2+)Jörg Mayer1-3/+18
svn path=/trunk/; revision=52035
2013-08-23To handle the hypothetical case of an OS X release offering a choice ofGuy Harris1-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
2013-08-23Put back missing space between --disable-cups and --without-libtiff. Guy Harris1-1/+1
Should fix bug 9073. svn path=/trunk/; revision=51498
2013-07-31Put the GTK2 vs. GTK3 and autofoo vs. CMake options at the beginning,Guy Harris1-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
2013-07-31If no target OS version was specified, default to the major version onGuy Harris1-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
2013-07-24Change default gtk build from version 2 to version 3 forJörg Mayer1-1/+1
autotool, cmake and nmake. No idea what it takes to change the visual project stuff svn path=/trunk/; revision=50863
2013-07-12When building for 10.6, force the build to use libpng12.Guy Harris1-1/+16
svn path=/trunk/; revision=50538
2013-07-09Fix uninstallation of Cairo - uninstall, don't install!Guy Harris1-1/+1
svn path=/trunk/; revision=50461
2013-07-09Fix missing $ before variable name.Guy Harris1-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
2013-07-09Fix the uninstall procedure for Lua - the man pages are installed intoGuy Harris1-1/+1
/usr/local/man/man1, not /usr/local/man. svn path=/trunk/; revision=50458
2013-07-09Use older versions of some libraries, and build 32-bit, when buildingGuy Harris1-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
2013-07-08Download, build, and install pkg-config before GLib, courtesy of theGuy Harris1-23/+26
"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
2013-07-06We need Cairo if we're building on 10.5 *or* if we're building *for*Guy Harris1-7/+31
10.5 on a later OS. Fix the download path for libpng, and update the version to the currently-available version. svn path=/trunk/; revision=50425
2013-07-06Use consistent 4-space no-tab indentation.Guy Harris1-265/+265
svn path=/trunk/; revision=50421
2013-07-06Don't install the GNU autotools on Snow Leopard and earlier; they wereGuy Harris1-7/+12
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
2013-07-06Add a "-t <target>" flag to set the deployment target OS version; thatGuy Harris1-23/+96
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
2013-07-05Get rid of extra blank line.Guy Harris1-1/+0
svn path=/trunk/; revision=50391
2013-07-05Add a -u flag to uninstall the support tools and libraries.Guy Harris1-80/+335
svn path=/trunk/; revision=50390
2013-07-05LIBFFI_CFLAGS and LIBFFI_LIBS are defined only to suppress the attemptGuy Harris1-5/+3
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
2013-07-04Use xcrun --show-sdk-path to find out where the system include files areGuy Harris1-6/+6
hidden, rather than a "compile a program" hack. svn path=/trunk/; revision=50383
2013-06-27Actually, that's not a clang bug; my test case had a typo. It's still aGuy Harris1-2/+7
case where clang is complaining about code that's OK, it's just not OK in a way that lets clang determine that it is. svn path=/trunk/; revision=50196
2013-06-27Don't assume the system include files are under /usr/include; trick theGuy Harris1-3/+18
compiler into saying where they are, and use that. Patch a bug in PortAudio pa_stable_v19_20111121 that clang found. svn path=/trunk/; revision=50186
2013-06-26Another clang issue to work around:Guy Harris1-1/+6
libgcrypt expects gnu89-style semantics for "inline"; GCC defaults to gnu89, but clang defaults to gnu99. svn path=/trunk/; revision=50175
2013-06-26Suppress -Wformat-nonliteral when building GLib, to avoid a clang bugGuy Harris1-2/+5
where it issues bogus warnings. svn path=/trunk/; revision=50174
2013-06-19From Dirk J via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8821Evan Huus1-3/+5
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
2013-06-17From Dirk Jagdmann via bug 7525: macosx-setup.sh improvements.Gerald Combs1-191/+273
svn path=/trunk/; revision=49995
2013-05-13Allow for building 32-bit versions of the libraries used by wireshark.Michael Tüxen1-6/+12
This allows to build a 32-bit version of wireshark. svn path=/trunk/; revision=49263
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 08:13:18 +0000