Commit Graph

700 Commits

Author SHA1 Message Date
Gerald Combs 2c85824a46 From bkpsu via bug 9374:
Minor grammar error in the NSIS installer script messageBox for
"isRunning" section. "one is associated" should be changed to "one of
its associated"

svn path=/trunk/; revision=53050
2013-11-02 16:17:23 +00:00
Gerald Combs ba49d9bcf0 Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,
the PortableApps version relies on U3_-prefixed environment variables.

svn path=/trunk/; revision=52941
2013-10-29 04:05:27 +00:00
Gerald Combs 66558ef5a8 Remove some (but not all) U3 remnants.
svn path=/trunk/; revision=52935
2013-10-28 22:11:51 +00:00
Gerald Combs 31db0135f4 Add some verbosity.
svn path=/trunk/; revision=52929
2013-10-28 19:09:58 +00:00
Gerald Combs 69741d086b Remove U3 code and packaging.
svn path=/trunk/; revision=52896
2013-10-27 17:15:39 +00:00
Jeff Morriss 0690c4f490 More SVN properties cleanup.
svn path=/trunk/; revision=52884
2013-10-27 01:11:15 +00:00
Gerald Combs 7a3febacac Exit if we're building with Qt and we can't find macdeployqt.
svn path=/trunk/; revision=52853
2013-10-25 21:37:30 +00:00
Gerald Combs 2dd3a651e6 Code signing updates.
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-21 20:06:14 +00:00
Gerald Combs 98f3bb5f15 Sign all of the executables.
svn path=/trunk/; revision=52663
2013-10-17 22:34:38 +00:00
Gerald Combs c4dcd0ca24 If CODE_SIGN_IDENTITY is set use it to sign the app bundle and the
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-15 23:03:48 +00:00
Gerald Combs 9011036f76 Look for QtWidgets in the right directory.
svn path=/trunk/; revision=52601
2013-10-14 17:23:58 +00:00
Gerald Combs 7a1a387d51 Fixes for the utility-launcher script.
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-10 17:30:56 +00:00
Gerald Combs 6a8ceca13a Sometimes we need to @rpathify libraries from more than one directory.
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-09 20:49:12 +00:00
Gerald Combs 69473b4645 Use a plain package name even if we're building with GTK3. Hopefully
we're beyond the "experimental" stage now.

svn path=/trunk/; revision=52453
2013-10-08 20:21:36 +00:00
Gerald Combs 9f45bac313 Try to fix building the GTK flavor OS X app.
svn path=/trunk/; revision=52442
2013-10-07 19:37:22 +00:00
Guy Harris 438f4be98a More debugging.
svn path=/trunk/; revision=52376
2013-10-05 09:13:14 +00:00
Guy Harris b9eecb6f28 Report what file we were using to determine the architecture.
svn path=/trunk/; revision=52340
2013-10-03 00:33:30 +00:00
Guy Harris 1b9b3dc8eb Undo my previous manual undo of an RTF change made by the Mountain Lion
version of TextEdit, so that this is solely the result of TextEdit.

svn path=/trunk/; revision=52324
2013-10-01 21:54:20 +00:00
Gerald Combs 4c1696960b Add Wireshark back to the GTK+ package.
svn path=/trunk/; revision=52323
2013-10-01 21:43:51 +00:00
Guy Harris e83ce4b4ea We install the wrapper scripts for the command-line tools in
/usr/local/bin, not in /Library/Wireshark.

svn path=/trunk/; revision=52322
2013-10-01 21:41:54 +00:00
Gerald Combs 99f457bd03 Use separate "Read me first" files for Qt and GTK+.
svn path=/trunk/; revision=52321
2013-10-01 21:04:13 +00:00
Gerald Combs 2d1b16fb26 The Qt executables shouldn't need any wrappers. Just copy them over
as-is.

svn path=/trunk/; revision=52303
2013-09-30 17:33:59 +00:00
Gerald Combs 5687b33b4e Make sure we copy Wireshark's libraries to Frameworks. Use top_builddir
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-30 17:19:48 +00:00
Gerald Combs 097feb5a64 Be a little more verbose.
svn path=/trunk/; revision=52297
2013-09-30 15:37:11 +00:00
Gerald Combs 2211ab0fba Use macdeployqt to add the Qt bits to our bundle. Put our libraries in
Contents/Frameworks since that's what macdeployqt expects. Have
osx-dmg.sh look at the correct executable.

svn path=/trunk/; revision=52295
2013-09-30 13:12:28 +00:00
Gerald Combs 2468b33cce More Qt app bundle migration. Still doesn't work quite right.
svn path=/trunk/; revision=52293
2013-09-30 11:29:58 +00:00
Gerald Combs 0a75c9d872 Start migrating the OS X app bundle to Qt. This will likely break the
installers.

svn path=/trunk/; revision=52292
2013-09-30 10:20:43 +00:00
Gerald Combs 4ddecad2ba Have ChmodBPF kludge^Wcreate as many BPF devices as possible at startup.
The welcome screen in the Qt port runs "dumpcap -S" to draw sparklines.
On OS X this means that it holds open a BPF device for each interface.
Trying to capture using another instance of Wireshark (or tcpdump, or
tshark, or...) will trigger the creation of an additional BPF device but
we won't have permission to use it. Forcing device creation at startup
works around this.

svn path=/trunk/; revision=52227
2013-09-27 03:33:26 +00:00
Jeff Morriss c90d29c668 As pointed out by Kurt in http://ask.wireshark.org/questions/24886/error-failed-build-dependencies-while-making-rpm :
If we're not building with gtk3 we now need to add --with-gtk2 .

