Wireshark · Wireshark-commits: [Wireshark-commits] master-3.0 5c9309d: macOS: Make Wireshark.app drag-installable.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5c9309d44f99964531ab9d5d8db5e766f443365e
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

5c9309d by Gerald Combs (gerald@xxxxxxxxxxxxx):

    macOS: Make Wireshark.app drag-installable.
    
    Create ChmodBPF installer and uninstaller packages using pkgbuild and
    productbuild. Place them in Wireshark.app/Resources/Extras.
    
    Add a path_helper installer and uninstaller which respectively add and
    remove /etc/*paths.d/Wireshark.
    
    Remove the PackageMaker and utility-launcher assets and build targets.
    
    Show a message in the main welcome screen if we don't have capture
    permissions. Add an link which launches the ChmodBPF installer.
    
    Add a "macOS Extras" item to About → Folders.
    
    Migrate "Read me first" from RTF to Asciidoctor, which lets us add links
    and looks like our other documentation.
    
    Rename dmg_set_style.scpt to arrange_dmg.applescript and make it plain
    text. Always run it in osx-dmg.sh.
    
    Conflicts:
    	CMakeLists.txt
    	docbook/release-notes.adoc
    
    Bug: 6991
    Bug: 12593
    Bug: 11399
    Ping-Bug: 16074
    Change-Id: I7b6aa89aae2be522b4141b0d44e8142dec749e90
    Reviewed-on: https://code.wireshark.org/review/31047
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit ac4f3c0f4ddad04f0be16513357b3f03d6e565ab)
    Reviewed-on: https://code.wireshark.org/review/34724
    

Actions performed:

    from  3f29875   extcap: Multiple extcap instance support on Windows
     add  5c9309d   macOS: Make Wireshark.app drag-installable.


Summary of changes:
 CMakeLists.txt                                     | 146 +++++++++--
 docbook/release-notes.asciidoc                     |   1 +
 packaging/macosx/ChmodBPF/install-distribution.xml |  25 ++
 .../install-scripts/postinstall}                   |   0
 .../Wireshark/ChmodBPF}/ChmodBPF                   |   0
 .../LaunchDaemons}/org.wireshark.ChmodBPF.plist    |   0
 .../macosx/ChmodBPF/uninstall-distribution.xml     |  25 ++
 .../macosx/ChmodBPF/uninstall-scripts/postinstall  |  22 ++
 packaging/macosx/Read_me_first.adoc                |  72 ++++++
 packaging/macosx/Read_me_first.rtf.in              | 120 ---------
 packaging/macosx/Scripts/cli-postinstall.sh        |  27 --
 packaging/macosx/Scripts/cli-preinstall.sh         |  18 --
 packaging/macosx/Scripts/wireshark-postinstall.sh  |  40 ---
 packaging/macosx/Scripts/wireshark-preflight.sh    |  16 --
 .../01wireshark-contents.xml                       |   1 -
 .../macosx/Wireshark_package.pmdoc/01wireshark.xml |   1 -
 .../02chmodbpf-contents.xml                        |   1 -
 .../macosx/Wireshark_package.pmdoc/02chmodbpf.xml  |   1 -
 .../Wireshark_package.pmdoc/03utility-contents.xml |   1 -
 .../macosx/Wireshark_package.pmdoc/03utility.xml   |  36 ---
 .../macosx/Wireshark_package.pmdoc/index.xml.in    |   1 -
 packaging/macosx/arrange_dmg.applescript.in        |  43 ++++
 packaging/macosx/dmg_background.png                | Bin 46488 -> 1895 bytes
 packaging/macosx/dmg_background.svg                | 165 ++++---------
 packaging/macosx/dmg_set_style.scpt                | Bin 7968 -> 0 bytes
 packaging/macosx/osx-dmg.sh.in                     | 166 +++----------
 .../macosx/path_helper/install-distribution.xml    |  24 ++
 .../path_helper/root/etc/manpaths.d/Wireshark      |   1 +
 .../macosx/path_helper/root/etc/paths.d/Wireshark  |   1 +
 .../macosx/path_helper/uninstall-distribution.xml  |  24 ++
 .../path_helper/uninstall-scripts/postinstall      |   8 +
 packaging/macosx/root.ds_store                     | Bin 15364 -> 0 bytes
 packaging/macosx/util.ds_store                     | Bin 6148 -> 0 bytes
 packaging/macosx/util_background.png               | Bin 47033 -> 0 bytes
 packaging/macosx/util_background.svg               | 273 ---------------------
 packaging/macosx/utility-launcher/wireshark        |  23 --
 ui/qt/about_dialog.cpp                             |   7 +
 ui/qt/interface_frame.cpp                          | 159 +++++++-----
 ui/qt/interface_frame.h                            |   7 +-
 ui/qt/interface_frame.ui                           |  17 +-
 40 files changed, 569 insertions(+), 903 deletions(-)
 create mode 100644 packaging/macosx/ChmodBPF/install-distribution.xml
 rename packaging/macosx/{Scripts/chmodbpf-postinstall.sh => ChmodBPF/install-scripts/postinstall} (100%)
 rename packaging/macosx/ChmodBPF/{ => root/Library/Application Support/Wireshark/ChmodBPF}/ChmodBPF (100%)
 rename packaging/macosx/ChmodBPF/{ => root/Library/LaunchDaemons}/org.wireshark.ChmodBPF.plist (100%)
 create mode 100644 packaging/macosx/ChmodBPF/uninstall-distribution.xml
 create mode 100755 packaging/macosx/ChmodBPF/uninstall-scripts/postinstall
 create mode 100644 packaging/macosx/Read_me_first.adoc
 delete mode 100644 packaging/macosx/Read_me_first.rtf.in
 delete mode 100755 packaging/macosx/Scripts/cli-postinstall.sh
 delete mode 100755 packaging/macosx/Scripts/cli-preinstall.sh
 delete mode 100755 packaging/macosx/Scripts/wireshark-postinstall.sh
 delete mode 100755 packaging/macosx/Scripts/wireshark-preflight.sh
 delete mode 100644 packaging/macosx/Wireshark_package.pmdoc/01wireshark-contents.xml
 delete mode 100644 packaging/macosx/Wireshark_package.pmdoc/01wireshark.xml
 delete mode 100644 packaging/macosx/Wireshark_package.pmdoc/02chmodbpf-contents.xml
 delete mode 100644 packaging/macosx/Wireshark_package.pmdoc/02chmodbpf.xml
 delete mode 100644 packaging/macosx/Wireshark_package.pmdoc/03utility-contents.xml
 delete mode 100644 packaging/macosx/Wireshark_package.pmdoc/03utility.xml
 delete mode 100644 packaging/macosx/Wireshark_package.pmdoc/index.xml.in
 create mode 100644 packaging/macosx/arrange_dmg.applescript.in
 delete mode 100755 packaging/macosx/dmg_set_style.scpt
 create mode 100644 packaging/macosx/path_helper/install-distribution.xml
 create mode 100644 packaging/macosx/path_helper/root/etc/manpaths.d/Wireshark
 create mode 100644 packaging/macosx/path_helper/root/etc/paths.d/Wireshark
 create mode 100644 packaging/macosx/path_helper/uninstall-distribution.xml
 create mode 100755 packaging/macosx/path_helper/uninstall-scripts/postinstall
 delete mode 100644 packaging/macosx/root.ds_store
 delete mode 100644 packaging/macosx/util.ds_store
 delete mode 100644 packaging/macosx/util_background.png
 delete mode 100644 packaging/macosx/util_background.svg
 delete mode 100755 packaging/macosx/utility-launcher/wireshark