aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/macosx
AgeCommit message (Collapse)AuthorFilesLines
2015-01-05Attempt to fix "make distcheck" on Ubuntu buildbotStephen Fisher1-2/+2
Change-Id: I6e7ea1e2aaf839fdb3af8a3a5a47aabbb12056ef Reviewed-on: https://code.wireshark.org/review/6326 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-05Get rid of some GNU make extensions so users can build withStephen Fisher1-1/+1
the make that comes with *BSD and other systems now. Change-Id: Ib2eee8d37e7029202675bac35839b1c0d5fc5131 Reviewed-on: https://code.wireshark.org/review/6320 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-03It is also 2015 for Mac OS X :-)Alexis La Goutte1-2/+2
Change-Id: Idbd5e09ac80015feee7ddd30b9569219fde596e1 Reviewed-on: https://code.wireshark.org/review/6269 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-03Info.plist : fix indent (use tabs)Alexis La Goutte1-1/+1
Change-Id: I241c124fa341ae5d6126a189374d69dea1a08d96 Reviewed-on: https://code.wireshark.org/review/6268 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-02Fix syntax.Guy Harris1-1/+0
Change-Id: Icc18cd7369bae21629aafd5631a373485ef75dea Reviewed-on: https://code.wireshark.org/review/5081 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02Handle packagemaker being an ordinary command in /usr/bin.Guy Harris1-0/+4
Change-Id: Ic804a0fdb4dc450683f57be4814a347e20ecd401 Reviewed-on: https://code.wireshark.org/review/5079 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02Fix syntax, add a check for failure to find PackageMaker, make sure it's a file.Guy Harris1-6/+12
Change-Id: Id5bb23a8c5ebd8a63a51029de541cd32e484029c Reviewed-on: https://code.wireshark.org/review/5078 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02Handle PackageMaker a bit better.Guy Harris1-8/+19
Look for the binary in various places, rather than looking for particular directories and adding them to the path. That lets us use the PackageMaker binary from the PackageMaker.app bundle (it can either be run as a GUI app or from the command line), so you don't have to have a symlink to it from one of the directories in question. Change-Id: I1ad701291698544f96d419663f0b4a669876d2f1 Reviewed-on: https://code.wireshark.org/review/5077 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-30Add a missing backslash.Gerald Combs1-1/+1
Change-Id: Iac79c885fe10805b61512ed2c02cd652f1c3fd7a Reviewed-on: https://code.wireshark.org/review/5010 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-30OS X: Don't add libtool control files to the app bundle.Gerald Combs1-1/+3
According to https://developer.apple.com/library/mac/technotes/tn2206 the Contents/PlugIns directory should *only* contain executable files. Only copy .so (and in case we need them) .dylib files. Change-Id: I01f077735018733926db92e7576f6f4fecb68862 Reviewed-on: https://code.wireshark.org/review/5008 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-23OS X: Integrate CMake and osx-app.shGerald Combs1-196/+219
Add a -cb/--create-bundle option to osx-app.sh which builds the application bundle. Use it in Autotools. (CMake does this by default.) Copy over linker flags from configure.ac to CMakeLists.txt to support rpathification and code signing. Add an osx-app custom target to CMake. Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803 Reviewed-on: https://code.wireshark.org/review/4918 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-22OS X: Fix osx-dmg.sh bundle binary path.Gerald Combs1-1/+1
Change-Id: Ia7c59de4f8b59dda9dbc484b8fa9ae0c3d88d594 Reviewed-on: https://code.wireshark.org/review/4905 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-21osx-app.sh: Add verbosity.Gerald Combs1-1/+1
Change-Id: I3cd1c49909af34badd0d5c5f29bfcddb753ef2bf Reviewed-on: https://code.wireshark.org/review/4902 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-21Make the "-qt" option the default in the OS X packaging scripts.Gerald Combs2-10/+22
Change-Id: I1e404c342d06381be71735ff6fbc47e9b2b13899 Reviewed-on: https://code.wireshark.org/review/4895 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-20OS X: Add retina / hidpi support to Info.plist.Gerald Combs1-64/+66
This should partially fix the problem described at https://ask.wireshark.org/questions/37177/pixelated-ui-on-mac-os-x-with-development-1990 Change-Id: I436aae0d5b681e9ff549d257c2244ee67448ab07 Reviewed-on: https://code.wireshark.org/review/4876 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03OS X packaging fix.Gerald Combs1-1/+1
Change-Id: I82936bb1dcfa3a7ca1aea8a3ded388015aa37531 Reviewed-on: https://code.wireshark.org/review/3966 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02OS X packaging fix: wireshark-qt → wireshark.Gerald Combs1-2/+2
Change-Id: Ie95c28ca47baf453335abab23eb7baba63d52f47 Reviewed-on: https://code.wireshark.org/review/3963 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-31Add more files to the release tarball.Guy Harris1-0/+1
Change-Id: I02ce275154979ff56f8f8929e5909f3035f62c47 Reviewed-on: https://code.wireshark.org/review/3286 Reviewed-by: Guy Harris <guy@alum.mit.edu>
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 01:16:21 +0000