svn path=/trunk/; revision=52161
2013-09-20 20:52:04 +00:00
Chris Maynard 956844f335 Update a link.
svn path=/trunk/; revision=52026
2013-09-13 21:59:24 +00:00
Chris Maynard f13c30d2c4 Per http://nsis.sourceforge.net/Docs/Chapter4.html#4.2.4, we need to use $\n for a newline in strings. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9103.
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=51788
2013-09-05 17:51:17 +00:00
Gerald Combs 789a4060da Qt5 on Windows needs platforms/qwindows.dll as well.
svn path=/trunk/; revision=51609
2013-08-31 04:18:42 +00:00
Gerald Combs 36ff508507 Try to fix PortableApps packaging. Note that the Qt definitions should
be in config.nmake along with everything else.

svn path=/trunk/; revision=51598
2013-08-30 15:55:12 +00:00
Alexis La Goutte 256d290491 Try 2 to fix Portable App buildbot
svn path=/trunk/; revision=51595
2013-08-30 11:47:58 +00:00
Alexis La Goutte 84f2e7d221 Try to fix Portable App buildbot
svn path=/trunk/; revision=51594
2013-08-30 11:18:06 +00:00
Gerald Combs 2e857954a3 Fix NSIS packaging.
svn path=/trunk/; revision=51583
2013-08-30 00:43:51 +00:00
Gerald Combs 5ff688f8f7 Use oldiconutil (https://github.com/uliwitness/oldiconutil) to convert
our PNG-based icons to JPEG 2000. Hopefully fixes bug 8993.

svn path=/trunk/; revision=51523
2013-08-26 16:53:17 +00:00
Anders Broman 61d2e64163 Make it possible to add custom Diameter AVP .xml files and distribute them by adding the file name to separate files and leave the "normal" makefiles untouched.
svn path=/trunk/; revision=51457
2013-08-21 19:53:57 +00:00
Guy Harris 237c5a7b60 If we weren't started with special privileges, try to figure out if
we're running from inside an OS X app bundle and, if we are, save the
pathname of the top-level bundle directory and use it to get the
pathnames of global data files, plugins, and Python modules.

This obviates the need to set special environment variables for them in
the launcher scripts, so get rid of the commands to do that.

The @rpathification of binaries also obviates the need for the
commented-out setting of DYLD_LIBRARY_PATH, so get rid of that as well.

svn path=/trunk/; revision=51306
2013-08-12 00:59:34 +00:00
Guy Harris b8bc01c74f Set the minimum OS X version in the installer package based on the
deployment target; if --disable-osx-deploy-target was specified, set it
to the OS version on which we're building - minor/dot-dot version and
all - as there's no guarantee that it'll work on *any* version earlier
than that.

svn path=/trunk/; revision=51060
2013-07-31 07:39:11 +00:00
Jeff Morriss 35e220513c Make it easier to add custom (proprietary) Diameter XML files.
svn path=/trunk/; revision=50889
2013-07-25 15:40:39 +00:00
Pascal Quantin d64dbd371b From Anders: add Verizon Wireless dictionary
svn path=/trunk/; revision=50726
2013-07-18 09:27:10 +00:00
Guy Harris bc239a7286 On OS X, set the rpath for executables to include
@executable_path/../lib as well as /usr/local/lib, so we can use @rpath
in the install names in the executables and libraries in the application
bundle.

Have the osx-app.sh script tweak all references to libraries from
/usr/local/lib in all executables, libraries, and plugins in the app
bundle to use @rpath.  (The "all" is important; it fixes the GTK+ crash
mentioned in the comment in osx-app.sh.  The notion of doing all of them
came from the osx-app.sh script in a newer version of Inkscape.)

This renders the setting of DYLD_LIBRARY_PATH in the wrapper scripts in
the bundle unnecessary; remove it.  (Ideally, we should try to get rid
of the wrapper scripts entirely, but that might have to wait for us to
switch to using Qt.)

svn path=/trunk/; revision=50560
2013-07-13 22:43:35 +00:00
Guy Harris 94c182486c Suggest why the rpathification of the libraries might not be sufficient.
Don't rpathify system libraries.

Rpathify with @rpath, not @executable_path.

Use the right path for the binaries and libraries.

svn path=/trunk/; revision=50547
2013-07-13 01:16:14 +00:00
Guy Harris 519c5affa2 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).

svn path=/trunk/; revision=50410
2013-07-06 16:42:30 +00:00
Chris Maynard ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Gerald Combs 693bcb654c Have the NSIS installer run the existing uninstaller silently. This
should save a few mouse clicks during the installation process.

svn path=/trunk/; revision=49813
2013-06-06 19:04:46 +00:00
Gerald Combs 1a95757f46 I suspect "ie4uinit" got its name because "mysterious useful undocumented
system utility" would have been too obvious. Have UpdateIcons call
"ie4uinit -ClearIconCache" and move UpdateIcons to the "-{,Un.}Finally"
sections in the installer and uninstaller.

svn path=/trunk/; revision=49811
2013-06-06 18:46:37 +00:00
Gerald Combs 916c1c5c01 Add global profiles.
svn path=/trunk/; revision=49127
2013-05-01 23:17:30 +00:00
Gerald Combs a6cd9fdc44 Change the right title this time.
svn path=/trunk/; revision=49126
2013-05-01 22:22:10 +00:00