From 4aa049019a4504e07e9cc4cc5fa6079bd8aa24e6 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 11 Mar 2016 13:45:54 -0800 Subject: OS X: Remove GTK+ packaging. Remove the GTK+-specific bits from packaging/macosx. Change-Id: I8f7d909f971e60723e421005fdf46de967c69533 Reviewed-on: https://code.wireshark.org/review/14431 Reviewed-by: Gerald Combs --- packaging/macosx/Makefile.am | 54 +- packaging/macosx/Read_me_first.rtf | 105 +++ packaging/macosx/Read_me_first_gtk.rtf | 106 --- packaging/macosx/Read_me_first_qt.rtf | 105 --- packaging/macosx/Resources/MenuBar.nib/classes.nib | 4 - packaging/macosx/Resources/MenuBar.nib/info.nib | 24 - packaging/macosx/Resources/MenuBar.nib/objects.xib | 74 -- .../Resources/ProgressWindow.nib/classes.nib | 4 - .../macosx/Resources/ProgressWindow.nib/info.nib | 19 - .../Resources/ProgressWindow.nib/objects.xib | 54 -- packaging/macosx/Resources/Wireshark.icns | Bin 1031753 -> 0 bytes packaging/macosx/Resources/Wiresharkdoc.icns | Bin 81772 -> 0 bytes packaging/macosx/Resources/bin/getdisplay.sh | 9 - packaging/macosx/Resources/bin/wireshark | 75 -- packaging/macosx/Resources/etc/fonts/fonts.conf | 155 ----- packaging/macosx/Resources/openDoc | 18 - packaging/macosx/Resources/script | 53 -- .../gtk-2.0/Scrollbars/stepper-down.png | Bin 469 -> 0 bytes .../gtk-2.0/Scrollbars/stepper-left.png | Bin 1041 -> 0 bytes .../gtk-2.0/Scrollbars/stepper-right.png | Bin 1041 -> 0 bytes .../gtk-2.0/Scrollbars/stepper-up.png | Bin 467 -> 0 bytes .../gtk-2.0/Scrollbars/trough-scrollbar-horiz.png | Bin 1250 -> 0 bytes .../gtk-2.0/Scrollbars/trough-scrollbar-vert.png | Bin 1218 -> 0 bytes .../gtk-2.0/Scrollbars_1/copy-slider.sh | 7 - .../gtk-2.0/Scrollbars_1/slider-horiz-prelight.png | Bin 6157 -> 0 bytes .../gtk-2.0/Scrollbars_1/slider-horiz.png | Bin 6157 -> 0 bytes .../gtk-2.0/Scrollbars_1/slider-vert-prelight.png | Bin 5412 -> 0 bytes .../gtk-2.0/Scrollbars_1/slider-vert.png | Bin 5412 -> 0 bytes .../gtk-2.0/Scrollbars_6/copy-slider.sh | 7 - .../gtk-2.0/Scrollbars_6/slider-horiz-prelight.png | Bin 6111 -> 0 bytes .../gtk-2.0/Scrollbars_6/slider-horiz.png | Bin 6111 -> 0 bytes .../gtk-2.0/Scrollbars_6/slider-vert-prelight.png | Bin 5425 -> 0 bytes .../gtk-2.0/Scrollbars_6/slider-vert.png | Bin 5425 -> 0 bytes .../Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc | 502 ------------- .../Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc | 527 -------------- .../gtk-2.0/sync_osx_look.sh | 38 - .../ScriptExec/English.lproj/InfoPlist.strings | Bin 520 -> 0 bytes .../ScriptExec/English.lproj/main.nib/classes.nib | 4 - .../ScriptExec/English.lproj/main.nib/info.nib | 20 - .../ScriptExec/English.lproj/main.nib/objects.xib | 272 -------- packaging/macosx/ScriptExec/Info.plist | 40 -- .../macosx/ScriptExec/MenuBar.nib/classes.nib | 4 - packaging/macosx/ScriptExec/MenuBar.nib/info.nib | 24 - .../macosx/ScriptExec/MenuBar.nib/objects.xib | 74 -- .../ScriptExec/ScriptExec.xcode/project.pbxproj | 451 ------------ .../ScriptExec.xcodeproj/project.pbxproj | 347 --------- packaging/macosx/ScriptExec/ScriptExec_Prefix.pch | 5 - packaging/macosx/ScriptExec/main.c | 775 --------------------- packaging/macosx/ScriptExec/openDoc | 4 - packaging/macosx/ScriptExec/script | 4 - packaging/macosx/ScriptExec/version.plist | 17 - packaging/macosx/Wireshark.icns | Bin 0 -> 1031753 bytes packaging/macosx/Wiresharkdoc.icns | Bin 0 -> 81772 bytes packaging/macosx/osx-app.sh | 280 ++------ packaging/macosx/osx-dmg.sh.in | 24 +- 55 files changed, 151 insertions(+), 4134 deletions(-) create mode 100644 packaging/macosx/Read_me_first.rtf delete mode 100644 packaging/macosx/Read_me_first_gtk.rtf delete mode 100644 packaging/macosx/Read_me_first_qt.rtf delete mode 100644 packaging/macosx/Resources/MenuBar.nib/classes.nib delete mode 100644 packaging/macosx/Resources/MenuBar.nib/info.nib delete mode 100644 packaging/macosx/Resources/MenuBar.nib/objects.xib delete mode 100644 packaging/macosx/Resources/ProgressWindow.nib/classes.nib delete mode 100644 packaging/macosx/Resources/ProgressWindow.nib/info.nib delete mode 100644 packaging/macosx/Resources/ProgressWindow.nib/objects.xib delete mode 100644 packaging/macosx/Resources/Wireshark.icns delete mode 100644 packaging/macosx/Resources/Wiresharkdoc.icns delete mode 100755 packaging/macosx/Resources/bin/getdisplay.sh delete mode 100755 packaging/macosx/Resources/bin/wireshark delete mode 100644 packaging/macosx/Resources/etc/fonts/fonts.conf delete mode 100755 packaging/macosx/Resources/openDoc delete mode 100755 packaging/macosx/Resources/script delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png delete mode 100755 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png delete mode 100755 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc delete mode 100644 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc delete mode 100755 packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh delete mode 100644 packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings delete mode 100644 packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib delete mode 100644 packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib delete mode 100644 packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib delete mode 100644 packaging/macosx/ScriptExec/Info.plist delete mode 100644 packaging/macosx/ScriptExec/MenuBar.nib/classes.nib delete mode 100644 packaging/macosx/ScriptExec/MenuBar.nib/info.nib delete mode 100644 packaging/macosx/ScriptExec/MenuBar.nib/objects.xib delete mode 100644 packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj delete mode 100644 packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj delete mode 100644 packaging/macosx/ScriptExec/ScriptExec_Prefix.pch delete mode 100644 packaging/macosx/ScriptExec/main.c delete mode 100755 packaging/macosx/ScriptExec/openDoc delete mode 100755 packaging/macosx/ScriptExec/script delete mode 100644 packaging/macosx/ScriptExec/version.plist create mode 100644 packaging/macosx/Wireshark.icns create mode 100644 packaging/macosx/Wiresharkdoc.icns (limited to 'packaging') diff --git a/packaging/macosx/Makefile.am b/packaging/macosx/Makefile.am index 686bcd8e86..b841a6d2d2 100644 --- a/packaging/macosx/Makefile.am +++ b/packaging/macosx/Makefile.am @@ -23,55 +23,7 @@ EXTRA_DIST = \ Info.plist.in \ osx-app.sh \ osx-dmg.sh.in \ - Read_me_first_gtk.rtf \ - Read_me_first_qt.rtf \ - Resources/bin/getdisplay.sh \ - Resources/bin/wireshark \ - Resources/etc/fonts/fonts.conf \ - Resources/MenuBar.nib/classes.nib \ - Resources/MenuBar.nib/info.nib \ - Resources/MenuBar.nib/objects.xib \ - Resources/openDoc \ - Resources/ProgressWindow.nib/classes.nib \ - Resources/ProgressWindow.nib/info.nib \ - Resources/ProgressWindow.nib/objects.xib \ - Resources/script \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png \ - Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh \ - Resources/Wireshark.icns \ - Resources/Wiresharkdoc.icns \ - ScriptExec/English.lproj/InfoPlist.strings \ - ScriptExec/English.lproj/main.nib/classes.nib \ - ScriptExec/English.lproj/main.nib/info.nib \ - ScriptExec/English.lproj/main.nib/objects.xib \ - ScriptExec/Info.plist \ - ScriptExec/main.c \ - ScriptExec/MenuBar.nib/classes.nib \ - ScriptExec/MenuBar.nib/info.nib \ - ScriptExec/MenuBar.nib/objects.xib \ - ScriptExec/openDoc \ - ScriptExec/script \ - ScriptExec/ScriptExec.xcode/project.pbxproj \ - ScriptExec/ScriptExec.xcodeproj/project.pbxproj \ - ScriptExec/ScriptExec_Prefix.pch \ - ScriptExec/version.plist \ + Read_me_first.rtf \ Scripts/chmodbpf-postinstall.sh \ Scripts/cli-preinstall.sh \ Scripts/cli-postinstall.sh \ @@ -79,6 +31,8 @@ EXTRA_DIST = \ utility-launcher \ root.ds_store \ util.ds_store \ + Wireshark.icns \ + Wiresharkdoc.icns \ Wireshark_package.pmdoc/01wireshark-contents.xml \ Wireshark_package.pmdoc/01wireshark.xml \ Wireshark_package.pmdoc/02chmodbpf-contents.xml \ @@ -96,5 +50,5 @@ all: COPYING.txt install: all clean-local: - rm -rf Utilities Wireshark.app ScriptExec/build COPYING.txt \ + rm -rf Utilities Wireshark.app COPYING.txt \ *.dmg *.pkg diff --git a/packaging/macosx/Read_me_first.rtf b/packaging/macosx/Read_me_first.rtf new file mode 100644 index 0000000000..391784452f --- /dev/null +++ b/packaging/macosx/Read_me_first.rtf @@ -0,0 +1,105 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400 +\cocoascreenfonts1{\fonttbl\f0\froman\fcharset0 TimesNewRomanPSMT;\f1\fswiss\fcharset0 Helvetica;\f2\fnil\fcharset0 Menlo-Regular; +} +{\colortbl;\red255\green255\blue255;} +{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid1\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid1} +{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2} +{\list\listtemplateid3\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid201\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid3} +{\list\listtemplateid4\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid301\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid4}} +{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}} +\margl1440\margr1440\vieww13060\viewh12960\viewkind0 +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\f0\b\fs28 \cf0 Before You Begin\ +\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\f1\b0\fs24 \cf0 This release of Wireshark requires Macintosh OS X 10.5.5 or later. If you are running OS X 10.5.4 or older you can install using another packaging system such as MacPorts or Homebrew. +\f0\b\fs28 \ +\ +Quick Setup\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\b0\fs24 \cf0 \ +\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural +\ls1\ilvl0 +\f1 \cf0 Simply double-click the Wireshark package. For details about the installation read below.\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural +\cf0 \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\f0\b\fs28 \cf0 What changes does the installer make?\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\b0\fs24 \cf0 \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\f1 \cf0 The installer writes to the following locations:\ +\ +\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural +\ls2\ilvl0\cf0 {\listtext \'95 } +\i /Applications/Wireshark.app +\i0 . The main Wireshark application.\ +{\listtext \'95 } +\i /Library/LaunchDaemons/org.wireshark.ChmodBPF.plist +\i0 . A launch daemon that adjusts permissions on the system's packet capture devices ( +\i /dev/bpf +\i0 *) when the system starts up.\ +{\listtext \'95 } +\i /Library/Application Support/Wireshark/ChmodBPF +\i0 A copy of the launch daemon property list, and the script that the launch daemon runs.\ +{\listtext \'95 } +\i /usr/local/bin +\i0 . A wrapper script and symbolic links which will let you run Wireshark and its associated utilities from the command line. You can access them directly or by adding /usr/local/bin to your PATH if it's not already in your PATH.\ +\pard\tx560\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural +\cf0 \ +Additionally a group named +\i access_bpf +\i0 is created. The user who opened the package is added to the group.\ +\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\f0\b\fs28 \cf0 How do I uninstall?\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\b0\fs24 \cf0 \ +\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural +\ls3\ilvl0 +\f1 \cf0 {\listtext 1. }Remove +\i /Applications/Wireshark.app +\i0 \ +{\listtext 2. }Remove +\i /Library/Application Support/Wireshark +\i0 \ +{\listtext 3. }Remove the wrapper scripts from +\i /usr/local/bin +\i0 \ +{\listtext 4. }Unload the +\i org.wireshark.ChmodBPF.plist +\i0 launchd job\ +{\listtext 5. }Remove +\i /Library/LaunchDaemons/org.wireshark.ChmodBPF.plist +\i0 \ +{\listtext 6. }Remove the +\i access_bpf +\i0 group.\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\f0\b\fs28 \cf0 \ +How does the wrapper script work? What if I move Wireshark.app?\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\b0\fs24 \cf0 \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\f1 \cf0 The script should find the Wireshark application bundle and run the appropriate executable automatically. It looks for Wireshark.app in the following locations:\ +\ +\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural +\ls4\ilvl0\cf0 {\listtext \'95 }The path set in the WIRESHARK_APP_DIR environment variable\ +{\listtext \'95 }/Applications/Wireshark.app\ +{\listtext \'95 }The first path returned by +\f2 mdfind "kMDItemCFBundleIdentifier == 'org.wireshark.Wireshark'" +\f1 \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural +\cf0 \ +If you move Wireshark.app the script should automatically find it. If it doesn't you will have to set WIRESHARK_APP_DIR to the path to (and including) Wireshark.app. Automatic discovery might fail if you have multiple copies of Wireshark installed on your system or if Spotlight indexing isn't working properly.} \ No newline at end of file diff --git a/packaging/macosx/Read_me_first_gtk.rtf b/packaging/macosx/Read_me_first_gtk.rtf deleted file mode 100644 index 73503c9524..0000000000 --- a/packaging/macosx/Read_me_first_gtk.rtf +++ /dev/null @@ -1,106 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400 -\cocoascreenfonts1{\fonttbl\f0\froman\fcharset0 TimesNewRomanPSMT;\f1\fswiss\fcharset0 Helvetica;\f2\fnil\fcharset0 Menlo-Regular; -} -{\colortbl;\red255\green255\blue255;} -{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid1\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid1} -{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2} -{\list\listtemplateid3\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid201\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid3} -{\list\listtemplateid4\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid301\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid4}} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}} -\margl1440\margr1440\vieww13060\viewh12960\viewkind0 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f0\b\fs28 \cf0 Before You Begin\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f1\b0\fs24 \cf0 This release of Wireshark requires Macintosh OS X 10.5.5 or later, including X11.app. If you are running OS X 10.5.4 or older you can install using another packaging system such as MacPorts or Homebrew. -\f0\b\fs28 \ -\ -Quick Setup\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\b0\fs24 \cf0 \ -\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural -\ls1\ilvl0 -\f1 \cf0 Simply double-click the Wireshark package. For details about the installation read below.\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f0\b\fs28 \cf0 What changes does the installer make?\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\b0\fs24 \cf0 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f1 \cf0 The installer writes to the following locations:\ -\ -\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural -\ls2\ilvl0\cf0 {\listtext \'95 } -\i /Applications/Wireshark.app -\i0 . The main Wireshark application.\ -{\listtext \'95 } -\i /Library/LaunchDaemons/org.wireshark.ChmodBPF.plist -\i0 . A launch daemon that adjusts permissions on the system's packet capture devices ( -\i /dev/bpf -\i0 *) when the system starts up.\ -{\listtext \'95 } -\i /Library/Application Support/Wireshark/ChmodBPF -\i0 A copy of the launch daemon property list, and the script that the launch daemon runs.\ -{\listtext \'95 } -\i /usr/local/bin -\i0 . A wrapper script and symbolic links which will let you run Wireshark and its associated utilities from the command line. You can access them directly or by adding /usr/local/bin to your PATH if it's not already in your PATH.\ -\pard\tx560\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 \ -Additionally a group named -\i access_bpf -\i0 is created. The user who opened the package is added to the group.\ -\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f0\b\fs28 \cf0 How do I uninstall?\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\b0\fs24 \cf0 \ -\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural -\ls3\ilvl0 -\f1 \cf0 {\listtext 1. }Remove -\i /Applications/Wireshark.app -\i0 \ -{\listtext 2. }Remove -\i /Library/Application Support/Wireshark -\i0 \ -{\listtext 3. }Remove the wrapper scripts from -\i /usr/local/bin\ -\ls3\ilvl0 -\i0 {\listtext 4. }Unload the -\i org.wireshark.ChmodBPF.plist -\i0 launchd job\ -{\listtext 5. }Remove -\i /Library/LaunchDaemons/org.wireshark.ChmodBPF.plist -\i0 \ -{\listtext 6. }Remove the -\i access_bpf -\i0 group.\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f0\b\fs28 \cf0 \ -How does the wrapper script work? What if I move Wireshark.app?\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\b0\fs24 \cf0 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f1 \cf0 The script should find the Wireshark application bundle and run the appropriate executable automatically. It looks for Wireshark.app in the following locations:\ -\ -\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural -\ls4\ilvl0\cf0 {\listtext \'95 }The path set in the WIRESHARK_APP_DIR environment variable\ -{\listtext \'95 }/Applications/Wireshark.app\ -{\listtext \'95 }The first path returned by -\f2 mdfind "kMDItemCFBundleIdentifier == 'org.wireshark.Wireshark'" -\f1 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 \ -If you move Wireshark.app the script should automatically find it. If it doesn't you will have to set WIRESHARK_APP_DIR to the path to (and including) Wireshark.app. Automatic discovery might fail if you have multiple copies of Wireshark installed on your system or if Spotlight indexing isn't working properly.} \ No newline at end of file diff --git a/packaging/macosx/Read_me_first_qt.rtf b/packaging/macosx/Read_me_first_qt.rtf deleted file mode 100644 index 391784452f..0000000000 --- a/packaging/macosx/Read_me_first_qt.rtf +++ /dev/null @@ -1,105 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400 -\cocoascreenfonts1{\fonttbl\f0\froman\fcharset0 TimesNewRomanPSMT;\f1\fswiss\fcharset0 Helvetica;\f2\fnil\fcharset0 Menlo-Regular; -} -{\colortbl;\red255\green255\blue255;} -{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid1\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid1} -{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2} -{\list\listtemplateid3\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid201\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid3} -{\list\listtemplateid4\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid301\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid4}} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}} -\margl1440\margr1440\vieww13060\viewh12960\viewkind0 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f0\b\fs28 \cf0 Before You Begin\ -\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f1\b0\fs24 \cf0 This release of Wireshark requires Macintosh OS X 10.5.5 or later. If you are running OS X 10.5.4 or older you can install using another packaging system such as MacPorts or Homebrew. -\f0\b\fs28 \ -\ -Quick Setup\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\b0\fs24 \cf0 \ -\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural -\ls1\ilvl0 -\f1 \cf0 Simply double-click the Wireshark package. For details about the installation read below.\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f0\b\fs28 \cf0 What changes does the installer make?\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\b0\fs24 \cf0 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f1 \cf0 The installer writes to the following locations:\ -\ -\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural -\ls2\ilvl0\cf0 {\listtext \'95 } -\i /Applications/Wireshark.app -\i0 . The main Wireshark application.\ -{\listtext \'95 } -\i /Library/LaunchDaemons/org.wireshark.ChmodBPF.plist -\i0 . A launch daemon that adjusts permissions on the system's packet capture devices ( -\i /dev/bpf -\i0 *) when the system starts up.\ -{\listtext \'95 } -\i /Library/Application Support/Wireshark/ChmodBPF -\i0 A copy of the launch daemon property list, and the script that the launch daemon runs.\ -{\listtext \'95 } -\i /usr/local/bin -\i0 . A wrapper script and symbolic links which will let you run Wireshark and its associated utilities from the command line. You can access them directly or by adding /usr/local/bin to your PATH if it's not already in your PATH.\ -\pard\tx560\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 \ -Additionally a group named -\i access_bpf -\i0 is created. The user who opened the package is added to the group.\ -\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f0\b\fs28 \cf0 How do I uninstall?\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\b0\fs24 \cf0 \ -\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural -\ls3\ilvl0 -\f1 \cf0 {\listtext 1. }Remove -\i /Applications/Wireshark.app -\i0 \ -{\listtext 2. }Remove -\i /Library/Application Support/Wireshark -\i0 \ -{\listtext 3. }Remove the wrapper scripts from -\i /usr/local/bin -\i0 \ -{\listtext 4. }Unload the -\i org.wireshark.ChmodBPF.plist -\i0 launchd job\ -{\listtext 5. }Remove -\i /Library/LaunchDaemons/org.wireshark.ChmodBPF.plist -\i0 \ -{\listtext 6. }Remove the -\i access_bpf -\i0 group.\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f0\b\fs28 \cf0 \ -How does the wrapper script work? What if I move Wireshark.app?\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\b0\fs24 \cf0 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural - -\f1 \cf0 The script should find the Wireshark application bundle and run the appropriate executable automatically. It looks for Wireshark.app in the following locations:\ -\ -\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural -\ls4\ilvl0\cf0 {\listtext \'95 }The path set in the WIRESHARK_APP_DIR environment variable\ -{\listtext \'95 }/Applications/Wireshark.app\ -{\listtext \'95 }The first path returned by -\f2 mdfind "kMDItemCFBundleIdentifier == 'org.wireshark.Wireshark'" -\f1 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 \ -If you move Wireshark.app the script should automatically find it. If it doesn't you will have to set WIRESHARK_APP_DIR to the path to (and including) Wireshark.app. Automatic discovery might fail if you have multiple copies of Wireshark installed on your system or if Spotlight indexing isn't working properly.} \ No newline at end of file diff --git a/packaging/macosx/Resources/MenuBar.nib/classes.nib b/packaging/macosx/Resources/MenuBar.nib/classes.nib deleted file mode 100644 index ea58db1189..0000000000 --- a/packaging/macosx/Resources/MenuBar.nib/classes.nib +++ /dev/null @@ -1,4 +0,0 @@ -{ -IBClasses = (); -IBVersion = 1; -} diff --git a/packaging/macosx/Resources/MenuBar.nib/info.nib b/packaging/macosx/Resources/MenuBar.nib/info.nib deleted file mode 100644 index 4c42cc89b3..0000000000 --- a/packaging/macosx/Resources/MenuBar.nib/info.nib +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - IBDocumentLocation - 99 362 356 240 0 0 1280 832 - IBEditorPositions - - 187 - 340 374 240 44 0 0 1280 832 - - IBFramework Version - 349.0 - IBOpenObjects - - 187 - - IBSystem Version - 7F44 - targetFramework - IBCarbonFramework - - diff --git a/packaging/macosx/Resources/MenuBar.nib/objects.xib b/packaging/macosx/Resources/MenuBar.nib/objects.xib deleted file mode 100644 index 2f61c2e1ee..0000000000 --- a/packaging/macosx/Resources/MenuBar.nib/objects.xib +++ /dev/null @@ -1,74 +0,0 @@ - - - - IBCarbonFramework - - NSApplication - - - - MenuBar - - - ScriptExec - - ScriptExec - _NSAppleMenu - - - - _NSMainMenu - - - - - Window - - Window - - - TRUE - Minimize Window - m - mini - - - TRUE - Minimize All Windows - m - 1572864 - mini - - - TRUE - - - TRUE - Bring All to Front - frnt - - - TRUE - Bring in Front - 1572864 - frnt - - - _NSWindowsMenu - - - - - - - - - - - File's Owner - - MenuBar - - - 206 - diff --git a/packaging/macosx/Resources/ProgressWindow.nib/classes.nib b/packaging/macosx/Resources/ProgressWindow.nib/classes.nib deleted file mode 100644 index ea58db1189..0000000000 --- a/packaging/macosx/Resources/ProgressWindow.nib/classes.nib +++ /dev/null @@ -1,4 +0,0 @@ -{ -IBClasses = (); -IBVersion = 1; -} diff --git a/packaging/macosx/Resources/ProgressWindow.nib/info.nib b/packaging/macosx/Resources/ProgressWindow.nib/info.nib deleted file mode 100644 index 94a06b09bc..0000000000 --- a/packaging/macosx/Resources/ProgressWindow.nib/info.nib +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - IBDocumentLocation - 124 298 356 240 0 0 1280 832 - IBFramework Version - 349.0 - IBOpenObjects - - 180 - - IBSystem Version - 7F44 - targetFramework - IBCarbonFramework - - diff --git a/packaging/macosx/Resources/ProgressWindow.nib/objects.xib b/packaging/macosx/Resources/ProgressWindow.nib/objects.xib deleted file mode 100644 index a1ad8952c4..0000000000 --- a/packaging/macosx/Resources/ProgressWindow.nib/objects.xib +++ /dev/null @@ -1,54 +0,0 @@ - - - - IBCarbonFramework - - NSApplication - - - - 404 523 457 899 - Caching Fonts... - - 0 0 53 376 - - - 19 17 32 270 - TRUE - 1 - 50 - - - 16 284 34 356 - TRUE - 1 - Cancel - quit - - - - FALSE - FALSE - FALSE - FALSE - 51 - 1 - - - - - - - - - - - - - File's Owner - - Window - - - 186 - diff --git a/packaging/macosx/Resources/Wireshark.icns b/packaging/macosx/Resources/Wireshark.icns deleted file mode 100644 index 21dcd6c0a1..0000000000 Binary files a/packaging/macosx/Resources/Wireshark.icns and /dev/null differ diff --git a/packaging/macosx/Resources/Wiresharkdoc.icns b/packaging/macosx/Resources/Wiresharkdoc.icns deleted file mode 100644 index fb66002996..0000000000 Binary files a/packaging/macosx/Resources/Wiresharkdoc.icns and /dev/null differ diff --git a/packaging/macosx/Resources/bin/getdisplay.sh b/packaging/macosx/Resources/bin/getdisplay.sh deleted file mode 100755 index f7f3833487..0000000000 --- a/packaging/macosx/Resources/bin/getdisplay.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# Author: Aaron Voisine - -if [ "$DISPLAY"x == "x" ]; then - echo :0 > /tmp/display.$UID -else - echo $DISPLAY > /tmp/display.$UID -fi diff --git a/packaging/macosx/Resources/bin/wireshark b/packaging/macosx/Resources/bin/wireshark deleted file mode 100755 index 5279a1e92c..0000000000 --- a/packaging/macosx/Resources/bin/wireshark +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# -# Author: Aaron Voisine -# Wireshark Modifications: -# Michael Wybrow -# Jean-Olivier Irisson -# - -CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo $PWD)`" -# e.g. /Applications/Wireshark.app/Contents/Resources/bin -TOP="`dirname \"$CWD\"`" -# e.g. /Applications/Wireshark.app/Contents/Resources - -# We might be exec'ed from wireshark, tshark, dumpcap, or any other binary -# from the Wireshark distribution. -# XXX - Should we verify that we have a valid name? -APPNAME=`basename "$0"` - -# Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. -# People should really use ~/.macosx/environment.plist to set environment variables as explained by Apple: -# http://developer.apple.com/qa/qa2001/qa1067.html -# but since no one does, we correct this by making the 'classic' PATH additions here: -# /usr/local/bin which, though standard, doesn't seem to be in the PATH -# newer python as recommended by MacPython http://www.python.org/download/mac/ -# Fink -# MacPorts (former DarwinPorts) -export PATH="/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:$CWD:$PATH" - -if [ "$APPNAME" == "wireshark" ] ; then # Apply GUI settings - # For Panther and Tiger, override the default fontconfig configuration - # XXX - This apparently isn't needed? - #if [[ $VERSION -le 4 ]]; then - export FONTCONFIG_PATH="$TOP/etc/fonts" - #fi - export PANGO_RC_FILE="$HOME/.wireshark-etc/pangorc" - export GTK_IM_MODULE_FILE="$HOME/.wireshark-etc/gtk.immodules" - export GDK_PIXBUF_MODULE_FILE="$HOME/.wireshark-etc/gdk-pixbuf.loaders" - export GTK_DATA_PREFIX="$TOP" - export GTK_EXE_PREFIX="$TOP" - export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" - export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" - - # Set GTK theme (only if there is no .gtkrc-2.0 in the user's home) - if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then - # prepare the theme depending on OS X appearance settings - ( - cd "$TOP/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/" - ./sync_osx_look.sh - # TODO: make this more robust, probably by integrating this script directly inline here - ) - export GTK2_RC_FILES="$TOP/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc" - fi - - # TODO: Have to add ".UTF-8" to the LANG since ommiting causes Wireshark - # to crash on startup in locale_from_utf8(). - export LANG="`grep \"\`defaults read .GlobalPreferences AppleCollationOrder \ - 2>&1\`_\" /usr/share/locale/locale.alias | tail -n1 | sed 's/\./ /' | \ - awk '{print $2}'`.UTF-8" - - # Handle the case where the directory storing Wireshark has a '#' in the name. - # This '#' needs to be escaped in pango.modules for Pango to work properly. - ESCAPEDTOP=`echo $TOP | sed 's/#/\\\\\\\\#/'` - - mkdir -p "${HOME}/.wireshark-etc" - sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.wireshark-etc/pangorc" - sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ - > "${HOME}/.wireshark-etc/pango.modules" - cp -f "$TOP/etc/pango/pangox.aliases" "${HOME}/.wireshark-etc/" - sed 's|${CWD}|'"$TOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \ - > "${HOME}/.wireshark-etc/gtk.immodules" - sed 's|${CWD}|'"$TOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \ - > "${HOME}/.wireshark-etc/gdk-pixbuf.loaders" -fi - -exec "$CWD/$APPNAME-bin" "$@" diff --git a/packaging/macosx/Resources/etc/fonts/fonts.conf b/packaging/macosx/Resources/etc/fonts/fonts.conf deleted file mode 100644 index 04b7ec75fa..0000000000 --- a/packaging/macosx/Resources/etc/fonts/fonts.conf +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - /Library/Fonts - /Network/Library/Fonts - /System/Library/Fonts - /usr/X11R6/lib/X11/fonts - /usr/share/fonts - /var/root/Library/Fonts - ~/.fonts - ~/Library/Fonts - - - - ~/.fontconfig - - - - - mono - - - monospace - - - - - - - sans serif - - - sans-serif - - - - - - - sans - - - sans-serif - - - - - conf.d - - - - - 0x0020 - 0x00A0 - 0x00AD - 0x034F - 0x0600 - 0x0601 - 0x0602 - 0x0603 - 0x06DD - 0x070F - 0x115F - 0x1160 - 0x1680 - 0x17B4 - 0x17B5 - 0x180E - 0x2000 - 0x2001 - 0x2002 - 0x2003 - 0x2004 - 0x2005 - 0x2006 - 0x2007 - 0x2008 - 0x2009 - 0x200A - 0x200B - 0x200C - 0x200D - 0x200E - 0x200F - 0x2028 - 0x2029 - 0x202A - 0x202B - 0x202C - 0x202D - 0x202E - 0x202F - 0x205F - 0x2060 - 0x2061 - 0x2062 - 0x2063 - 0x206A - 0x206B - 0x206C - 0x206D - 0x206E - 0x206F - 0x3000 - 0x3164 - 0xFEFF - 0xFFA0 - 0xFFF9 - 0xFFFA - 0xFFFB - - - - 30 - - - - diff --git a/packaging/macosx/Resources/openDoc b/packaging/macosx/Resources/openDoc deleted file mode 100755 index 547889723b..0000000000 --- a/packaging/macosx/Resources/openDoc +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# Author: Aaron Voisine -# Inkscape Modifications: Michael Wybrow - -CWD="`dirname \"$0\"`" - -# System version: 3 for Panther, 4 for Tiger, 5 for Leopard -export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` - -if [[ $VERSION -le 4 ]]; then - export "DISPLAY=`cat /tmp/display.$UID`" -fi - -BASE="`echo "$0" | sed -e 's/\/[A-Za-z]*.app\/Contents\/Resources\/openDoc/\//'`" -cd "$BASE" -exec "$CWD/bin/wireshark" "$@" - diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script deleted file mode 100755 index ff35f1a76a..0000000000 --- a/packaging/macosx/Resources/script +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -# Author: Aaron Voisine -# Wireshark (Inkscape) Modifications: Michael Wybrow - -CWD="`dirname \"$0\"`" - -# System version: 3 for Panther, 4 for Tiger, 5 for Leopard -export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` - -# On Leopard, X11.app is installed by default, and will be started -# automatically via launchd. On older systems, we need to start -# X11 ourself. - -# For Panther and Tiger, start X11 -if [[ $VERSION -le 4 ]]; then - # FIXME apparently this removes the xterm that starts with X - # from xinitrc but when is it really used? Should we modify - # the .xinitrc of the user without warning? - ps -wx -ocommand | grep -e '[X]11' > /dev/null - if [ "$?" != "0" -a ! -f "${HOME}/.xinitrc" ]; then - echo "rm -f \"${HOME}/.xinitrc\"" > "${HOME}/.xinitrc" - sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> "${HOME}/.xinitrc" - fi - - # Start X11 and get DISPLAY - cp -f "$CWD/bin/getdisplay.sh" /tmp/ - rm -f /tmp/display.$UID - open-x11 /tmp/getdisplay.sh || \ - open -a XDarwin /tmp/getdisplay.sh || \ - echo ":0" > /tmp/display.$UID - - while [ "$?" == "0" -a ! -f /tmp/display.$UID ]; do - sleep 1 - done - export DISPLAY="`cat /tmp/display.$UID`" - - ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11 -fi - - -# Warn the user about time-consuming generation of fontconfig caches. -test -f "${HOME}/.wireshark/.fccache-new" || exit 12 - - -BASE="`echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//'`" -cd "$BASE" -exec "$CWD/bin/wireshark" "$@" -# TODO examine wether it would be wisest to move the code from wireshark shell -# script and getdisplay.sh to here and only keep the real binary in bin. This -# may make things easier on Leopard and may also help using Wireshark on the -# command line - diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png deleted file mode 100644 index 336ff0efd1..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png deleted file mode 100644 index 14f0b88448..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png deleted file mode 100644 index 16feb73482..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png deleted file mode 100644 index 33825ef779..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png deleted file mode 100644 index 4e2954acad..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png deleted file mode 100644 index 6d544c8a76..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh deleted file mode 100755 index 12f8520f60..0000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# -cp -f slider-vert.png slider-vert-prelight.png -cp -f slider-vert.png slider-horiz-prelight.png -cp -f slider-vert.png slider-horiz.png -convert -rotate 90 slider-horiz.png slider-horiz.png -convert -rotate 90 slider-horiz-prelight.png slider-horiz-prelight.png diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png deleted file mode 100644 index 38cc4b87eb..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png deleted file mode 100644 index 38cc4b87eb..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png deleted file mode 100644 index d25f98e8f3..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png deleted file mode 100644 index d25f98e8f3..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh deleted file mode 100755 index 12f8520f60..0000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# -cp -f slider-vert.png slider-vert-prelight.png -cp -f slider-vert.png slider-horiz-prelight.png -cp -f slider-vert.png slider-horiz.png -convert -rotate 90 slider-horiz.png slider-horiz.png -convert -rotate 90 slider-horiz-prelight.png slider-horiz-prelight.png diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png deleted file mode 100644 index b48d039497..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png deleted file mode 100644 index b48d039497..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png deleted file mode 100644 index 253b9bfc82..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png deleted file mode 100644 index 253b9bfc82..0000000000 Binary files a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png and /dev/null differ diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc deleted file mode 100644 index 28321bbc65..0000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc +++ /dev/null @@ -1,502 +0,0 @@ -# -# GTK theme to be used on Mac OS X, to mimic the appearance of Tiger -# -# Heavily based on Clearlooks-Quicksilver -# Scrollbars from OSX-theme by Lauri Taimila (lauri@taimila.com) -# -# (c) 2007 JiHO . -# GNU General Public License http://www.gnu.org/copyleft/gpl.html -# - -style "clearlooks-default" -{ - GtkButton ::default_border = { 0, 0, 0, 0 } - GtkRange ::trough_border = 0 - GtkPaned ::handle_size = 6 - GtkRange ::slider_width = 15 - GtkRange ::stepper_size = 15 - GtkScrollbar ::min_slider_length = 30 - GtkCheckButton ::indicator_size = 12 - GtkMenuBar ::internal-padding = 0 - GtkTreeView ::expander_size = 14 - GtkExpander ::expander_size = 16 - - xthickness = 1 - ythickness = 1 - - fg[NORMAL] = "#000000" # black - fg[PRELIGHT] = "#000000" # black - fg[SELECTED] = "#ffffff" # white - fg[ACTIVE] = "#000000" # black - fg[INSENSITIVE] = {0.6, 0.6, 0.6} # dark gray - - bg[NORMAL] = {0.95, 0.95, 0.95} # very light gray - bg[PRELIGHT] = "#ffffff" # white - bg[SELECTED] = "#4a76cd" # menu color - bg[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray - bg[ACTIVE] = {0.85, 0.85, 0.85} # gray - - base[NORMAL] = "#ffffff" # white - base[PRELIGHT] = "#4a76cd" # menu color - base[ACTIVE] = {0.6, 0.6, 0.6} # dark gray - base[SELECTED] = {0.709800,0.835300,1.000000} # highlight color - base[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray - - text[NORMAL] = "#000000" # black - text[PRELIGHT] = "#000000" # black - text[ACTIVE] = "#ffffff" # white - text[SELECTED] = "#ffffff" # white - text[INSENSITIVE] = {0.6, 0.6, 0.6} # dark gray - - engine "clearlooks" - { - menubarstyle = 1 # 0 = flat, 1 = sunken, 2 = flat gradient - menuitemstyle = 0 # 0 = flat, 1 = 3d-ish (gradient), 2 = 3d-ish (button) - listviewitemstyle = 0 # 0 = flat, 1 = 3d-ish (gradient) - progressbarstyle = 0 # 0 = candy bar, 1 = flat - } -} - -style "clearlooks-wide" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 2 -} - -style "clearlooks-button" = "clearlooks-default" -{ - xthickness = 3 - ythickness = 3 - - bg[NORMAL] = "#f0f1f2" # a hint of blue... -} - -style "clearlooks-notebook" = "clearlooks-wide" -{ - bg[NORMAL] = {0.93, 0.93, 0.93} - bg[INSENSITIVE] = {0.93, 0.93, 0.93} -} - -style "clearlooks-tasklist" = "clearlooks-default" -{ - xthickness = 5 - ythickness = 3 -} - -style "clearlooks-menu" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 1 - bg[NORMAL] = "#ffffff" -} - -style "clearlooks-menu-item" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 3 - fg[PRELIGHT] = "#ffffff" - text[PRELIGHT] = "#ffffff" -} - -style "clearlooks-menu-itembar" = "clearlooks-default" -{ - xthickness = 3 - ythickness = 3 -} - -style "clearlooks-tree" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 2 -} - -style "clearlooks-frame-title" = "clearlooks-default" -{ - fg[NORMAL] = "#404040" -} - -style "clearlooks-tooltips" = "clearlooks-default" -{ - xthickness = 4 - ythickness = 4 - bg[NORMAL] = { 1.0,1.0,0.75 } -} - -style "clearlooks-progressbar" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 - - fg[PRELIGHT] = "#ffffff" -} - -style "clearlooks-combo" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 3 -} - -# Added pixmaps for scollbars -style "scrollbar" = "default" -{ - # The values I set here have to do with the relative size of three graphic elements - # I have used: the slider, the arrow box, and the trough. They all have the same width - # of 15 pixels, but gtk wants to put in some spacing between them. It seems like it - # places the sliders inside the trough with a default 1 pixel border on either side of the slider, - # so that the trough has its width stretched by an additional two pixels(?). Setting the - # trough border makes the arrow box sit on top of the trough squarely, by making sure that - # the trough stays the same width as the arrowbox(?). I could be totally wrong here. - GtkRange::trough_border = 0 - GtkRange::slider_width = 15 - - # This sets the size of the steppers (arrow buttons on the end of the scrollbar). - # The image I am using is 15x15 pixels, and if I dont set this a one pixel line - # gets cut off of the top of the "up" stepper. - GtkRange::stepper_size = 15 - - # Set a minimum length for the slider. Since I set the border on the slider - # image to 15 pixels on either end of the slider I want the min length to be - # at least 30 pixels to avoid an ugly slider when gtk wants to make it smaller - # than 30 pixels. - GtkScrollbar::min_slider_length = 30 - - engine "pixmap" - { - # Horizontal slider background - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "Scrollbars/trough-scrollbar-horiz.png" - border = { 30, 30, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Vertical slider background - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "Scrollbars/trough-scrollbar-vert.png" - border = { 0, 0, 30, 30 } - stretch = TRUE - orientation = VERTICAL - } - - # Normal horizontal slider - image - { - function = SLIDER - recolorable = TRUE - state = NORMAL - file = "Scrollbars_1/slider-horiz.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Horizontal slider (active) - image - { - function = SLIDER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars_1/slider-horiz-prelight.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Horizontal slider (mouse over) - image - { - function = SLIDER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars_1/slider-horiz-prelight.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Horizontal slider (Insesitive) - image - { - function = SLIDER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars_1/slider-horiz.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Normal vertical slider - image - { - function = SLIDER - recolorable = TRUE - state = NORMAL - file = "Scrollbars_1/slider-vert.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - - # Vertical slider (Active) - image - { - function = SLIDER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars_1/slider-vert.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - - # Vertical slider (mouse over) - image - { - function = SLIDER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars_1/slider-vert-prelight.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - - # Vertical slider (Insesitive) - image - { - function = SLIDER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars_1/slider-vert-prelight.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - -################################################################################ -# SCROLLBAR STEPPERS -################################################################################ - - # Up - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - - ######### DOWN ############ - - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - -############ RIGHT ################ - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - -############### LEFT ################### - - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - } -} - -# widget styles -class "GtkWidget" style "clearlooks-default" -class "GtkButton" style "clearlooks-button" -class "GtkCombo" style "clearlooks-button" -class "GtkRange" style "clearlooks-wide" -class "GtkFrame" style "clearlooks-wide" -class "GtkMenu" style "clearlooks-menu" -class "GtkEntry" style "clearlooks-button" -class "GtkMenuItem" style "clearlooks-menu-item" -class "GtkStatusbar" style "clearlooks-wide" -class "GtkNotebook" style "clearlooks-notebook" -class "GtkProgressBar" style "clearlooks-progressbar" -class "GtkScrollbar" style "scrollbar" - -widget_class "*MenuItem.*" style "clearlooks-menu-item" - -# combobox stuff -widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo" -widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo" - -# tooltips stuff -widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist" -widget "gtk-tooltips" style "clearlooks-tooltips" - -# treeview stuff -widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree" -widget_class "*.GtkList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title" - -# notebook stuff -widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook" -widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook" - -gtk-font-name="Lucida Grande 12" -gtk-icon-theme-name = "gnome" -gtk-icon-sizes = "gtk-menu=16,16:gtk-dialog=48,48:gtk-dnd=32,32:gtk-button=20,20:gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:wireshark-decoration=12,12" - diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc deleted file mode 100644 index 2c806d36c5..0000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc +++ /dev/null @@ -1,527 +0,0 @@ -# -# GTK theme to be used on Mac OS X, to mimic the appearance of Tiger -# -# Heavily based on Clearlooks-Quicksilver -# Scrollbars from OSX-theme by Lauri Taimila (lauri@taimila.com) -# -# XXX - hopefully not *too* heavily based on Clearlooks; Clearlooks -# might be the right theme for Ubuntu/Fedora/RHEL/Solaris/other -# OSes with GNOME-based desktops, but something that looks a bit -# more OS Xish might be better here. -# -# Also, note bugs 3944 and 3945, where some color and size choices -# aren't necessarily right. -# -# Googling for -# -# gtk theme mac os x -# -# (as Google Suggest suggested) found -# -# http://www.gnome-look.org/content/show.php?content=13548 -# http://www.gnome-look.org/content/show.php/OSX-Tiger+theme?content=56577 -# http://xanana.ucsc.edu/~wgscott/wordpress_new/wordpress/?p=5 -# http://linux.softpedia.com/get/Desktop-Environment/Themes/OSX-mod-41416.shtml -# http://www.gnome-look.org/content/show.php/OSX-X.5?content=61583 -# http://linux.softpedia.com/get/Desktop-Environment/Themes/MacOS-X-Aqua-Theme-23942.shtml -# -# (c) 2007 JiHO . -# GNU General Public License http://www.gnu.org/copyleft/gpl.html -# - -style "clearlooks-default" -{ - GtkButton ::default_border = { 0, 0, 0, 0 } - GtkRange ::trough_border = 0 - GtkPaned ::handle_size = 6 - GtkRange ::slider_width = 15 - GtkRange ::stepper_size = 15 - GtkScrollbar ::min_slider_length = 30 - GtkCheckButton ::indicator_size = 12 - GtkMenuBar ::internal-padding = 0 - GtkTreeView ::expander_size = 14 - GtkExpander ::expander_size = 16 - - xthickness = 1 - ythickness = 1 - - fg[NORMAL] = "#000000" # black - fg[PRELIGHT] = "#000000" # black - fg[SELECTED] = "#ffffff" # white - fg[ACTIVE] = "#000000" # black - fg[INSENSITIVE] = {0.6, 0.6, 0.6} # dark gray - - bg[NORMAL] = {0.95, 0.95, 0.95} # very light gray - bg[PRELIGHT] = "#ffffff" # white - bg[SELECTED] = OSX_MENU_COLOR_PLACEHOLDER # menu color - bg[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray - bg[ACTIVE] = {0.85, 0.85, 0.85} # gray - - base[NORMAL] = "#ffffff" # white - base[PRELIGHT] = OSX_MENU_COLOR_PLACEHOLDER # menu color - base[ACTIVE] = {0.6, 0.6, 0.6} # dark gray - base[SELECTED] = OSX_HILI_COLOR_PLACEHOLDER # highlight color - base[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray - - text[NORMAL] = "#000000" # black - text[PRELIGHT] = "#000000" # black - text[ACTIVE] = "#ffffff" # white - text[SELECTED] = "#ffffff" # white - text[INSENSITIVE] = {0.6, 0.6, 0.6} # dark gray - - engine "clearlooks" - { - menubarstyle = 1 # 0 = flat, 1 = sunken, 2 = flat gradient - menuitemstyle = 0 # 0 = flat, 1 = 3d-ish (gradient), 2 = 3d-ish (button) - listviewitemstyle = 0 # 0 = flat, 1 = 3d-ish (gradient) - progressbarstyle = 0 # 0 = candy bar, 1 = flat - } -} - - -style "clearlooks-wide" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 2 -} - -style "clearlooks-button" = "clearlooks-default" -{ - xthickness = 3 - ythickness = 3 - - bg[NORMAL] = "#f0f1f2" # a hint of blue... -} - -style "clearlooks-notebook" = "clearlooks-wide" -{ - bg[NORMAL] = {0.93, 0.93, 0.93} - bg[INSENSITIVE] = {0.93, 0.93, 0.93} -} - -style "clearlooks-tasklist" = "clearlooks-default" -{ - xthickness = 5 - ythickness = 3 -} - -style "clearlooks-menu" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 1 - bg[NORMAL] = "#ffffff" -} - -style "clearlooks-menu-item" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 3 - fg[PRELIGHT] = "#ffffff" - text[PRELIGHT] = "#ffffff" - # We want PRELIGHT to be white for widgets, but coloured for the menu. - bg[PRELIGHT] = OSX_MENU_COLOR_PLACEHOLDER - -} - -style "clearlooks-menu-itembar" = "clearlooks-default" -{ - xthickness = 3 - ythickness = 3 -} - -style "clearlooks-tree" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 2 -} - -style "clearlooks-frame-title" = "clearlooks-default" -{ - fg[NORMAL] = "#404040" -} - -style "clearlooks-tooltips" = "clearlooks-default" -{ - xthickness = 4 - ythickness = 4 - bg[NORMAL] = { 1.0,1.0,0.75 } -} - -style "clearlooks-progressbar" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 - - fg[PRELIGHT] = "#ffffff" -} - -style "clearlooks-combo" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 3 -} - -# Added pixmaps for scollbars -style "scrollbar" = "default" -{ - # The values I set here have to do with the relative size of three graphic elements - # I have used: the slider, the arrow box, and the trough. They all have the same width - # of 15 pixels, but gtk wants to put in some spacing between them. It seems like it - # places the sliders inside the trough with a default 1 pixel border on either side of the slider, - # so that the trough has its width stretched by an additional two pixels(?). Setting the - # trough border makes the arrow box sit on top of the trough squarely, by making sure that - # the trough stays the same width as the arrowbox(?). I could be totally wrong here. - GtkRange::trough_border = 0 - GtkRange::slider_width = 15 - - # This sets the size of the steppers (arrow buttons on the end of the scrollbar). - # The image I am using is 15x15 pixels, and if I dont set this a one pixel line - # gets cut off of the top of the "up" stepper. - GtkRange::stepper_size = 15 - - # Set a minimum length for the slider. Since I set the border on the slider - # image to 15 pixels on either end of the slider I want the min length to be - # at least 30 pixels to avoid an ugly slider when gtk wants to make it smaller - # than 30 pixels. - GtkScrollbar::min_slider_length = 30 - - engine "pixmap" - { - # Horizontal slider background - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "Scrollbars/trough-scrollbar-horiz.png" - border = { 30, 30, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Vertical slider background - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "Scrollbars/trough-scrollbar-vert.png" - border = { 0, 0, 30, 30 } - stretch = TRUE - orientation = VERTICAL - } - - # Normal horizontal slider - image - { - function = SLIDER - recolorable = TRUE - state = NORMAL - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Horizontal slider (active) - image - { - function = SLIDER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz-prelight.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Horizontal slider (mouse over) - image - { - function = SLIDER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz-prelight.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Horizontal slider (Insesitive) - image - { - function = SLIDER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Normal vertical slider - image - { - function = SLIDER - recolorable = TRUE - state = NORMAL - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - - # Vertical slider (Active) - image - { - function = SLIDER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - - # Vertical slider (mouse over) - image - { - function = SLIDER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert-prelight.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - - # Vertical slider (Insesitive) - image - { - function = SLIDER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert-prelight.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - -################################################################################ -# SCROLLBAR STEPPERS -################################################################################ - - # Up - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - - ######### DOWN ############ - - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - -############ RIGHT ################ - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - -############### LEFT ################### - - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - } -} - -# widget styles -class "GtkWidget" style "clearlooks-default" -class "GtkButton" style "clearlooks-button" -class "GtkCombo" style "clearlooks-button" -class "GtkRange" style "clearlooks-wide" -class "GtkFrame" style "clearlooks-wide" -class "GtkMenu" style "clearlooks-menu" -class "GtkEntry" style "clearlooks-button" -class "GtkMenuItem" style "clearlooks-menu-item" -class "GtkStatusbar" style "clearlooks-wide" -class "GtkNotebook" style "clearlooks-notebook" -class "GtkProgressBar" style "clearlooks-progressbar" -class "GtkScrollbar" style "scrollbar" - -widget_class "*MenuItem.*" style "clearlooks-menu-item" - -# combobox stuff -widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo" -widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo" - -# tooltips stuff -widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist" -widget "gtk-tooltips" style "clearlooks-tooltips" - -# treeview stuff -widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree" -widget_class "*.GtkList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title" - -# notebook stuff -widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook" -widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook" - -gtk-font-name="Lucida Grande 12" -gtk-icon-theme-name = "gnome" -gtk-icon-sizes = "gtk-menu=16,16:gtk-dialog=48,48:gtk-dnd=32,32:gtk-button=20,20:gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:inkscape-decoration=12,12" - diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh deleted file mode 100755 index f809e4c506..0000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# -# Reads defaults from Apple preferences and modifies GTK accordingly -# -# (c) 2007 JiHO -# GNU General Public License http://www.gnu.org/copyleft/gpl.html -# - -# Appearance setting -aquaStyle=`defaults read "Apple Global Domain" AppleAquaColorVariant` -# 1 for aqua, 6 for graphite, inexistant if the default color was never changed -if [[ "$aquaStyle" == "" ]]; then - aquaStyle=1 # set aqua as default -fi - -# Highlight Color setting -hiliColor=`defaults read "Apple Global Domain" AppleHighlightColor` -# a RGB value, with components between 0 and 1, also inexistant if it was not changed -if [[ "$hiliColor" == "" ]]; then - hiliColor="0.709800 0.835300 1.000000" # set blue as default -fi - -# Menu items color -if [[ aquaStyle -eq 1 ]]; then - menuColor="#4a76cd" # blue -else - menuColor="#7c8da4" # graphite -fi -# Format highlight color as a GTK rgb value -hiliColorFormated=`echo $hiliColor | awk -F " " '{print "\\\{"$1","$2","$3"\\\}"}'` - -# echo $menuColor -# echo $hiliColorFormated - -# Modify the gtkrc -# - with the correct colors -# - to point to the correct scrollbars folder -sed 's/OSX_HILI_COLOR_PLACEHOLDER/'$hiliColorFormated'/g' pre_gtkrc | sed 's/OSX_MENU_COLOR_PLACEHOLDER/\"'$menuColor'\"/g' | sed 's/AQUASTYLE_PLACEHOLDER/'$aquaStyle'/g' > gtkrc diff --git a/packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings b/packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings deleted file mode 100644 index 0bb6ef503d..0000000000 Binary files a/packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings and /dev/null differ diff --git a/packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib b/packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib deleted file mode 100644 index ea58db1189..0000000000 --- a/packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib +++ /dev/null @@ -1,4 +0,0 @@ -{ -IBClasses = (); -IBVersion = 1; -} diff --git a/packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib b/packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib deleted file mode 100644 index 2e31b4afc2..0000000000 --- a/packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - IBFramework Version - 345.0 - IBOldestOS - 3 - IBOpenObjects - - 29 - 166 - - IBSystem Version - 7B44 - targetFramework - IBCarbonFramework - - diff --git a/packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib b/packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib deleted file mode 100644 index e802d710a0..0000000000 --- a/packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib +++ /dev/null @@ -1,272 +0,0 @@ - - - - IBCarbonFramework - - NSApplication - - - - main - - - Foo - - Foo - - - About Foo - 0 - abou - - - _NSAppleMenu - - - - File - - File - - - New - n - new - - - Open… - o - open - - - TRUE - - - Close - w - clos - - - Save - s - save - - - Save As… - S - svas - - - Revert - r - rvrt - - - TRUE - - - Page Setup… - P - page - - - Print… - p - prnt - - - - - - Edit - - Edit - - - Undo - z - undo - - - Redo - Z - redo - - - TRUE - - - Cut - x - cut - - - Copy - c - copy - - - Paste - v - past - - - Delete - clea - - - Select All - a - sall - - - TRUE - - - Special Characters… - chrp - - - - - - Window - - Window - - - Zoom Window - zoom - - - TRUE - Minimize Window - m - mini - - - TRUE - Minimize All Windows - m - 1572864 - mina - - - TRUE - - - TRUE - Bring All to Front - bfrt - - - TRUE - Arrange in Front - 1572864 - frnt - - - _NSWindowsMenu - - - - _NSMainMenu - - - - - - - - - - - - - - - - - - - - - - - - - 204 300 564 780 - Window - - 0 0 360 480 - 0 0 480 360 - - FALSE - TRUE - TRUE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Files Owner - - MainWindow - - MenuBar - - - 200 - diff --git a/packaging/macosx/ScriptExec/Info.plist b/packaging/macosx/ScriptExec/Info.plist deleted file mode 100644 index 5b1fcc611a..0000000000 --- a/packaging/macosx/ScriptExec/Info.plist +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - CFBundleDevelopmentRegion - English - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - * - - CFBundleTypeName - All - CFBundleTypeOSTypes - - **** - - CFBundleTypeRole - Viewer - - - CFBundleExecutable - ScriptExec - CFBundleIconFile - - CFBundleIdentifier - com.apple.myCarbonNibApp - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.1 - - diff --git a/packaging/macosx/ScriptExec/MenuBar.nib/classes.nib b/packaging/macosx/ScriptExec/MenuBar.nib/classes.nib deleted file mode 100644 index ea58db1189..0000000000 --- a/packaging/macosx/ScriptExec/MenuBar.nib/classes.nib +++ /dev/null @@ -1,4 +0,0 @@ -{ -IBClasses = (); -IBVersion = 1; -} diff --git a/packaging/macosx/ScriptExec/MenuBar.nib/info.nib b/packaging/macosx/ScriptExec/MenuBar.nib/info.nib deleted file mode 100644 index 4c42cc89b3..0000000000 --- a/packaging/macosx/ScriptExec/MenuBar.nib/info.nib +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - IBDocumentLocation - 99 362 356 240 0 0 1280 832 - IBEditorPositions - - 187 - 340 374 240 44 0 0 1280 832 - - IBFramework Version - 349.0 - IBOpenObjects - - 187 - - IBSystem Version - 7F44 - targetFramework - IBCarbonFramework - - diff --git a/packaging/macosx/ScriptExec/MenuBar.nib/objects.xib b/packaging/macosx/ScriptExec/MenuBar.nib/objects.xib deleted file mode 100644 index 2f61c2e1ee..0000000000 --- a/packaging/macosx/ScriptExec/MenuBar.nib/objects.xib +++ /dev/null @@ -1,74 +0,0 @@ - - - - IBCarbonFramework - - NSApplication - - - - MenuBar - - - ScriptExec - - ScriptExec - _NSAppleMenu - - - - _NSMainMenu - - - - - Window - - Window - - - TRUE - Minimize Window - m - mini - - - TRUE - Minimize All Windows - m - 1572864 - mini - - - TRUE - - - TRUE - Bring All to Front - frnt - - - TRUE - Bring in Front - 1572864 - frnt - - - _NSWindowsMenu - - - - - - - - - - - File's Owner - - MenuBar - - - 206 - diff --git a/packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj b/packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj deleted file mode 100644 index bc081d5ef8..0000000000 --- a/packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj +++ /dev/null @@ -1,451 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 39; - objects = { - 0249A66BFF388E3F11CA2CEA = { - isa = PBXFileReference; - lastKnownFileType = archive.ar; - name = "libstdc++.a"; - path = "/usr/lib/libstdc++.a"; - refType = 0; - sourceTree = ""; - }; -//020 -//021 -//022 -//023 -//024 -//080 -//081 -//082 -//083 -//084 - 0867D6AAFE840B52C02AAC07 = { - children = ( - 0867D6ABFE840B52C02AAC07, - ); - isa = PBXVariantGroup; - name = InfoPlist.strings; - refType = 4; - sourceTree = ""; - }; - 0867D6ABFE840B52C02AAC07 = { - fileEncoding = 10; - isa = PBXFileReference; - lastKnownFileType = text.plist.strings; - name = English; - path = English.lproj/InfoPlist.strings; - refType = 4; - sourceTree = ""; - }; -//080 -//081 -//082 -//083 -//084 -//190 -//191 -//192 -//193 -//194 - 195DF8CFFE9D517E11CA2CBB = { - children = ( - 8D0C4E970486CD37000505A6, - ); - isa = PBXGroup; - name = Products; - refType = 4; - sourceTree = ""; - }; -//190 -//191 -//192 -//193 -//194 -//200 -//201 -//202 -//203 -//204 - 20286C28FDCF999611CA2CEA = { - buildSettings = { - }; - buildStyles = ( - 4A9504C5FFE6A39111CA0CBA, - 4A9504C6FFE6A39111CA0CBA, - ); - hasScannedForEncodings = 1; - isa = PBXProject; - mainGroup = 20286C29FDCF999611CA2CEA; - projectDirPath = ""; - targets = ( - 8D0C4E890486CD37000505A6, - ); - }; - 20286C29FDCF999611CA2CEA = { - children = ( - 20286C2AFDCF999611CA2CEA, - 20286C2CFDCF999611CA2CEA, - 20286C32FDCF999611CA2CEA, - 195DF8CFFE9D517E11CA2CBB, - ); - isa = PBXGroup; - name = ScriptExec; - path = ""; - refType = 4; - sourceTree = ""; - }; - 20286C2AFDCF999611CA2CEA = { - children = ( - 32DBCF6D0370B57F00C91783, - 20286C2BFDCF999611CA2CEA, - ); - isa = PBXGroup; - name = Sources; - path = ""; - refType = 4; - sourceTree = ""; - }; - 20286C2BFDCF999611CA2CEA = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - path = main.c; - refType = 4; - sourceTree = ""; - }; - 20286C2CFDCF999611CA2CEA = { - children = ( - 664C29F0060ECDC4006EC560, - B8DCE042056DAC3500C390B0, - 8D0C4E960486CD37000505A6, - B8DCE048056DAC5000C390B0, - 0867D6AAFE840B52C02AAC07, - ); - isa = PBXGroup; - name = Resources; - path = ""; - refType = 4; - sourceTree = ""; - }; - 20286C32FDCF999611CA2CEA = { - children = ( - 20286C33FDCF999611CA2CEA, - 4A9504CAFFE6A41611CA0CBA, - 4A9504C8FFE6A3BC11CA0CBA, - 0249A66BFF388E3F11CA2CEA, - B8DCE04E056DACAE00C390B0, - ); - isa = PBXGroup; - name = "External Frameworks and Libraries"; - path = ""; - refType = 4; - sourceTree = ""; - }; - 20286C33FDCF999611CA2CEA = { - fallbackIsa = PBXFileReference; - isa = PBXFrameworkReference; - lastKnownFileType = wrapper.framework; - name = Carbon.framework; - path = /System/Library/Frameworks/Carbon.framework; - refType = 0; - sourceTree = ""; - }; -//200 -//201 -//202 -//203 -//204 -//320 -//321 -//322 -//323 -//324 - 32DBCF6D0370B57F00C91783 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - path = ScriptExec_Prefix.pch; - refType = 4; - sourceTree = ""; - }; -//320 -//321 -//322 -//323 -//324 -//4A0 -//4A1 -//4A2 -//4A3 -//4A4 - 4A9504C5FFE6A39111CA0CBA = { - buildRules = ( - ); - buildSettings = { - COPY_PHASE_STRIP = NO; - DEBUGGING_SYMBOLS = YES; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OPTIMIZATION_CFLAGS = "-O0"; - ZERO_LINK = YES; - }; - isa = PBXBuildStyle; - name = Development; - }; - 4A9504C6FFE6A39111CA0CBA = { - buildRules = ( - ); - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_OPTIMIZATION_LEVEL = s; - ZERO_LINK = NO; - }; - isa = PBXBuildStyle; - name = Deployment; - }; - 4A9504C8FFE6A3BC11CA0CBA = { - fallbackIsa = PBXFileReference; - isa = PBXFrameworkReference; - lastKnownFileType = wrapper.framework; - name = ApplicationServices.framework; - path = /System/Library/Frameworks/ApplicationServices.framework; - refType = 0; - sourceTree = ""; - }; - 4A9504CAFFE6A41611CA0CBA = { - fallbackIsa = PBXFileReference; - isa = PBXFrameworkReference; - lastKnownFileType = wrapper.framework; - name = CoreServices.framework; - path = /System/Library/Frameworks/CoreServices.framework; - refType = 0; - sourceTree = ""; - }; -//4A0 -//4A1 -//4A2 -//4A3 -//4A4 -//660 -//661 -//662 -//663 -//664 - 664C29F0060ECDC4006EC560 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text.script.sh; - path = openDoc; - refType = 4; - sourceTree = ""; - }; - 664C29F1060ECDC4006EC560 = { - fileRef = 664C29F0060ECDC4006EC560; - isa = PBXBuildFile; - settings = { - }; - }; -//660 -//661 -//662 -//663 -//664 -//8D0 -//8D1 -//8D2 -//8D3 -//8D4 - 8D0C4E890486CD37000505A6 = { - buildPhases = ( - 8D0C4E8A0486CD37000505A6, - 8D0C4E8C0486CD37000505A6, - 8D0C4E8F0486CD37000505A6, - 8D0C4E910486CD37000505A6, - 8D0C4E940486CD37000505A6, - ); - buildRules = ( - ); - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; - GCC_ENABLE_TRIGRAPHS = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ScriptExec_Prefix.pch; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ""; - LIBRARY_STYLE = Static; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = ScriptExec; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; - WRAPPER_EXTENSION = app; - }; - dependencies = ( - ); - isa = PBXNativeTarget; - name = ScriptExec; - productInstallPath = "$(HOME)/Applications"; - productName = ScriptExec; - productReference = 8D0C4E970486CD37000505A6; - productType = "com.apple.product-type.application"; - }; - 8D0C4E8A0486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - 8D0C4E8B0486CD37000505A6, - ); - isa = PBXHeadersBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E8B0486CD37000505A6 = { - fileRef = 32DBCF6D0370B57F00C91783; - isa = PBXBuildFile; - settings = { - }; - }; - 8D0C4E8C0486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - 8D0C4E8D0486CD37000505A6, - B8DCE045056DAC3500C390B0, - B8DCE049056DAC5000C390B0, - 664C29F1060ECDC4006EC560, - ); - isa = PBXResourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E8D0486CD37000505A6 = { - fileRef = 0867D6AAFE840B52C02AAC07; - isa = PBXBuildFile; - settings = { - }; - }; - 8D0C4E8F0486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - 8D0C4E900486CD37000505A6, - ); - isa = PBXSourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E900486CD37000505A6 = { - fileRef = 20286C2BFDCF999611CA2CEA; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - ); - }; - }; - 8D0C4E910486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - 8D0C4E920486CD37000505A6, - 8D0C4E930486CD37000505A6, - B8DCE04F056DACAE00C390B0, - ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E920486CD37000505A6 = { - fileRef = 20286C33FDCF999611CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; - 8D0C4E930486CD37000505A6 = { - fileRef = 0249A66BFF388E3F11CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; - 8D0C4E940486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXRezBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E960486CD37000505A6 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text.plist; - path = Info.plist; - refType = 4; - sourceTree = ""; - }; - 8D0C4E970486CD37000505A6 = { - explicitFileType = wrapper.application; - includeInIndex = 0; - isa = PBXFileReference; - path = ScriptExec.app; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; -//8D0 -//8D1 -//8D2 -//8D3 -//8D4 -//B80 -//B81 -//B82 -//B83 -//B84 - B8DCE042056DAC3500C390B0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - path = MenuBar.nib; - refType = 4; - sourceTree = ""; - }; - B8DCE045056DAC3500C390B0 = { - fileRef = B8DCE042056DAC3500C390B0; - isa = PBXBuildFile; - settings = { - }; - }; - B8DCE048056DAC5000C390B0 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text.script.sh; - path = script; - refType = 4; - sourceTree = ""; - }; - B8DCE049056DAC5000C390B0 = { - fileRef = B8DCE048056DAC5000C390B0; - isa = PBXBuildFile; - settings = { - }; - }; - B8DCE04E056DACAE00C390B0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = Security.framework; - path = /System/Library/Frameworks/Security.framework; - refType = 0; - sourceTree = ""; - }; - B8DCE04F056DACAE00C390B0 = { - fileRef = B8DCE04E056DACAE00C390B0; - isa = PBXBuildFile; - settings = { - }; - }; - }; - rootObject = 20286C28FDCF999611CA2CEA; -} diff --git a/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj b/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj deleted file mode 100644 index bcb54fe658..0000000000 --- a/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj +++ /dev/null @@ -1,347 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXBuildFile section */ - 664C29F1060ECDC4006EC560 /* openDoc in Resources */ = {isa = PBXBuildFile; fileRef = 664C29F0060ECDC4006EC560 /* openDoc */; }; - 8D0C4E8B0486CD37000505A6 /* ScriptExec_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 32DBCF6D0370B57F00C91783 /* ScriptExec_Prefix.pch */; }; - 8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; }; - 8D0C4E900486CD37000505A6 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 20286C2BFDCF999611CA2CEA /* main.c */; settings = {ATTRIBUTES = (); }; }; - 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; }; - 8D0C4E930486CD37000505A6 /* libstdc++.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0249A66BFF388E3F11CA2CEA /* libstdc++.a */; }; - B8DCE045056DAC3500C390B0 /* MenuBar.nib in Resources */ = {isa = PBXBuildFile; fileRef = B8DCE042056DAC3500C390B0 /* MenuBar.nib */; }; - B8DCE049056DAC5000C390B0 /* script in Resources */ = {isa = PBXBuildFile; fileRef = B8DCE048056DAC5000C390B0 /* script */; }; - B8DCE04F056DACAE00C390B0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8DCE04E056DACAE00C390B0 /* Security.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 0249A66BFF388E3F11CA2CEA /* libstdc++.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libstdc++.a"; path = "/usr/lib/libstdc++.a"; sourceTree = ""; }; - 0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - 20286C2BFDCF999611CA2CEA /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; - 20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; - 32DBCF6D0370B57F00C91783 /* ScriptExec_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptExec_Prefix.pch; sourceTree = ""; }; - 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; - 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; - 664C29F0060ECDC4006EC560 /* openDoc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = openDoc; sourceTree = ""; }; - 8D0C4E960486CD37000505A6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - 8D0C4E970486CD37000505A6 /* ScriptExec.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ScriptExec.app; sourceTree = BUILT_PRODUCTS_DIR; }; - B8DCE042056DAC3500C390B0 /* MenuBar.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = MenuBar.nib; sourceTree = ""; }; - B8DCE048056DAC5000C390B0 /* script */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = script; sourceTree = ""; }; - B8DCE04E056DACAE00C390B0 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8D0C4E910486CD37000505A6 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */, - 8D0C4E930486CD37000505A6 /* libstdc++.a in Frameworks */, - B8DCE04F056DACAE00C390B0 /* Security.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 195DF8CFFE9D517E11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 8D0C4E970486CD37000505A6 /* ScriptExec.app */, - ); - name = Products; - sourceTree = ""; - }; - 20286C29FDCF999611CA2CEA /* ScriptExec */ = { - isa = PBXGroup; - children = ( - 20286C2AFDCF999611CA2CEA /* Sources */, - 20286C2CFDCF999611CA2CEA /* Resources */, - 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */, - 195DF8CFFE9D517E11CA2CBB /* Products */, - ); - name = ScriptExec; - sourceTree = ""; - }; - 20286C2AFDCF999611CA2CEA /* Sources */ = { - isa = PBXGroup; - children = ( - 32DBCF6D0370B57F00C91783 /* ScriptExec_Prefix.pch */, - 20286C2BFDCF999611CA2CEA /* main.c */, - ); - name = Sources; - sourceTree = ""; - }; - 20286C2CFDCF999611CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - 664C29F0060ECDC4006EC560 /* openDoc */, - B8DCE042056DAC3500C390B0 /* MenuBar.nib */, - 8D0C4E960486CD37000505A6 /* Info.plist */, - B8DCE048056DAC5000C390B0 /* script */, - 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */, - ); - name = Resources; - sourceTree = ""; - }; - 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = { - isa = PBXGroup; - children = ( - 20286C33FDCF999611CA2CEA /* Carbon.framework */, - 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */, - 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */, - 0249A66BFF388E3F11CA2CEA /* libstdc++.a */, - B8DCE04E056DACAE00C390B0 /* Security.framework */, - ); - name = "External Frameworks and Libraries"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 8D0C4E8A0486CD37000505A6 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D0C4E8B0486CD37000505A6 /* ScriptExec_Prefix.pch in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 8D0C4E890486CD37000505A6 /* ScriptExec */ = { - isa = PBXNativeTarget; - buildConfigurationList = 78E9AE160A36A8E3000D76A8 /* Build configuration list for PBXNativeTarget "ScriptExec" */; - buildPhases = ( - 8D0C4E8A0486CD37000505A6 /* Headers */, - 8D0C4E8C0486CD37000505A6 /* Resources */, - 8D0C4E8F0486CD37000505A6 /* Sources */, - 8D0C4E910486CD37000505A6 /* Frameworks */, - 8D0C4E940486CD37000505A6 /* Rez */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = ScriptExec; - productInstallPath = "$(HOME)/Applications"; - productName = ScriptExec; - productReference = 8D0C4E970486CD37000505A6 /* ScriptExec.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 20286C28FDCF999611CA2CEA /* Project object */ = { - isa = PBXProject; - buildConfigurationList = 78E9AE1A0A36A8E3000D76A8 /* Build configuration list for PBXProject "ScriptExec" */; - hasScannedForEncodings = 1; - mainGroup = 20286C29FDCF999611CA2CEA /* ScriptExec */; - projectDirPath = ""; - targets = ( - 8D0C4E890486CD37000505A6 /* ScriptExec */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D0C4E8C0486CD37000505A6 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */, - B8DCE045056DAC3500C390B0 /* MenuBar.nib in Resources */, - B8DCE049056DAC5000C390B0 /* script in Resources */, - 664C29F1060ECDC4006EC560 /* openDoc in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXRezBuildPhase section */ - 8D0C4E940486CD37000505A6 /* Rez */ = { - isa = PBXRezBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXRezBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 8D0C4E8F0486CD37000505A6 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D0C4E900486CD37000505A6 /* main.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 0867D6ABFE840B52C02AAC07 /* English */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 78E9AE170A36A8E3000D76A8 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - DEBUGGING_SYMBOLS = YES; - FRAMEWORK_SEARCH_PATHS = ""; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_ENABLE_TRIGRAPHS = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ScriptExec_Prefix.pch; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ""; - LIBRARY_STYLE = Static; - OPTIMIZATION_CFLAGS = "-O0"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = ScriptExec; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - ZERO_LINK = YES; - }; - name = Development; - }; - 78E9AE180A36A8E3000D76A8 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ""; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_ENABLE_TRIGRAPHS = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = s; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ScriptExec_Prefix.pch; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ""; - LIBRARY_STYLE = Static; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = ScriptExec; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - ZERO_LINK = NO; - }; - name = Deployment; - }; - 78E9AE190A36A8E3000D76A8 /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; - GCC_ENABLE_TRIGRAPHS = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ScriptExec_Prefix.pch; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ""; - LIBRARY_STYLE = Static; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = ScriptExec; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - }; - name = Default; - }; - 78E9AE1B0A36A8E3000D76A8 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - SYMROOT = "$(PROJECT_DIR)/build"; - }; - name = Development; - }; - 78E9AE1C0A36A8E3000D76A8 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - SYMROOT = "$(PROJECT_DIR)/build"; - }; - name = Deployment; - }; - 78E9AE1D0A36A8E3000D76A8 /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - SYMROOT = "$(PROJECT_DIR)/build"; - }; - name = Default; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 78E9AE160A36A8E3000D76A8 /* Build configuration list for PBXNativeTarget "ScriptExec" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 78E9AE170A36A8E3000D76A8 /* Development */, - 78E9AE180A36A8E3000D76A8 /* Deployment */, - 78E9AE190A36A8E3000D76A8 /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; - 78E9AE1A0A36A8E3000D76A8 /* Build configuration list for PBXProject "ScriptExec" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 78E9AE1B0A36A8E3000D76A8 /* Development */, - 78E9AE1C0A36A8E3000D76A8 /* Deployment */, - 78E9AE1D0A36A8E3000D76A8 /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; -/* End XCConfigurationList section */ - }; - rootObject = 20286C28FDCF999611CA2CEA /* Project object */; -} diff --git a/packaging/macosx/ScriptExec/ScriptExec_Prefix.pch b/packaging/macosx/ScriptExec/ScriptExec_Prefix.pch deleted file mode 100644 index 16d7ede3d0..0000000000 --- a/packaging/macosx/ScriptExec/ScriptExec_Prefix.pch +++ /dev/null @@ -1,5 +0,0 @@ -// -// Prefix header for all source files of the 'ScriptExec' target in the 'ScriptExec' project. -// - -#include diff --git a/packaging/macosx/ScriptExec/main.c b/packaging/macosx/ScriptExec/main.c deleted file mode 100644 index 0dff2dcd16..0000000000 --- a/packaging/macosx/ScriptExec/main.c +++ /dev/null @@ -1,775 +0,0 @@ -/* - Platypus - create OS X application bundles that execute scripts - This is the executable that goes into Platypus apps - Copyright (C) 2003 Sveinbjorn Thordarson - - With modifications by Aaron Voisine for gimp.app - With modifications by Marianne gagnon for Wilber-loves-apple - With modifications by Michael Wybrow for Inkscape.app - With modifications by ~suv for Inkscape.app - With modifications by Gerald Combs for Wireshark.app - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA. - - main.c - main program file - -*/ - -/* - * This app laucher basically takes care of: - * - launching Wireshark (and, on OS X prior to Leopard, X11) when - * double-clicked (it's auto-launched by launchd on Leopard and later) - * - bringing X11 to the top when its icon is clicked in the dock (via a small applescript) - * - catch file dropped on icon events (and double-clicked gimp documents) and notify gimp. - * - catch quit events performed outside gimp, e.g. on the dock icon. - */ - -/////////////////////////////////////// -// Includes -/////////////////////////////////////// -#pragma mark Includes - -// Apple stuff - -// Note: including Carbon prevents building the launcher app in x86_64 -// used for StandardAlert in RequestUserAttention(), -// RedFatalAlert() -#include -#include -#include -#include - -// Unix stuff -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////// -// Definitions -/////////////////////////////////////// -#pragma mark Definitions - -// name length limits -#define kMaxPathLength 1024 - -// names of files bundled with app -#define kScriptFileName "script" -#define kOpenDocFileName "openDoc" - -// custom carbon event class -#define kEventClassRedFatalAlert 911 - -// custom carbon event types -#define kEventKindX11Failed 911 -#define kEventKindFCCacheFailed 912 - -//maximum arguments the script accepts -#define kMaxArgumentsToScript 252 - -/////////////////////////////////////// -// Prototypes -/////////////////////////////////////// -#pragma mark Prototypes - -static void *Execute(void *arg); -static void *OpenDoc(void *arg); -static OSErr ExecuteScript(char *script, pid_t *pid); - -static void GetParameters(void); -static unsigned char* GetScript(void); -static unsigned char* GetOpenDoc(void); - -OSErr LoadMenuBar(char *appName); - -static OSStatus FSMakePath(FSRef fileRef, unsigned char *path, long maxPathSize); -static void RedFatalAlert(Str255 errorString, Str255 expStr); -static short DoesFileExist(unsigned char *path); - -static OSErr AppQuitAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon); -static OSErr AppOpenDocAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon); -static OSErr AppOpenAppAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon); -static OSStatus X11FailedHandler(EventHandlerCallRef theHandlerCall, - EventRef theEvent, void *userData); -static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, - EventRef theEvent, void *userData); -static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon); - -static OSStatus CompileAppleScript(const void* text, long textLength, - AEDesc *resultData); -static OSStatus SimpleCompileAppleScript(const char* theScript); -static OSErr runScript(); - -/////////////////////////////////////// -// Globals -/////////////////////////////////////// -#pragma mark Globals - -// process id of forked process -pid_t pid = 0; - -// thread id of threads that start scripts -pthread_t odtid = 0, tid = 0; - -// indicator of whether the script has completed executing -short taskDone = true; - -// execution parameters -char scriptPath[kMaxPathLength]; -char openDocPath[kMaxPathLength]; - -//arguments to the script -char *arguments[kMaxArgumentsToScript+3]; -char *fileArgs[kMaxArgumentsToScript]; -short numArgs = 0; - -extern char **environ; - -// -// 0 if we should expect a bundled X11, 1 if we should expect XQuartz -// -static int expect_xquartz; - -static enum { - BUNDLED_X11, // bundled X11, in /usr/X11 - XQUARTZ, // unbundled XQuartz, in /opt/X11, with /usr/X11 linking to it - XQUARTZ_STUB, // stub libraries in /usr/X11 that will tell user to install XQuartz - BROKEN_XQUARTZ, // unbundled XQuartz, in /opt/X11, with no /usr/X11 - NO_X11 // no X11 -} x11_type; - -#pragma mark - - -/////////////////////////////////////// -// Program entrance point -/////////////////////////////////////// -int main(int argc, char* argv[]) -{ - OSErr err = noErr; - EventTypeSpec X11events = { kEventClassRedFatalAlert, kEventKindX11Failed }; - EventTypeSpec FCCacheEvents = { kEventClassRedFatalAlert, kEventKindFCCacheFailed }; - struct utsname os_info; - struct stat statb_usr_x11, statb_opt_x11; - char symlink_target[MAXPATHLEN+1]; - ssize_t link_length; - - // Which version of OS X is this? Use that to determine what sort - // of X11 we should expect to have installed - if (uname(&os_info) == -1) { - // Couldn't find out; this "should not happen", - // assume bundled X11 for the lulz - expect_xquartz = 0; - } else { - if (os_info.release[0] <= '9' && os_info.release[1] == '.') { - // Darwin 9.0 (Leopard) or earlier; expect bundled X11 - expect_xquartz = 0; - } else if (os_info.release[0] == '1' && - (os_info.release[1] == '0' || os_info.release[1] == '1') && - os_info.release[2] == '.') { - // Darwin 10.0 (Snow Leopard) or 11.0 (Lion); expect bundled X11 - expect_xquartz = 0; - } else { - // Mountain Lion or later; expect XQuartz - expect_xquartz = 1; - } - } - - if (expect_xquartz) { - // Do we have /opt/X11? - if (lstat("/opt/X11", &statb_opt_x11) == -1) { - // No. Is /usr/X11 a directory? - if (lstat("/usr/X11", &statb_usr_x11) != -1 && - S_ISDIR(statb_opt_x11.st_mode)) { - // It's a directory; assume it contains the stub libraries. - x11_type = XQUARTZ_STUB; - } else { - // It's not a directory; assume we need X11 installed. - x11_type = NO_X11; - } - } else { - // Yes. Is /usr/X11 a symbolic link to /opt/X11? - if (lstat("/usr/X11", &statb_usr_x11) != -1 && - S_ISLNK(statb_opt_x11.st_mode)) { - // OK, it's a symlink; does it point to /opt/X11? - link_length = readlink("/usr/X11", symlink_target, MAXPATHLEN); - if (link_length == -1) { - // Couldn't read it; broken X11 - x11_type = BROKEN_XQUARTZ; - } else { - // Read it; nul-terminate the string - symlink_target[link_length] = '\0'; - if (strcmp(symlink_target, "/opt/X11") == 0) { - // Yes, it points to /opt/X11, so that's good - x11_type = XQUARTZ; - } else { - // No, it doesn't - broken - x11_type = BROKEN_XQUARTZ; - } - } - } else { - // Non-existent or not a symlink - x11_type = BROKEN_XQUARTZ; - } - } - } else { - // Look for /usr/X11 - if (lstat("/usr/X11", &statb_usr_x11) == -1) { - // No /usr/X11; tell the user to install X11 - x11_type = NO_X11; - } else { - // Assume it's OK - x11_type = BUNDLED_X11; - } - } - - InitCursor(); - - //install Apple Event handlers - err += AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, - NewAEEventHandlerUPP(AppQuitAEHandler), - 0, false); - err += AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, - NewAEEventHandlerUPP(AppOpenDocAEHandler), - 0, false); - err += AEInstallEventHandler(kCoreEventClass, kAEOpenApplication, - NewAEEventHandlerUPP(AppOpenAppAEHandler), - 0, false); - - err += AEInstallEventHandler(kCoreEventClass, kAEReopenApplication, - NewAEEventHandlerUPP(AppReopenAppAEHandler), - 0, false); - - err += InstallEventHandler(GetApplicationEventTarget(), - NewEventHandlerUPP(X11FailedHandler), 1, - &X11events, NULL, NULL); - err += InstallEventHandler(GetApplicationEventTarget(), - NewEventHandlerUPP(FCCacheFailedHandler), 1, - &FCCacheEvents, NULL, NULL); - - if (err) RedFatalAlert("\pInitialization Error", - "\pError initing Apple Event handlers."); - - //create the menu bar - if (err = LoadMenuBar(NULL)) RedFatalAlert("\pInitialization Error", - "\pError loading MenuBar.nib."); - - GetParameters(); //load data from files containing exec settings - - // compile "icon clicked" script so it's ready to execute - // Don't tell it to activate if it's not installed; - // that will pop up the annoying "where is XQuartz?"/"where is X11?" - // dialog, and if somebody selects the wrong app, you end up with - // a messed-up system that fails to start X correctly. - switch (x11_type) { - case XQUARTZ: - SimpleCompileAppleScript("tell application \"XQuartz\" to activate"); - break; - - case BUNDLED_X11: - SimpleCompileAppleScript("tell application \"X11\" to activate"); - break; - - default: - break; - } - - RunApplicationEventLoop(); //Run the event loop - return 0; -} - -#pragma mark - - - -static void RequestUserAttention(void) -{ - NMRecPtr notificationRequest = (NMRecPtr) NewPtr(sizeof(NMRec)); - - memset(notificationRequest, 0, sizeof(*notificationRequest)); - notificationRequest->qType = nmType; - notificationRequest->nmMark = 1; - notificationRequest->nmIcon = 0; - notificationRequest->nmSound = 0; - notificationRequest->nmStr = NULL; - notificationRequest->nmResp = NULL; - - verify_noerr(NMInstall(notificationRequest)); -} - - -static void ShowFirstStartWarningDialog(void) -{ - SInt16 itemHit; - - AlertStdAlertParamRec params; - params.movable = true; - params.helpButton = false; - params.filterProc = NULL; - params.defaultText = (void *) kAlertDefaultOKText; - params.cancelText = NULL; - params.otherText = NULL; - params.defaultButton = kAlertStdAlertOKButton; - params.cancelButton = kAlertStdAlertCancelButton; - params.position = kWindowDefaultPosition; - - StandardAlert(kAlertNoteAlert, "\pWireshark on OS X", - "\pWhile Wireshark is open, its windows can be displayed or hidden by displaying or hiding the X11 application.\n\nThe first time this version of Wireshark is run it may take several minutes before the main window is displayed while font caches are built.", - ¶ms, &itemHit); -} - - -////////////////////////////////// -// Handler for when fontconfig caches need to be generated -////////////////////////////////// -static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, - EventRef theEvent, void *userData) -{ - - pthread_join(tid, NULL); - if (odtid) pthread_join(odtid, NULL); - - // Bounce Wireshark Dock icon - RequestUserAttention(); - // Need to show warning to the user, then carry on. - ShowFirstStartWarningDialog(); - - // Note that we've seen the warning. - system("test -d \"$HOME/.wireshark\" || mkdir \"$HOME/.wireshark\"; " - "touch \"$HOME/.wireshark/.fccache-new\""); - // Rerun now. - OSErr err = ExecuteScript(scriptPath, &pid); - ExitToShell(); - - return noErr; -} - -/////////////////////////////////// -// Execution thread starts here -/////////////////////////////////// -static void *Execute (void *arg) -{ - EventRef event; - - taskDone = false; - - OSErr err = ExecuteScript(scriptPath, &pid); - if (err == (OSErr)11) { - CreateEvent(NULL, kEventClassRedFatalAlert, kEventKindX11Failed, 0, - kEventAttributeNone, &event); - PostEventToQueue(GetMainEventQueue(), event, kEventPriorityStandard); - } - else if (err == (OSErr)12) { - CreateEvent(NULL, kEventClassRedFatalAlert, kEventKindFCCacheFailed, 0, - kEventAttributeNone, &event); - PostEventToQueue(GetMainEventQueue(), event, kEventPriorityHigh); - } - else ExitToShell(); - return 0; -} - -/////////////////////////////////// -// Open additional documents thread starts here -/////////////////////////////////// -static void *OpenDoc (void *arg) -{ - ExecuteScript(openDocPath, NULL); - return 0; -} - -/////////////////////////////////////// -// Run a script via the system command -/////////////////////////////////////// -static OSErr ExecuteScript (char *script, pid_t *pid) -{ - pid_t wpid = 0, p = 0; - int status, i; - - if (! pid) pid = &p; - - // Generate the array of argument strings before we do any executing - arguments[0] = script; - for (i = 0; i < numArgs; i++) arguments[i + 1] = fileArgs[i]; - arguments[i + 1] = NULL; - - *pid = fork(); //open fork - - if (*pid == (pid_t)-1) exit(13); //error - else if (*pid == 0) { //child process started - execve(arguments[0], arguments, environ); - exit(13); //if we reach this point, there's an error - } - - wpid = waitpid(*pid, &status, 0); //wait while child process finishes - - if (wpid == (pid_t)-1) return wpid; - return (OSErr)WEXITSTATUS(status); -} - -#pragma mark - - -/////////////////////////////////////// -// This function loads all the neccesary settings -// from config files in the Resources folder -/////////////////////////////////////// -static void GetParameters (void) -{ - char *str; - if (! (str = (char *)GetScript())) //get path to script to be executed - RedFatalAlert("\pInitialization Error", - "\pError getting script from application bundle."); - strcpy((char *)&scriptPath, str); - - if (! (str = (char *)GetOpenDoc())) //get path to openDoc - RedFatalAlert("\pInitialization Error", - "\pError getting openDoc from application bundle."); - strcpy((char *)&openDocPath, str); -} - -/////////////////////////////////////// -// Get path to the script in Resources folder -/////////////////////////////////////// -static unsigned char* GetScript (void) -{ - CFStringRef fileName; - CFBundleRef appBundle; - CFURLRef scriptFileURL; - FSRef fileRef; - unsigned char *path; - - //get CF URL for script - if (! (appBundle = CFBundleGetMainBundle())) return NULL; - if (! (fileName = CFStringCreateWithCString(NULL, kScriptFileName, - kCFStringEncodingASCII))) - return NULL; - if (! (scriptFileURL = CFBundleCopyResourceURL(appBundle, fileName, NULL, - NULL))) return NULL; - - //Get file reference from Core Foundation URL - if (! CFURLGetFSRef(scriptFileURL, &fileRef)) return NULL; - - //dispose of the CF variables - CFRelease(scriptFileURL); - CFRelease(fileName); - - //create path string - if (! (path = malloc(kMaxPathLength))) return NULL; - if (FSMakePath(fileRef, path, kMaxPathLength)) return NULL; - if (! DoesFileExist(path)) return NULL; - - return path; -} - -/////////////////////////////////////// -// Gets the path to openDoc in Resources folder -/////////////////////////////////////// -static unsigned char* GetOpenDoc (void) -{ - CFStringRef fileName; - CFBundleRef appBundle; - CFURLRef openDocFileURL; - FSRef fileRef; - unsigned char *path; - - //get CF URL for openDoc - if (! (appBundle = CFBundleGetMainBundle())) return NULL; - if (! (fileName = CFStringCreateWithCString(NULL, kOpenDocFileName, - kCFStringEncodingASCII))) - return NULL; - if (! (openDocFileURL = CFBundleCopyResourceURL(appBundle, fileName, NULL, - NULL))) return NULL; - - //Get file reference from Core Foundation URL - if (! CFURLGetFSRef( openDocFileURL, &fileRef )) return NULL; - - //dispose of the CF variables - CFRelease(openDocFileURL); - CFRelease(fileName); - - //create path string - if (! (path = malloc(kMaxPathLength))) return NULL; - if (FSMakePath(fileRef, path, kMaxPathLength)) return NULL; - if (! DoesFileExist(path)) return NULL; - - return path; -} - -#pragma mark - - -///////////////////////////////////// -// Load menu bar from nib -///////////////////////////////////// -OSErr LoadMenuBar (char *appName) -{ - OSErr err; - IBNibRef nibRef; - - if (err = CreateNibReference(CFSTR("MenuBar"), &nibRef)) return err; - if (err = SetMenuBarFromNib(nibRef, CFSTR("MenuBar"))) return err; - DisposeNibReference(nibRef); - - return noErr; -} - -#pragma mark - - -/////////////////////////////////////// -// Generate path string from FSSpec record -/////////////////////////////////////// -static OSStatus FSMakePath(FSRef fileRef, unsigned char *path, long maxPathSize) -{ - // and then convert the FSRef to a path - return FSRefMakePath(&fileRef, path, maxPathSize); -} - -//////////////////////////////////////// -// Standard red error alert, then exit application -//////////////////////////////////////// -static void RedFatalAlert (Str255 errorString, Str255 expStr) -{ - StandardAlert(kAlertStopAlert, errorString, expStr, NULL, NULL); - ExitToShell(); -} - -/////////////////////////////////////// -// Determines whether file exists at path or not -/////////////////////////////////////// -static short DoesFileExist (unsigned char *path) -{ - if (access((char *)path, F_OK) == -1) return false; - return true; -} - -#pragma mark - - -/////////////////////////////////////// -// Apple Event handler for Quit i.e. from -// the dock or Application menu item -/////////////////////////////////////// -static OSErr AppQuitAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon) -{ - #pragma unused (reply, refCon, theAppleEvent) - - while (numArgs > 0) free(fileArgs[numArgs--]); - - if (! taskDone && pid) { //kill the script process brutally - kill(pid, 9); - printf("Wireshark.app: PID %d killed brutally\n", pid); - } - - pthread_cancel(tid); - if (odtid) pthread_cancel(odtid); - - ExitToShell(); - - return noErr; -} - -///////////////////////////////////// -// Handler for docs dragged on app icon -///////////////////////////////////// -static OSErr AppOpenDocAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon) -{ - #pragma unused (reply, refCon) - - OSErr err = noErr; - AEDescList fileRefList; - AEKeyword keyword; - DescType type; - - short i; - long count, actualSize; - - FSRef fileRef; - unsigned char path[kMaxPathLength]; - - while (numArgs > 0) free(fileArgs[numArgs--]); - - //Read the AppleEvent - err = AEGetParamDesc(theAppleEvent, keyDirectObject, typeAEList, - &fileRefList); - - err = AECountItems(&fileRefList, &count); //Count number of files - - for (i = 1; i <= count; i++) { //iteratively process each file - //get fsref from apple event - if (! (err = AEGetNthPtr(&fileRefList, i, typeFSRef, &keyword, &type, - (Ptr)&fileRef, sizeof(FSRef), &actualSize))) - { - //get path from file ref - if ((err = FSMakePath(fileRef, (unsigned char *)&path, - kMaxPathLength))) return err; - - if (numArgs == kMaxArgumentsToScript) break; - - if (! (fileArgs[numArgs] = malloc(kMaxPathLength))) return true; - - strcpy(fileArgs[numArgs++], (char *)&path); - } - else return err; - } - - if (! taskDone) pthread_create(&odtid, NULL, OpenDoc, NULL); - else pthread_create(&tid, NULL, Execute, NULL); - - return err; -} - -/////////////////////////////// -// Handler for clicking on app icon -/////////////////////////////// -// if app is already open -static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon) -{ - return runScript(); -} - -// if app is being opened -static OSErr AppOpenAppAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon) -{ - #pragma unused (reply, refCon, theAppleEvent) - - // the app has been opened without any items dragged on to it - pthread_create(&tid, NULL, Execute, NULL); - - return noErr; -} - - -static void OpenURL(Str255 url) -{ - // Use Internet Config to hand the URL to the appropriate application, as - // set by the user in the Internet Preferences pane. - ICInstance icInstance; - // Applications creator code: - OSType signature = 'Inks'; - OSStatus error = ICStart( &icInstance, signature ); - if ( error == noErr ) - { - ConstStr255Param hint = 0x0; - const char* data = url; - long length = strlen(url); - long start = 0; - long end = length; - // Don't bother testing return value (error); launched application will - // report problems. - ICLaunchURL( icInstance, hint, data, length, &start, &end ); - ICStop( icInstance ); - } -} - - -////////////////////////////////// -// Handler for when X11 fails to start -// Applies only to pre-Leopard OS X, as it's auto-started -// through launchd in Leopard and later -////////////////////////////////// -static OSStatus X11FailedHandler(EventHandlerCallRef theHandlerCall, - EventRef theEvent, void *userData) -{ - #pragma unused(theHanderCall, theEvent, userData) - - pthread_join(tid, NULL); - if (odtid) pthread_join(odtid, NULL); - - SInt16 itemHit; - const unsigned char *getX11 = "\pGet X11 for Panther"; - - AlertStdAlertParamRec params; - params.movable = true; - params.helpButton = false; - params.filterProc = NULL; - params.defaultText = (StringPtr) kAlertDefaultOKText; - params.cancelText = getX11; - params.otherText = NULL; - params.defaultButton = kAlertStdAlertOKButton; - params.cancelButton = kAlertStdAlertCancelButton; - params.position = kWindowDefaultPosition; - - StandardAlert(kAlertStopAlert, "\pFailed to start X11", - "\pWireshark.app requires Apple's X11, which is freely downloadable from Apple's website for Panther (10.3.x) users and available as an optional install from the installation DVD for Tiger (10.4.x) users.\n\nPlease install X11 and restart Wireshark.", - ¶ms, &itemHit); - - if (itemHit == kAlertStdAlertCancelButton) - { - OpenURL("http://www.apple.com/downloads/macosx/apple/macosx_updates/x11formacosx.html"); - } - - ExitToShell(); - - - return noErr; -} - - -// Compile and run a small AppleScript. The code below does no cleanup and no proper error checks -// but since it's there until the app is shut down, and since we know the script is okay, -// there should not be any problems. -ComponentInstance theComponent; -AEDesc scriptTextDesc; -OSStatus err; -OSAID scriptID, resultID; - -static OSStatus CompileAppleScript(const void* text, long textLength, - AEDesc *resultData) { - - resultData = NULL; - /* set up locals to a known state */ - theComponent = NULL; - AECreateDesc(typeNull, NULL, 0, &scriptTextDesc); - scriptID = kOSANullScript; - resultID = kOSANullScript; - - /* open the scripting component */ - theComponent = OpenDefaultComponent(kOSAComponentType, - typeAppleScript); - if (theComponent == NULL) { err = paramErr; return err; } - - /* put the script text into an aedesc */ - err = AECreateDesc(typeChar, text, textLength, &scriptTextDesc); - if (err != noErr) return err; - - /* compile the script */ - err = OSACompile(theComponent, &scriptTextDesc, - kOSAModeNull, &scriptID); - - return err; -} - -/* runs the compiled applescript */ -static OSErr runScript() -{ - /* run the script */ - err = OSAExecute(theComponent, scriptID, kOSANullScript, - kOSAModeNull, &resultID); - return err; -} - - -/* Simple shortcut to the function that actually compiles the applescript. */ -static OSStatus SimpleCompileAppleScript(const char* theScript) { - return CompileAppleScript(theScript, strlen(theScript), NULL); -} diff --git a/packaging/macosx/ScriptExec/openDoc b/packaging/macosx/ScriptExec/openDoc deleted file mode 100755 index 638dfb9848..0000000000 --- a/packaging/macosx/ScriptExec/openDoc +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# - -echo $1; diff --git a/packaging/macosx/ScriptExec/script b/packaging/macosx/ScriptExec/script deleted file mode 100755 index 638dfb9848..0000000000 --- a/packaging/macosx/ScriptExec/script +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# - -echo $1; diff --git a/packaging/macosx/ScriptExec/version.plist b/packaging/macosx/ScriptExec/version.plist deleted file mode 100644 index 56aa97f9ad..0000000000 --- a/packaging/macosx/ScriptExec/version.plist +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - BuildVersion - 17 - CFBundleShortVersionString - 0.1 - CFBundleVersion - 0.1 - ProjectName - NibPBTemplates - SourceVersion - 1150000 - - diff --git a/packaging/macosx/Wireshark.icns b/packaging/macosx/Wireshark.icns new file mode 100644 index 0000000000..21dcd6c0a1 Binary files /dev/null and b/packaging/macosx/Wireshark.icns differ diff --git a/packaging/macosx/Wiresharkdoc.icns b/packaging/macosx/Wiresharkdoc.icns new file mode 100644 index 0000000000..fb66002996 Binary files /dev/null and b/packaging/macosx/Wiresharkdoc.icns differ diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index be1faadcc8..f8e563c83b 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -49,12 +49,11 @@ create_bundle=false # the Info.plist file which is filled in by the configure script. bundle="Wireshark.app" -# "qt" or "gtk" -ui_toolkit="qt" # Name of the Wireshark executable wireshark_bin_name="wireshark" binary_list=" + $wireshark_bin_name capinfos dftest dumpcap @@ -92,7 +91,7 @@ echo -e " Create an app bundle for OS X USAGE - $0 [-s] [-l /path/to/libraries] [-qt] -bp /path/to/wireshark/binaries -p /path/to/Info.plist + $0 [-s] [-l /path/to/libraries] -bp /path/to/wireshark/binaries -p /path/to/Info.plist OPTIONS -h,--help @@ -125,10 +124,6 @@ OPTIONS has been run. -sdkroot Specify the root of the SDK to use. - -qt,--qt-flavor - Use the Qt flavor. This is the default. - -gtk,--gtk-flavor - Use the GTK+ flavor. EXAMPLE $0 -s -l /opt/local -bp ../../Build/bin -p Info.plist -sdkroot /Developer/SDKs/MacOSX10.5.sdk @@ -163,14 +158,6 @@ do -p|--plist) plist="$2" shift 1 ;; - -qt|--qt-flavor) - ui_toolkit="qt" - wireshark_bin_name="wireshark" - ;; - -gtk|--gtk-flavor) - ui_toolkit="gtk" - wireshark_bin_name="wireshark-gtk" - ;; -h|--help) help exit 0 ;; @@ -193,7 +180,7 @@ fi if [ "$create_bundle" = "true" ]; then echo -e "\nCREATE WIRESHARK APP BUNDLE\n" - for binary in $wireshark_bin_name $binary_list ; do + for binary in $binary_list ; do binary=$( basename $binary ) if [ ! -x "$binary_path/$binary" ]; then echo "Couldn't find $binary (or it's not executable)" >&2 @@ -218,26 +205,24 @@ elif [ ! -d "$bundle" ] ; then exit 1 fi -if [ "$ui_toolkit" = "qt" ] ; then - for i in 5 "" - do - qt_frameworks_dir=`pkg-config --libs Qt${i}Core | sed -e 's/-F//' -e 's/ -framework.*//'` - if [ ! -z "$qt_frameworks_dir" ] ; then - # found it - break; - fi - done - if [ -z "$qt_frameworks_dir" ] ; then - echo "Can't find the Qt frameworks directory" >&2 - exit 1 +for i in 5 "" +do + qt_frameworks_dir=`pkg-config --libs Qt${i}Core | sed -e 's/-F//' -e 's/ -framework.*//'` + if [ ! -z "$qt_frameworks_dir" ] ; then + # found it + break; fi - - # - # Leave the Qt frameworks out of the special processing. - # - exclude_prefixes="$exclude_prefixes|$qt_frameworks_dir" +done +if [ -z "$qt_frameworks_dir" ] ; then + echo "Can't find the Qt frameworks directory" >&2 + exit 1 fi +# +# Leave the Qt frameworks out of the special processing. +# +exclude_prefixes="$exclude_prefixes|$qt_frameworks_dir" + # Package paths pkgexec="$bundle/Contents/MacOS" pkgres="$bundle/Contents/Resources" @@ -252,101 +237,33 @@ resdir=`pwd` # This is only used by Autotools. This can be removed if we start using # CMake exclusively. create_bundle() { - # Handle some version specific details. - VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` - if [ "$VERSION" -ge "4" ]; then - # We're on Tiger (10.4) or later. - # XCode behaves a little differently in Tiger and later. - XCODEFLAGS="-configuration Deployment" - SCRIPTEXECDIR="ScriptExec/build/Deployment/ScriptExec.app/Contents/MacOS" - EXTRALIBS="" - else - # Panther (10.3) or earlier. - XCODEFLAGS="-buildstyle Deployment" - SCRIPTEXECDIR="ScriptExec/build/ScriptExec.app/Contents/MacOS" - EXTRALIBS="" - fi - - # Set the SDK root, if an SDK was specified. - # (-sdk is only supported by the xcodebuild in the version of the - # developer tools that came with Snow Leopard and later versions) - if [ ! -z "$sdkroot" ] - then - XCODEFLAGS="$XCODEFLAGS SDKROOT=$sdkroot" - fi - # Remove a previously existing bundle if necessary if [ -d $bundle ]; then echo "Removing previous $bundle" rm -Rf $bundle fi - # Remove a previously existing utility directory if necessary - if [ -d "$util_dir" ]; then - echo "Removing $util_dir directory" - rm -Rf "$util_dir" - fi - # Prepare Package #---------------------------------------------------------- - # - # For Qt, the Wireshark binary is the main binary of the app bundle. - # For GTK+, the Wireshark binary is wireshark-bin in - # Contents/Resources/bin, so some of the above setting have to change. - # - if [ "$ui_toolkit" = "gtk" ] ; then - pkgbin="$pkgres/bin" - pkglib="$pkgres/lib" - fi - mkdir -p "$pkgexec" mkdir -p "$pkgexec/extcap" mkdir -p "$pkgbin" mkdir -p "$pkgplugin" - if [ "$ui_toolkit" = "qt" ] ; then - cp -v "$binary_path/$wireshark_bin_name" "$pkgexec/Wireshark" - else - # Build and add the launcher - #---------------------------------------------------------- - ( - # Build fails if CC happens to be set (to anything other than CompileC) - unset CC - - cd "$resdir/ScriptExec" - echo -e "Building launcher...\n" - xcodebuild $XCODEFLAGS clean build - ) - cp "$resdir/$SCRIPTEXECDIR/ScriptExec" "$pkgexec/Wireshark" - - fi + cp -v "$binary_path/$wireshark_bin_name" "$pkgexec/Wireshark" # Copy all files into the bundle #---------------------------------------------------------- echo -e "\nFilling app bundle and utility directory...\n" # Wireshark executables - if [ "$ui_toolkit" = "gtk" ] ; then - for binary in $binary_list wireshark ; do - # Copy the binary to its destination - dest_path="$pkgbin/$binary-bin" - cs_binary_list="$cs_binary_list $dest_path" - cp -v "$binary_path/$binary" "$dest_path" - # TODO Add a "$verbose" variable and command line switch, which sets wether these commands are verbose or not - - if [ "$binary" != "wireshark" ] ; then - ln -sv ./wireshark "$pkgbin/$binary" - fi - done - elif [ "$ui_toolkit" = "qt" ] ; then - for binary in $binary_list ; do - # Copy the binary to its destination - bin_dest="$pkgexec" - cp -v "$binary_path/$binary" "$bin_dest" - cs_binary_list="$cs_binary_list $bin_dest/$binary" - done - fi + for binary in $binary_list ; do + # Copy the binary to its destination + bin_dest="$pkgexec" + cp -v "$binary_path/$binary" "$bin_dest" + cs_binary_list="$cs_binary_list $bin_dest/$binary" + done # # extcap binaries @@ -382,95 +299,13 @@ create_bundle() { Wiresharkdoc.icns " - if [ "$ui_toolkit" = "gtk" ] ; then - res_list=" - $res_list - bin - etc - openDoc - script - MenuBar.nib - ProgressWindow.nib - themes - " - fi - for rl_entry in $res_list ; do - rsync -av "$resdir"/Resources/$rl_entry "$bundle"/Contents/Resources/ + rsync -av "$resdir"/$rl_entry "$bundle"/Contents/Resources/ done # PkgInfo must match bundle type and creator code from Info.plist echo "APPLWshk" > $bundle/Contents/PkgInfo - if [ "$ui_toolkit" = "gtk" ] ; then - echo -e "\nPulling in GTK+ libraries and resources...\n" - - # Pull in extra requirements for Pango and GTK - pkgetc="$bundle/Contents/Resources/etc" - mkdir -p $pkgetc/pango - cp $LIBPREFIX/etc/pango/pangox.aliases $pkgetc/pango/ - # Need to adjust path and quote in case of spaces in path. - sed -e "s,$LIBPREFIX,\"\${CWD},g" -e 's,\.so ,.so" ,g' $LIBPREFIX/etc/pango/pango.modules > $pkgetc/pango/pango.modules - cat > $pkgetc/pango/pangorc < $pkgetc/gtk-2.0/gdk-pixbuf.loaders - fi - sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/etc/gtk-2.0/gtk.immodules > $pkgetc/gtk-2.0/gtk.immodules - - pango_version=`pkg-config --variable=pango_module_version pango` - mkdir -p $pkglib/pango/$pango_version/modules - cp $LIBPREFIX/lib/pango/$pango_version/modules/*.so $pkglib/pango/$pango_version/modules/ - - gtk_version=`pkg-config --variable=gtk_binary_version gtk+-2.0` - mkdir -p $pkglib/gtk-2.0/$gtk_version/{engines,immodules,loaders} - cp -r $LIBPREFIX/lib/gtk-2.0/$gtk_version/* $pkglib/gtk-2.0/$gtk_version/ - - gdk_pixbuf_version=`pkg-config --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0` - if [ ! -z $gdk_pixbuf_version ]; then - mkdir -p $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders - # - # As per the above, check whether we have a loaders.cache file - # in $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version, as - # that's where the output of gdk-pixbuf-query-loaders gets - # put if gdk-pixbuf and GTK+ are separated. - # - # The file is ultimately copied to the user's home directory, - # with the pathnames adjusted to refer to the installed bundle, - # so we always put it in the same location in the installed - # bundle, regardless of where it lives in the machine on which - # it's built. - # - if [ -e $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache ] - then - sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache > $pkgetc/gtk-2.0/gdk-pixbuf.loaders - fi - cp -r $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/* $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders - fi - fi # GTK+ / Qt } # create_bundle if [ "$create_bundle" = "true" ]; then @@ -478,7 +313,6 @@ if [ "$create_bundle" = "true" ]; then fi if [ -z "$cs_binary_list" ]; then - # Assumes Qt. for binary in Wireshark $binary_list ; do cs_binary_list="$cs_binary_list $pkgexec/$binary" done @@ -495,22 +329,8 @@ endl=true lib_dep_search_list=" $pkglib/* $pkgbin/*-bin + $pkgexec/Wireshark " -if [ "$ui_toolkit" = "gtk" ] ; then - lib_dep_search_list=" - $lib_dep_search_list - $pkglib/gtk-2.0/$gtk_version/loaders/* - $pkglib/gtk-2.0/$gtk_version/immodules/* - $pkglib/gtk-2.0/$gtk_version/engines/*.so - $pkglib/pango/$pango_version/modules/* - $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/* - " -elif [ "$ui_toolkit" = "qt" ] ; then - lib_dep_search_list=" - $pkgexec/Wireshark - $lib_dep_search_list - " -fi while $endl; do echo -e "Looking for dependencies. Round" $a @@ -532,11 +352,6 @@ while $endl; do fi done -# Add extra libraries of necessary -for libfile in $EXTRALIBS -do - cp -v -f $libfile "$pkglib" -done chmod 755 "$pkglib"/*.dylib # Strip libraries and executables if requested @@ -547,23 +362,20 @@ if [ "$strip" = "true" ]; then strip -ur "$binpath" fi -if [ "$ui_toolkit" = "qt" ] ; then - # - # This may not work on Qt 5.5.0 or 5.5.1: - # https://bugreports.qt.io/browse/QTBUG-47868 - # - macdeployqt "$bundle" -verbose=2 || exit 1 +# +# This may not work on Qt 5.5.0 or 5.5.1: +# https://bugreports.qt.io/browse/QTBUG-47868 +# +macdeployqt "$bundle" -verbose=2 || exit 1 - # - # The build process added to the Wireshark binary an rpath entry - # pointing to the directory containing the Qt frameworks; remove - # that entry from the Wireshark binary in the package. - # - /usr/bin/install_name_tool -delete_rpath "$qt_frameworks_dir" $pkgbin/Wireshark -fi +# +# The build process added to the Wireshark binary an rpath entry +# pointing to the directory containing the Qt frameworks; remove +# that entry from the Wireshark binary in the package. +# +/usr/bin/install_name_tool -delete_rpath "$qt_frameworks_dir" $pkgbin/Wireshark -# NOTE: we must rpathify *all* files, *including* plugins for GTK+ etc., -# to keep GTK+ from crashing at startup. +# NOTE: we must rpathify *all* files, *including* Qt libraries etc., # rpathify_file () { # Fix a given executable, library, or plugin to be relocatable @@ -726,19 +538,7 @@ rpathify_files () { rpathify_dir "$pkgbin" "*" rpathify_dir "$pkgplugin" "*" - if [ "$ui_toolkit" = "qt" ] ; then - rpathify_dir "$pkgbin/extcap" "*" - fi - - if [ "$ui_toolkit" = "gtk" ] ; then - rpathify_dir "$pkglib/gtk-2.0/$gtk_version/loaders" "*.so" - rpathify_dir "$pkglib/gtk-2.0/$gtk_version/engines" "*.so" - rpathify_dir "$pkglib/gtk-2.0/$gtk_version/immodules" "*.so" - rpathify_dir "$pkglib/gtk-2.0/$gtk_version/printbackends" "*.so" - rpathify_dir "$pkglib/gnome-vfs-2.0/modules" "*.so" - rpathify_dir "$pkglib/gdk-pixbuf-2.0/$gtk_version/loaders" "*.so" - rpathify_dir "$pkglib/pango/$pango_version/modules" "*.so" - fi + rpathify_dir "$pkgbin/extcap" "*" } PATHLENGTH=`echo $LIBPREFIX | wc -c` diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in index e14179f6fb..499bc0a245 100755 --- a/packaging/macosx/osx-dmg.sh.in +++ b/packaging/macosx/osx-dmg.sh.in @@ -44,10 +44,6 @@ src_dir="." tmp_dir="/tmp/dmg-$$" auto_open_opt= -# Qt defaults -readme_name="Read_me_first_qt.rtf" -bundle_bin_name="Wireshark" - if [ -f /Applications/Xcode.app/Contents/Applications/PackageMaker.app/Contents/MacOS/PackageMaker ] then # @@ -101,10 +97,6 @@ OPTIONS -b,--app-bundle Set the path to the Wireshark.app that should be copied in the dmg. - -qt,--qt-flavor - Use the Qt flavor. This is the default. - -gtk,--gtk-flavor - Use the GTK+ flavor. -S,--source-directory If this is an out-of-tree build, set this to the path to the packaging/macosx source directory. @@ -123,12 +115,6 @@ do -b|--app-bundle) app_bundle="$2" shift 1 ;; - -qt|--qt-flavor) - ;; - -gtk|--gtk-flavor) - readme_name="Read_me_first_gtk.rtf" - bundle_bin_name="wireshark-bin" - ;; -S|--source-directory) src_dir="$2" shift 1 ;; @@ -147,7 +133,7 @@ if [ ! -e "$app_bundle" ]; then fi # Get the architecture -ws_bin="$app_bundle/Contents/MacOS/$bundle_bin_name" +ws_bin="$app_bundle/Contents/MacOS/Wireshark" case `file $ws_bin` in *Mach-O*64-bit*x86_64*) architecture="Intel 64" @@ -155,12 +141,6 @@ case `file $ws_bin` in *Mach-O*i386*) architecture="Intel 32" ;; - *Mach-O*ppc64*) - architecture="PPC 64" - ;; - *Mach-O*ppc*) - architecture="PPC 32" - ;; *) echo "Cannot determine architecture of $ws_bin; file reports:" file $ws_bin @@ -211,7 +191,7 @@ echo -e "Copying files to temp directory" # Copy the installer package cp "$pkg_file" "$tmp_dir"/ || exit 1 # Copy the readme -cp "$src_dir/$readme_name" "$tmp_dir"/"Read me first.rtf" || exit 1 +cp "$src_dir/Read_me_first.rtf" "$tmp_dir"/"Read me first.rtf" || exit 1 # If the appearance settings are not to be modified we just copy them if [ ${set_ds_store} = "false" ]; then -- cgit v1.2.3