From 0e732bf499e18d259f1ccb73c6e5e5b68ead467c Mon Sep 17 00:00:00 2001 From: Octol1ttle Date: Tue, 17 Mar 2026 19:26:06 +0500 Subject: [PATCH] dehardcode branding in Linux manual and Windows app info Signed-off-by: Octol1ttle --- CMakeLists.txt | 2 +- program_info/CMakeLists.txt | 14 +++++++++----- ...{prismlauncher.6.scd => prismlauncher.6.scd.in} | 14 +++++++------- program_info/prismlauncher.rc.in | 6 +++--- 4 files changed, 20 insertions(+), 16 deletions(-) rename program_info/{prismlauncher.6.scd => prismlauncher.6.scd.in} (84%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c6202581..1390b9641 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -445,7 +445,7 @@ elseif(UNIX) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_MetaInfo} DESTINATION ${KDE_INSTALL_METAINFODIR}) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_SVG} DESTINATION "${KDE_INSTALL_ICONDIR}/hicolor/scalable/apps") install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_PNG_256} DESTINATION "${KDE_INSTALL_ICONDIR}/hicolor/256x256/apps" RENAME "${Launcher_AppID}.png") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_mrpack_MIMEInfo} DESTINATION ${KDE_INSTALL_MIMEDIR}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_mrpack_MIMEInfo} DESTINATION ${KDE_INSTALL_MIMEDIR}) install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/launcher/qtlogging.ini" DESTINATION "share/${Launcher_Name}") diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt index 3faf3b1bc..635f5b82e 100644 --- a/program_info/CMakeLists.txt +++ b/program_info/CMakeLists.txt @@ -10,13 +10,14 @@ endif() set(Launcher_CommonName "PrismLauncher") set(Launcher_DisplayName "Prism Launcher") +set(Launcher_AppID "org.prismlauncher.PrismLauncher") +set(Launcher_Domain "prismlauncher.org") +set(Launcher_Git "https://github.com/PrismLauncher/PrismLauncher") set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE) set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE) - -set(Launcher_AppID "org.prismlauncher.PrismLauncher") -set(Launcher_Domain "prismlauncher.org" PARENT_SCOPE) -set(Launcher_Git "https://github.com/PrismLauncher/PrismLauncher" PARENT_SCOPE) +set(Launcher_Domain "${Launcher_Domain}" PARENT_SCOPE) +set(Launcher_Git "${Launcher_Git}" PARENT_SCOPE) set(Launcher_SVGFileName "${Launcher_AppID}.svg") set(Launcher_Copyright "© 2022-2026 Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors\\n© 2012-2021 MultiMC Contributors") @@ -38,6 +39,7 @@ set(Launcher_Branding_ICO "program_info/${Launcher_APP_BINARY_NAME}.ico") set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE) set(Launcher_Branding_WindowsRC "program_info/${Launcher_APP_BINARY_NAME}.rc" PARENT_SCOPE) set(Launcher_Branding_LogoQRC "program_info/${Launcher_APP_BINARY_NAME}.qrc" PARENT_SCOPE) +set(Launcher_Authors "MultiMC & Prism Launcher Contributors") set(Launcher_Portable_File "program_info/portable.txt" PARENT_SCOPE) @@ -77,7 +79,9 @@ endif() configure_file(win_install.nsi.in win_install.nsi @ONLY) if(SCDOC_FOUND) - set(in_scd "${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_APP_BINARY_NAME}.6.scd") + configure_file(${Launcher_APP_BINARY_NAME}.6.scd.in ${Launcher_APP_BINARY_NAME}.6.scd @ONLY) + + set(in_scd "${CMAKE_CURRENT_BINARY_DIR}/${Launcher_APP_BINARY_NAME}.6.scd") set(out_man "${CMAKE_CURRENT_BINARY_DIR}/${Launcher_APP_BINARY_NAME}.6") add_custom_command( DEPENDS "${in_scd}" diff --git a/program_info/prismlauncher.6.scd b/program_info/prismlauncher.6.scd.in similarity index 84% rename from program_info/prismlauncher.6.scd rename to program_info/prismlauncher.6.scd.in index e1ebfff32..2b5f3e483 100644 --- a/program_info/prismlauncher.6.scd +++ b/program_info/prismlauncher.6.scd.in @@ -1,14 +1,14 @@ -prismlauncher(6) +@Launcher_APP_BINARY_NAME@(6) # NAME -prismlauncher - a launcher and instance manager for Minecraft. +@Launcher_APP_BINARY_NAME@ - a launcher and instance manager for Minecraft. # SYNOPSIS -*prismlauncher* [OPTIONS...] +*@Launcher_APP_BINARY_NAME@* [OPTIONS...] # DESCRIPTION @@ -69,14 +69,14 @@ variables, besides other common Qt variables: # BUGS -https://github.com/PrismLauncher/PrismLauncher/issues +@Launcher_BUG_TRACKER_URL@ # RESOURCES -GitHub: https://github.com/PrismLauncher/PrismLauncher +GitHub: @Launcher_Git@ -Main website: https://prismlauncher.org +Main website: https://@Launcher_Domain@ # AUTHORS -Prism Launcher Contributors +@Launcher_Authors@ diff --git a/program_info/prismlauncher.rc.in b/program_info/prismlauncher.rc.in index 8f02341e5..700143182 100644 --- a/program_info/prismlauncher.rc.in +++ b/program_info/prismlauncher.rc.in @@ -3,8 +3,8 @@ #endif #include -IDI_ICON1 ICON DISCARDABLE "prismlauncher.ico" -1 RT_MANIFEST "prismlauncher.manifest" +IDI_ICON1 ICON DISCARDABLE "@Launcher_APP_BINARY_NAME@.ico" +1 RT_MANIFEST "@Launcher_APP_BINARY_NAME@.manifest" VS_VERSION_INFO VERSIONINFO FILEVERSION @Launcher_VERSION_NAME4_COMMA@ @@ -15,7 +15,7 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "CompanyName", "MultiMC & Prism Launcher Contributors" + VALUE "CompanyName", "@Launcher_Authors@" VALUE "FileDescription", "@Launcher_DisplayName@" VALUE "FileVersion", "@Launcher_VERSION_NAME4@" VALUE "ProductName", "@Launcher_DisplayName@"