dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	os/macosx/notarize.sh
#	src/3rdparty/CMakeLists.txt
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/3rdparty/squirrel/squirrel/sqdebug.cpp
#	src/3rdparty/squirrel/squirrel/sqvm.cpp
#	src/console_cmds.cpp
#	src/core/span_type.hpp
#	src/crashlog.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/driver.cpp
#	src/fios.cpp
#	src/genworld_gui.cpp
#	src/hotkeys.cpp
#	src/misc_gui.cpp
#	src/music/os2_m.cpp
#	src/network/core/os_abstraction.h
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_text.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/macosx/misc_osx.cpp
#	src/os/os2/CMakeLists.txt
#	src/os/os2/os2.cpp
#	src/os/unix/CMakeLists.txt
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32_main.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_text.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/stdafx.h
#	src/strings.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/video/dedicated_v.cpp
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/waypoint_gui.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
#	src/window_gui.h
This commit is contained in:
Jonathan G Rennison
2023-09-12 20:06:47 +01:00
parent 3e3e083770 5db4473ae8
commit c8817d7f4e
242 changed files with 4733 additions and 6402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
os/macosx/notarize.sh
View File

@@ -5,11 +5,8 @@ set -e
# If you are building an unofficial branch of OpenTTD, please change the bundle
# ID in Info.plist and below.
#
# This uses `gon' to perform notarization:
#
# https://github.com/mitchellh/gon
#
# Follow the setup instructions on the gon site to install.
# This uses the Xcode notarytool to perform notarization. You must set up a keychain
# profile called "openttd" using the "store-credentials" notarytool command beforehand.
#
# Before executing this script, you must first configure CMake with at least the following
# parameters:
@@ -22,19 +19,11 @@ set -e
# This will sign the application with your signing certificate, and will enable
# the hardened runtime.
#
# You also need to set your Apple Developer username and password (app-specific password
# is recommended) in the AC_USERNAME and AC_PASSWORD environment variables.
#
# Then, ensuring you're in your build directory and that the "bundles" directory
# exists with a .dmg in it (clear out any old DMGs first), run:
#
# ../os/macosx/notarize.sh
if [ -z "${AC_USERNAME}" ]; then
echo AC_USERNAME not set, skipping notarization.
exit 0
fi;
dmg_filename=(bundles/*.dmg)
if [ "${dmg_filename}" = "bundles/*.dmg" ]; then
@@ -43,24 +32,15 @@ if [ "${dmg_filename}" = "bundles/*.dmg" ]; then
exit 1
fi;
cat <<EOF > notarize.json
{
"notarize": [
{
"path": "${dmg_filename[0]}",
"bundle_id": "org.openttd.openttd.jgrpp",
"staple": true
}
]
}
EOF
xcrun notarytool submit ${dmg_filename[0]} --keychain-profile "openttd" --wait
gon notarize.json
# Staple the ticket to the .dmg
xcrun stapler staple "${dmg_filename[0]}"
app_filename=(_CPack_Packages/*/Bundle/openttd-*/OpenTTD.app)
if [ "${app_filename}" = "_CPack_Packages/*/Bundle/openttd-*/OpenTTD.app" ]; then
echo "No .app found in the _CPack_Packages directory, skipping stapling."
echo "No .app found in the _CPack_Packages directory, skipping app stapling."
exit 0
fi;