summaryrefslogtreecommitdiff
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2013-10-29Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,Gerald Combs2-3/+2
the PortableApps version relies on U3_-prefixed environment variables. svn path=/trunk/; revision=52941
2013-10-28Remove some (but not all) U3 remnants.Gerald Combs2-2/+3
svn path=/trunk/; revision=52935
2013-10-28Add some verbosity.Gerald Combs1-0/+2
svn path=/trunk/; revision=52929
2013-10-27Remove U3 code and packaging.Gerald Combs15-2091/+1
svn path=/trunk/; revision=52896
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-08Use a plain package name even if we're building with GTK3. HopefullyGerald Combs1-4/+0
we're beyond the "experimental" stage now. svn path=/trunk/; revision=52453
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
2013-09-30Start migrating the OS X app bundle to Qt. This will likely break theGerald Combs1-89/+149
installers. svn path=/trunk/; revision=52292
2013-09-27Have ChmodBPF kludge^Wcreate as many BPF devices as possible at startup.Gerald Combs1-5/+27
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-20As pointed out by Kurt in ↵Jeff Morriss1-0/+5
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-13Update a link.Chris Maynard1-1/+1
svn path=/trunk/; revision=52026
2013-09-05Per http://nsis.sourceforge.net/Docs/Chapter4.html#4.2.4, we need to use $\n ↵Chris Maynard1-1/+1
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-08-31Qt5 on Windows needs platforms/qwindows.dll as well.Gerald Combs2-4/+7
svn path=/trunk/; revision=51609
2013-08-30Try to fix PortableApps packaging. Note that the Qt definitions shouldGerald Combs4-19/+33
be in config.nmake along with everything else. svn path=/trunk/; revision=51598
2013-08-30Try 2 to fix Portable App buildbotAlexis La Goutte1-0/+5
svn path=/trunk/; revision=51595
2013-08-30Try to fix Portable App buildbotAlexis La Goutte1-0/+6
svn path=/trunk/; revision=51594
2013-08-30Fix NSIS packaging.Gerald Combs2-0/+12
svn path=/trunk/; revision=51583
2013-08-26Use oldiconutil (https://github.com/uliwitness/oldiconutil) to convertGerald Combs1-0/+0
our PNG-based icons to JPEG 2000. Hopefully fixes bug 8993. svn path=/trunk/; revision=51523
2013-08-21Make it possible to add custom Diameter AVP .xml files and distribute them ↵Anders Broman3-0/+6
by adding the file name to separate files and leave the "normal" makefiles untouched. svn path=/trunk/; revision=51457
2013-08-12If we weren't started with special privileges, try to figure out ifGuy Harris1-6/+0
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-07-31Set the minimum OS X version in the installer package based on theGuy Harris2-2/+2
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-25Make it easier to add custom (proprietary) Diameter XML files.Jeff Morriss1-2/+3
svn path=/trunk/; revision=50889
2013-07-18From Anders: add Verizon Wireless dictionaryPascal Quantin1-0/+1
svn path=/trunk/; revision=50726
2013-07-13On OS X, set the rpath for executables to includeGuy Harris2-42/+116
@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-13Suggest why the rpathification of the libraries might not be sufficient.Guy Harris1-30/+31
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-06Add a --enable-osx-deploy-target option to set the deployment targetGuy Harris1-1/+13
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-06-25makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.Chris Maynard4-42/+42
svn path=/trunk/; revision=50140
2013-06-06Have the NSIS installer run the existing uninstaller silently. ThisGerald Combs1-6/+0
should save a few mouse clicks during the installation process. svn path=/trunk/; revision=49813
2013-06-06I suspect "ie4uinit" got its name because "mysterious useful undocumentedGerald Combs3-3/+11
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-05-01Add global profiles.Gerald Combs1-0/+2
svn path=/trunk/; revision=49127
2013-05-01Change the right title this time.Gerald Combs2-2/+2
svn path=/trunk/; revision=49126
2013-05-01Use "Global" to match the other entries.Gerald Combs1-1/+1
svn path=/trunk/; revision=49125