Wireshark · Wireshark-commits: [Wireshark-commits] rev 50442: / /trunk-1.8/packaging/macosx/: Makefile.am osx-app.sh osx-dmg.sh osx

[guy@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=50442

User: guy
Date: 2013/07/07 05:03 PM

Log:
 Copy over revisions from trunk:
 
   ------------------------------------------------------------------------
   r50440 | guy | 2013-07-07 14:38:04 -0700 (Sun, 07 Jul 2013) | 2 lines
   
   Clean up comments.
   
   ------------------------------------------------------------------------
   r50426 | guy | 2013-07-06 16:29:50 -0700 (Sat, 06 Jul 2013) | 8 lines
   
   Check for an OS X deployment target early, so that as many
   tests using the compiler are done using the flags that
   we'll be using when building.
   
   Add a -mmacosx-version-min flag to CFLAGS/CPPFLAGS/LDFLAGS so that the
   compiler tests use them.  This may, or may not, obviate the need to set
   MACOSX_DEPLOYMENT_TARGET in OSX_DEPLOY_TARGET.
   
   ------------------------------------------------------------------------
   r50410 | guy | 2013-07-06 09:42:30 -0700 (Sat, 06 Jul 2013) | 9 lines
   
   Add a --enable-osx-deploy-target option to set the deployment target
   when building for OS X; that causes the MACOSX_DEPLOYMENT_TARGET
   environment variable to be set when building (so that, for example, we
   don't use linker features available on the version on which we're
   building but not on the minimum OS version for which we're building),
   and causes the SDK for that version to be used (so that, for example, we
   don't link with libraries with later version numbers than the ones
   provided with the OS version for which we're building).
   
   ------------------------------------------------------------------------
   r46957 | guy | 2013-01-05 15:31:08 -0800 (Sat, 05 Jan 2013) | 10 lines
   
   Don't assume developer tools are under /Developer - look for
   /Applications/Xcode.app/Developer first (for Xcode 4 and later) and, if
   we don't find that, look for /Developer.
   
   Don't assume packagemaker is under $developer_path/usr/bin - with Xcode
   4, you need to install Auxiliary Tools for Xcode to get PackageMaker,
   and even that doesn't directly install the packagemaker command, so we
   currently advise people to copy the PackageMaker binary to
   /usr/bin/packagemaker.
   
   ------------------------------------------------------------------------
   r46955 | guy | 2013-01-05 15:11:38 -0800 (Sat, 05 Jan 2013) | 6 lines
   
   Default to LIBPREFIX being /usr/local, as that's where macosx-setup.sh
   puts them.  If you choose to use MacPorts versions of the library, edit
   the script or run it with -l.
   
   Update the usage message and fix a typo.
   
   ------------------------------------------------------------------------
   r46954 | guy | 2013-01-05 15:07:05 -0800 (Sat, 05 Jan 2013) | 7 lines
   
   Don't assume that, in the output of the file command, the architecture
   appears at the end - if the user's installed an up-to-date version of
   file to, for example, get pcap-ng files identified (Apple hasn't updated
   file in *ages* - they're still in file 5.04!), it will report, for
   example, "Mach-O 64-bit x86_64 executable" rather than "Mach-O 64-bit
   executable x86_64" for an x86-64 binary.
   
   ------------------------------------------------------------------------
   r44572 | gerald | 2012-08-18 17:49:55 -0700 (Sat, 18 Aug 2012) | 3 lines
   
   Get the package version using configure.in, not grep+sed. Make sure we
   exit with an error in a few places where it would be useful.

Directory: /trunk-1.8/packaging/macosx/
  Changes    Path             Action
  +1 -1      Makefile.am      Modified
  +22 -7     osx-app.sh       Modified
  +0 -230    osx-dmg.sh       Removed
  +240 -0    osx-dmg.sh.in    Added

Directory: /trunk-1.8/
  Changes    Path            Action
  +1 -1      Makefile.am     Modified
  +112 -0    configure.in    Modified