Use separate "Read me first" files for Qt and GTK+.

svn path=/trunk/; revision=52321

diff --git a/Makefile.am b/Makefile.am
index 415d37d6a7b6dab31d2f0a5f9c6191d117be65e5..91285870e9ec70e0e4c661aa6a5db6a0bf40477b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1150,7 +1150,7 @@ osx-package: osx-app packaging/macosx/COPYING.txt
        @if test x$(HAVE_OSX_PACKAGING) = xyes ; then \
                cd $(srcdir)/packaging/macosx ;  \
                chmod +x ./osx-dmg.sh ; \
-               ./osx-dmg.sh ; \
+               ./osx-dmg.sh @OSX_DMG_FLAGS@ ; \
        fi
 
 osx-install: osx-app

diff --git a/configure.ac b/configure.ac
index 9997aea9b215fb35cd28470b9cabe24601d3e89b..864560aecadcd65ba5af709d5df37b9ee7300d55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1346,6 +1346,7 @@ if test "x$enable_wireshark" = "xyes"; then
                        have_qt=yes             
                        GUI_CONFIGURE_FLAGS="$GUI_CONFIGURE_FLAGS --with-qt"
                        OSX_APP_FLAGS="$OSX_APP_FLAGS -qt"
+                       OSX_DMG_FLAGS="-qt"
                ],
                [AC_MSG_ERROR([Qt is not available])])
 
@@ -1701,6 +1702,7 @@ AC_SUBST(wireshark_man)
 AM_CONDITIONAL(HAVE_Qt, test "$have_qt" = "yes")
 AM_CONDITIONAL(HAVE_GTK, test "$have_gtk" = "yes")
 AC_SUBST(OSX_APP_FLAGS)
+AC_SUBST(OSX_DMG_FLAGS)
 
 
 # Enable/disable tshark

diff --git a/packaging/macosx/Makefile.am b/packaging/macosx/Makefile.am
index 29a468da693fc9d77e1f75984226a969584ae248..0889ee2431acf3b38aa16d6d87232c124eb2e010 100644 (file)
--- a/packaging/macosx/Makefile.am
+++ b/packaging/macosx/Makefile.am
@@ -27,7 +27,8 @@ EXTRA_DIST = \
        native-gtk/glibconfig.h \
        osx-app.sh      \
        osx-dmg.sh.in   \
-       Read_me_first.rtf       \
+       Read_me_first_gtk.rtf   \
+       Read_me_first_qt.rtf    \
        Resources/bin/getdisplay.sh     \
        Resources/bin/wireshark \
        Resources/etc/fonts/fonts.conf  \

diff --git a/packaging/macosx/Read_me_first.rtf b/packaging/macosx/Read_me_first_gtk.rtf
similarity index 78%
rename from packaging/macosx/Read_me_first.rtf
rename to packaging/macosx/Read_me_first_gtk.rtf
index df58744f693f6850689d5b79a745d3a6a6529667..3d93daec51b4ac16912422293ea11d6fef6d59a2 100644 (file)
--- a/packaging/macosx/Read_me_first.rtf
+++ b/packaging/macosx/Read_me_first_gtk.rtf
@@ -1,40 +1,40 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\froman\fcharset0 TimesNewRomanPSMT;\f1\fswiss\fcharset0 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
+\cocoascreenfonts1{\fonttbl\f0\froman\fcharset0 TimesNewRomanPSMT;\f1\fswiss\fcharset0 Helvetica;}
 {\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}}
 {\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}}
 \margl1440\margr1440\vieww13060\viewh12960\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+\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\ql\qnatural\pardirnatural
+\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 MacPorts or Fink.
+\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\ql\qnatural\pardirnatural
+\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\ql\qnatural\pardirnatural
+\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\ql\qnatural\pardirnatural
+\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\ql\qnatural\pardirnatural
+\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\ql\qnatural\pardirnatural
+\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\ql\qnatural\pardirnatural
+\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\ql\qnatural\pardirnatural
+\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
 \i0 . The main Wireshark application.\
@@ -46,18 +46,19 @@ Quick Setup\
 {\listtext     \'95    }
 \i /Library/Wireshark
 \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 /Library/Wireshark to your PATH.\
-\pard\tx560\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+\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\ql\qnatural\pardirnatural
+\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 \
-\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\ql\qnatural\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

diff --git a/packaging/macosx/Read_me_first_qt.rtf b/packaging/macosx/Read_me_first_qt.rtf
new file mode 100644 (file)
index 0000000..f08cd71
--- /dev/null
+++ b/packaging/macosx/Read_me_first_qt.rtf
@@ -0,0 +1,75 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
+\cocoascreenfonts1{\fonttbl\f0\froman\fcharset0 TimesNewRomanPSMT;\f1\fswiss\fcharset0 Helvetica;}
+{\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}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}}
+\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
+\i0 . The main Wireshark application.\
+{\listtext     \'95    }
+\i /Library/StartupItems/ChmodBPF
+\i0 . A script which adjusts permissions on the system's packet capture devices (
+\i /dev/bpf
+\i0 *) when the system starts up.\
+{\listtext     \'95    }
+\i /Library/Wireshark
+\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 /Library/Wireshark to 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
+\i0 \
+{\listtext     2.      }Remove 
+\i /Library/Wireshark
+\i0 \
+{\listtext     3.      }Remove 
+\i /Library/StartupItems/ChmodBPF
+\i0 \
+{\listtext     4.      }Remove the 
+\i access_bpf
+\i0  group.\
+}
\ No newline at end of file

diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in
index 30d3e225cd98820184fbe271a1bb8a185ab5e5fe..b565696eb5969a397daf4577adadf038b72ad3a5 100755 (executable)
--- a/packaging/macosx/osx-dmg.sh.in
+++ b/packaging/macosx/osx-dmg.sh.in
@@ -46,6 +46,7 @@ tmp_dir="/tmp/dmg-$$"
 auto_open_opt=
 utilities="Utilities"
 ws_bin="$app_bundle/Contents/Resources/bin/wireshark-bin"
+readme_name="Read_me_first_gtk.rtf"
 
 if [ -d /Applications/Xcode.app/Developer ]
 then
@@ -59,11 +60,6 @@ then
        PATH=$PATH:$developer_path/Tools:$developer_path/usr/bin
 fi
 
-if [ ! -f "$ws_bin" ] ; then
-       # Assume it's a native (Qt) build
-       ws_bin="$app_bundle/Contents/MacOS/Wireshark"
-fi
-
 # Help message
 #----------------------------------------------------------
 help()
@@ -82,6 +78,8 @@ 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
 "
 }
 
@@ -97,6 +95,10 @@ do
                -b|--app-bundle)
                        app_bundle="$2"
                        shift 1 ;;
+               -qt|--qt-flavor)
+                       readme_name="Read_me_first_qt.rtf"
+                       ws_bin="$app_bundle/Contents/MacOS/Wireshark"
+                       ;;
                *)
                        echo "Invalid command line option"
                        exit 2 ;;
@@ -169,7 +171,7 @@ cp -rf "$pkg_file" "$tmp_dir"/ || exit 1
 #cp -rf "$utilities" "$tmp_dir"/
 #ln -sf /Library/StartupItems "$tmp_dir/$utilities"/
 # Copy the readme
-cp -rf  Read_me_first.rtf "$tmp_dir"/"Read me first.rtf" || exit 1
+cp -rf  "$readme_name" "$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