aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/macosx
AgeCommit message (Collapse)AuthorFilesLines
2014-06-18Get rid of the Python stuff, as we've gotten rid of Python plugin support.Guy Harris1-10/+2
Also, update a comment to more accurately describe what a loop is doing, and get rid of an unused variable. Change-Id: I948fc4ad758152b483450bf74f653087c892ad3a Reviewed-on: https://code.wireshark.org/review/2360 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-17When building an OS X package for GTK+, put the libraries in lib.Guy Harris1-5/+10
This reverts to the way we did it prior to the switch to Qt; with GTK+, Contents/MacOS/Wireshark is just a launcher, and the Wireshark binary is in Contents/Resources/bin/wireshark-bin, and the appropriate rpath entry would be @executable_path/../lib - @executable_path/../Frameworks, which works for the Qt version, in which Contents/MacOS/Wireshark is the actual executable, doesn't work for the GTK+ version. This should fix bug 10185. Change-Id: I4e50a4ead8f29a742c97a9001c821aabe1fa5e65 Reviewed-on: https://code.wireshark.org/review/2347 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-07Only nuke the startup item once we've installed the launch daemon.Guy Harris1-2/+2
That way, if we crash in the middle, there's still something installed that will try to set the permissions on the BPF devices. Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411 Reviewed-on: https://code.wireshark.org/review/2023 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-07When installing the launch daemon, get rid of the old startup item.Guy Harris1-0/+2
Only one is necessary; get rid of the startup item. Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86 Reviewed-on: https://code.wireshark.org/review/2016 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06Get rid of some stuff left over from the days of drag-install.Guy Harris2-28/+1
We're not using the Utilities directory; don't create it and don't fill it in. Change-Id: I7ba66b415a2e5a6aff77d4bdb57b2ca176bcd789 Reviewed-on: https://code.wireshark.org/review/2009 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06Switch to a launch daemon for ChmodBPF.Guy Harris10-130/+94
"Ah finally blew that varmint to Kingdom Come!" Change-Id: I4ef5f8692924772189af4158eddbc125c1c7d521 Reviewed-on: https://code.wireshark.org/review/2004 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\$ \*\//,+0 d') ( /* $Id */ ) Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9 Reviewed-on: https://code.wireshark.org/review/886 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte17-33/+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-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \$Id\$/,+1 d') (No star only 2 spaces before) Change-Id: Id7b254031769a9dca2941304e4d3a0f4bdbc3f54 Reviewed-on: https://code.wireshark.org/review/883 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-19The 1.11.x installer puts the global plugins in the wrong place [Mac OS X]Alexis La Goutte1-1/+1
Issue found by rols The installer puts the normal included plugins (e.g. mate, wimax) in /Applications/Wireshark.app/Contents/Frameworks/wireshark/plugins, however the global plugins directory is set to /Applications/Wireshark.app/Contents/Resources/lib/wireshark/plugins (as it was in previous versions) so no plugins load at startup. In order to make them load you have to create this directory and copy the plugins there, or put them in your personal directory. From remark of Gerald, use recommandation of Bundle Programming Guide (use Contents/PlugIns for plugin) https://developer.apple.com/library/mac/documentation/corefoundation/conceptual/cfbundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/10000123i-CH101-SW19 Change-Id: Ib1ae7da48a8fa94f7037912cd44c05532a238b71 Closed-bug: 9854 Reviewed-on: https://code.wireshark.org/review/602 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-01Happy new year!Stig Bjørlykke1-2/+2
svn path=/trunk/; revision=54529
2013-12-27From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9576Alexis La Goutte1-1/+0
Replace g_memmove with memmove However there still one move g_memmove related code in "packaging/macosx/native-gtk/glibconfig.h". svn path=/trunk/; revision=54472
2013-11-16Instead of installing a script named "utility-launcher" and renaming it,Gerald Combs2-1/+1
install a script named "wireshark". svn path=/trunk/; revision=53356
2013-11-16Try reverting 01wireshark.xml to r53280.Gerald Combs1-38/+1
svn path=/trunk/; revision=53354
2013-11-16Try removing XML headers.Gerald Combs2-2/+0
svn path=/trunk/; revision=53352
2013-11-13Simplify the CLI preinstall script a bit and hopefully get rid of an error.Gerald Combs1-5/+1
svn path=/trunk/; revision=53296
2013-11-12Fix permissions for installed OS X files and directories.Gerald Combs5-5/+102
Add a cli-preinstall script that creates missing parts of the installation path and sets their permissions. Simply copy "utility-launcher" to "wireshark" instead of renaming it at install time. Explicitly set its ownership and permissions. Pretty-print some of the PackageMaker XML files via `xmllint --format --recover`. svn path=/trunk/; revision=53281
2013-11-10"productsign" should work now. Remove "codesign".Gerald Combs1-1/+0
svn path=/trunk/; revision=53243
2013-11-10Be exceedingly diligent about checking OS X package signatures.Gerald Combs1-2/+3
svn path=/trunk/; revision=53242
2013-11-10Add missing backslash.Gerald Combs1-1/+1
svn path=/trunk/; revision=53212
2013-11-10More packaging updates.Gerald Combs2-4/+5
Specify "Application" or "Installer" code signing identities as needed. Switch back to productbuild for the package. That seems to be the correct utility to use. Give the package an ID. Package signing is still broken but this appears to be closer to being correct. svn path=/trunk/; revision=53211
2013-11-10Bump LSMinimumSystemVersion to 10.6.Gerald Combs1-1/+1
svn path=/trunk/; revision=53210
2013-11-10Fix argument order.Gerald Combs1-1/+1
svn path=/trunk/; revision=53209
2013-11-10Try switching back to codesign.Gerald Combs1-4/+5
svn path=/trunk/; revision=53208
2013-11-09Sign the right file.Gerald Combs1-1/+1
svn path=/trunk/; revision=53203
2013-11-09Older versions of productsign don't support "--force" or "--verbose".Gerald Combs1-1/+1
svn path=/trunk/; revision=53202
2013-11-09Try to simplify package signing.Gerald Combs1-6/+2
According to the packagemaker man page, '--target 10.5' will produce a flat package. Use it instead of pkgutil. svn path=/trunk/; revision=53201
2013-11-09Try to perform package signing as described atGerald Combs1-5/+14
http://stackoverflow.com/questions/11487596/making-os-x-installer-packages-like-a-pro-xcode4-developer-id-mountain-lion-re We *might* have to switch away from packagemaker in order to be able to sign packages properly. svn path=/trunk/; revision=53199
2013-11-07Print LC_VERSION_MIN_MACOSX for each executable and library.Gerald Combs1-0/+9
svn path=/trunk/; revision=53145
2013-10-28Add some verbosity.Gerald Combs1-0/+2
svn path=/trunk/; revision=52929
2013-10-27More SVN properties cleanup.Jeff Morriss1-0/+2
svn path=/trunk/; revision=52884
2013-10-25Exit if we're building with Qt and we can't find macdeployqt.Gerald Combs1-2/+2
svn path=/trunk/; revision=52853
2013-10-21Code signing updates.Gerald Combs2-32/+54
Sign executables, libraries, frameworks, plugins, and bundles as per the Code Signing Guide. Check our work with spctl. Use "bundle" to differentiate what we're doing with the package script. svn path=/trunk/; revision=52746
2013-10-17Sign all of the executables.Gerald Combs1-2/+9
svn path=/trunk/; revision=52663
2013-10-15If CODE_SIGN_IDENTITY is set use it to sign the app bundle and theGerald Combs2-0/+18
installer package. Add commented-out code to sign the .dmg as well in case Apple supports that in the future. svn path=/trunk/; revision=52633
2013-10-14Look for QtWidgets in the right directory.Gerald Combs1-6/+7
svn path=/trunk/; revision=52601
2013-10-10Fixes for the utility-launcher script.Gerald Combs4-13/+68
If we don't find Wireshark.app in WIRESHARK_APP_DIR or /Applications/Wireshark.app, look for it using its bundle ID. Add a description of this process to the Read Me First files. Look for executables in the right subdirectory depending on our UI flavor. Make sure we don't add GTK+-specific items to the app bundle if we're using Qt. svn path=/trunk/; revision=52502
2013-10-09Sometimes we need to @rpathify libraries from more than one directory.Gerald Combs1-6/+23
Instead of trying to match libraries from $LIBPREFIX, exclude libraries that aren't in well-known system paths and which haven't previously been @rpathified. svn path=/trunk/; revision=52479
2013-10-07Try to fix building the GTK flavor OS X app.Gerald Combs1-3/+8
svn path=/trunk/; revision=52442
2013-10-05More debugging.Guy Harris1-1/+2
svn path=/trunk/; revision=52376
2013-10-03Report what file we were using to determine the architecture.Guy Harris1-1/+1
svn path=/trunk/; revision=52340
2013-10-01Undo my previous manual undo of an RTF change made by the Mountain LionGuy Harris2-2/+2
version of TextEdit, so that this is solely the result of TextEdit. svn path=/trunk/; revision=52324
2013-10-01Add Wireshark back to the GTK+ package.Gerald Combs1-1/+1
svn path=/trunk/; revision=52323
2013-10-01We install the wrapper scripts for the command-line tools inGuy Harris2-8/+8
/usr/local/bin, not in /Library/Wireshark. svn path=/trunk/; revision=52322
2013-10-01Use separate "Read me first" files for Qt and GTK+.Gerald Combs4-23/+102
svn path=/trunk/; revision=52321
2013-09-30The Qt executables shouldn't need any wrappers. Just copy them overGerald Combs1-11/+18
as-is. svn path=/trunk/; revision=52303
2013-09-30Make sure we copy Wireshark's libraries to Frameworks. Use top_builddirGerald Combs1-2/+3
instead of top_srcdir. It shouldn't make any difference in our case but it's more correct. svn path=/trunk/; revision=52302
2013-09-30Be a little more verbose.Gerald Combs1-1/+1
svn path=/trunk/; revision=52297
2013-09-30Use macdeployqt to add the Qt bits to our bundle. Put our libraries inGerald Combs2-40/+13
Contents/Frameworks since that's what macdeployqt expects. Have osx-dmg.sh look at the correct executable. svn path=/trunk/; revision=52295
2013-09-30More Qt app bundle migration. Still doesn't work quite right.Gerald Combs1-4/+28
svn path=/trunk/; revision=52293
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 15:07:14 +0000