miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix macos bundles file names in gha

Browse Source
This commit is contained in:
dP
2021-10-17 11:55:21 +03:00
parent 07e3e7904e
commit 9aa44df57b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

@@ -649,7 +649,7 @@ jobs:
# the zip_filename variable below # the zip_filename variable below
rm -f ../*.dmg rm -f ../*.dmg
zip_filename=../citymania-client-${{ needs.source.outputs.version }} zip_filename=../citymania-client-${{ needs.source.outputs.version }}-macos-universal
# Package up the existing, notarised .app into a zip file # Package up the existing, notarised .app into a zip file
zip -r -9 ${zip_filename}.zip OpenTTD.app zip -r -9 ${zip_filename}.zip OpenTTD.app

8
cmake/InstallAndPackage.cmake
View File

@@ -127,9 +127,9 @@ if(APPLE)
include(PackageBundle) include(PackageBundle)
if (APPLE_UNIVERSAL_PACKAGE) if (APPLE_UNIVERSAL_PACKAGE)
set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-universal") set(CPACK_PACKAGE_FILE_NAME "citymania-client-#CPACK_PACKAGE_VERSION#-macos-universal")
else() else()
set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-${CPACK_SYSTEM_NAME}") set(CPACK_PACKAGE_FILE_NAME "citymania-client-#CPACK_PACKAGE_VERSION#-macos-${CPACK_SYSTEM_NAME}")
endif() endif()
elseif(WIN32) elseif(WIN32)
set(CPACK_GENERATOR "ZIP") set(CPACK_GENERATOR "ZIP")
@@ -138,7 +138,7 @@ elseif(WIN32)
include(PackageNSIS) include(PackageNSIS)
endif() endif()
set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-windows-${CPACK_SYSTEM_NAME}") set(CPACK_PACKAGE_FILE_NAME "citymania-client-#CPACK_PACKAGE_VERSION#-windows-${CPACK_SYSTEM_NAME}")
if(WINDOWS_CERTIFICATE_COMMON_NAME) if(WINDOWS_CERTIFICATE_COMMON_NAME)
add_custom_command(TARGET openttd add_custom_command(TARGET openttd
@@ -196,7 +196,7 @@ elseif(UNIX)
endif() endif()
endif() endif()
set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-linux-${PLATFORM}-${CPACK_SYSTEM_NAME}") set(CPACK_PACKAGE_FILE_NAME "citymania-client-#CPACK_PACKAGE_VERSION#-linux-${PLATFORM}-${CPACK_SYSTEM_NAME}")
else() else()
message(FATAL_ERROR "Unknown OS found for packaging; please consider creating a Pull Request to add support for this OS.") message(FATAL_ERROR "Unknown OS found for packaging; please consider creating a Pull Request to add support for this OS.")