Wireshark-commits: [Wireshark-commits] master-3.0 c610c47: macOS: Use dmgbuild to build our .dmg.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 08 Oct 2019 16:31:37 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c610c47aa8cd64e5b2da19bc0576c52d7375d40d
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

c610c47 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    macOS: Use dmgbuild to build our .dmg.
    
    Scripting the Finder in order to lay out our disk image assumes that we
    have access to the Finder. This might not be the case on our builder,
    and it arguably shoudn't be.
    
    Switch from using a Bash script + AppleScript to build and lay out our
    .dmg to using dmgbuild, which creates our .DS_Store directly using
    Python's ds_store module.
    
    Change-Id: I2e4a9dd89bc8297c9cbd9df7aa8d3a44447bde85
    Reviewed-on: https://code.wireshark.org/review/34623
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit b789895c1bcb13a400ecbe7018d534f579b0faf1)
    Reviewed-on: https://code.wireshark.org/review/34738
    

Actions performed:

    from  1ad0a30   macOS: Disable arrange_dmg.applescript.
     add  c610c47   macOS: Use dmgbuild to build our .dmg.


Summary of changes:
 .editorconfig                               |   2 +-
 CMakeLists.txt                              |  43 +++---
 packaging/macosx/arrange_dmg.applescript.in |  43 ------
 packaging/macosx/dmgbuild-settings.py.in    | 147 +++++++++++++++++++++
 packaging/macosx/osx-dmg.sh.in              | 196 ----------------------------
 5 files changed, 171 insertions(+), 260 deletions(-)
 delete mode 100644 packaging/macosx/arrange_dmg.applescript.in
 create mode 100644 packaging/macosx/dmgbuild-settings.py.in
 delete mode 100755 packaging/macosx/osx-dmg.sh.in