macOS: Add an initial donation page to the .dmg

Add a donation page to the .dmg package.
This commit is contained in:
Gerald Combs 2023-01-10 18:04:34 -08:00
parent 9c68879a27
commit 29ca9c289f
5 changed files with 1367 additions and 136 deletions

View File

@ -3408,6 +3408,20 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark)
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Wireshark_read_me_first.adoc
)
set(_wireshark_donate "packaging/macosx/wireshark/Donate to the Wireshark Foundation.html")
ADD_CUSTOM_COMMAND(
OUTPUT
${_wireshark_donate}
COMMAND ${ASCIIDOCTOR_EXECUTABLE}
--backend html
--out-file ${_wireshark_donate}
--attribute include-dir=${CMAKE_SOURCE_DIR}/docbook
--attribute min-macos-version=${MIN_MACOS_VERSION}
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Donate_to_the_Wireshark_Foundation.adoc
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Donate_to_the_Wireshark_Foundation.adoc
)
set(_wireshark_dsym_installation "packaging/macosx/wireshark/Debugging symbols installation.html")
ADD_CUSTOM_COMMAND(
OUTPUT
@ -3421,7 +3435,7 @@ if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark)
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Wireshark_dsym_installation.adoc
)
add_custom_target(wireshark_dmg_readmes DEPENDS ${_wireshark_read_me_first} ${_wireshark_dsym_installation} )
add_custom_target(wireshark_dmg_readmes DEPENDS ${_wireshark_read_me_first} ${_wireshark_donate} ${_wireshark_dsym_installation} )
add_dependencies(wireshark_dmg_prep wireshark_dmg_readmes)
ADD_CUSTOM_TARGET( wireshark_dmg

View File

@ -0,0 +1,15 @@
// Required attributes:
// include-dir
include::{include-dir}/attributes.adoc[]
:stylesheet: {include-dir}/ws.css
== The Wireshark Founation
The https://wiresharkfoundation.org/[Wireshark Foundation] is a non-profit organization helping as many people as possible understand their networks as much as possible.
As time goes on, more and more of our daily life happens using software, and that software relies on network connectivity.
By hosting educational conferences, the Wireshark Foundation provides industry professionals and students with the knowledge and understanding required to ensure that the networks and systems we depend on are reliable, fast, and secure.
The Wireshark Foundation fosters open source development and explores new ways of educating the public.
You can learn more and donate at https://wiresharkfoundation.org/[wiresharkfoundation.org].

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 100 KiB

View File

@ -24,6 +24,7 @@ ws_srcdir = '@CMAKE_SOURCE_DIR@'
ws_bindir = '@CMAKE_BINARY_DIR@'
ws_app = 'Wireshark.app'
ws_readme = 'Read me first.html'
ws_donate = 'Donate to the Wireshark Foundation.html'
ws_install_chmodbpf = 'Install ChmodBPF.pkg'
ws_uninstall_chmodbpf = 'Uninstall ChmodBPF.pkg'
ws_install_path_helper = 'Add Wireshark to the system path.pkg'
@ -73,6 +74,7 @@ size = None
files = [
os.path.join(ws_bindir, 'run', ws_app),
os.path.join(ws_bindir, 'packaging', 'macosx', 'wireshark', ws_readme),
os.path.join(ws_bindir, 'packaging', 'macosx', 'wireshark', ws_donate),
]
# Symlinks to create
@ -93,15 +95,19 @@ symlinks = {
badge_icon = os.path.join(ws_srcdir, 'packaging', 'macosx', 'wsiconvol.icns')
#badge_icon = icon_from_app(application)
# Window position in ((x, y), (w, h)) format
window_rect = ((600, 200), (360, 550))
# Where to put the icons
icon_locations = {
ws_app: ( 80, 64),
'Applications': (240, 64),
ws_readme: (160, 170),
ws_install_chmodbpf: ( 80, 276),
ws_uninstall_chmodbpf: (250, 276),
ws_install_path_helper: ( 80, 382),
ws_uninstall_path_helper: (250, 382),
'Applications': (250, 64),
ws_readme: ( 80, 180),
ws_donate: (250, 180),
ws_install_chmodbpf: ( 80, 296),
ws_uninstall_chmodbpf: (250, 296),
ws_install_path_helper: ( 80, 402),
ws_uninstall_path_helper: (250, 402),
}
# .. Window configuration ......................................................
@ -135,9 +141,6 @@ show_pathbar = False
show_sidebar = False
sidebar_width = 180
# Window position in ((x, y), (w, h)) format
window_rect = ((600, 200), (350, 525))
# Select the default view; must be one of
#
# 'icon-view'