diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-12 15:15:14 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-12 15:15:14 +0800 |
| commit | 6fa1495a0cd16605bbfd78c2252a94b7fbd78a89 (patch) | |
| tree | fc3d55122100142ebb08e2b87f337845d2bc1438 /indra/newview | |
| parent | 5590af309fd9f78e4642f01833e26bbcf343d145 (diff) | |
Fix version appearing as %%VERSION%% on macOS info
This would be done in viewer_manifest.py on SLv. This needed to be
reimplemented, and now it is, just using CMake.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 353d660a2d..48e7262dd5 100644 --- a/indra/newview/English.lproj/InfoPlist.strings +++ b/indra/newview/English.lproj/InfoPlist.strings @@ -2,6 +2,6 @@ CFBundleName = "Megapahit"; -CFBundleShortVersionString = "Megapahit version %%VERSION%%"; -CFBundleGetInfoString = "Megapahit version %%VERSION%%, Copyright 2024 Megapahit."; +CFBundleShortVersionString = "Megapahit version ${MACOSX_BUNDLE_SHORT_VERSION_STRING}"; +CFBundleGetInfoString = "Megapahit version ${MACOSX_BUNDLE_SHORT_VERSION_STRING}, Copyright 2024 Megapahit."; diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index a01561128a..ac740c406a 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -1,7 +1,17 @@ if (DARWIN) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/English.lproj/InfoPlist.strings + ${CMAKE_CURRENT_BINARY_DIR}/InfoPlist.strings + ) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/InfoPlist.strings + ${CMAKE_CURRENT_SOURCE_DIR}/English.lproj/language.txt + DESTINATION English.lproj + ) + install(DIRECTORY - English.lproj German.lproj Japanese.lproj Korean.lproj @@ -112,7 +122,7 @@ if (LINUX) ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13 ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.22 - DESTINATION ${_LIB}) + DESTINATION ${_LIB}) endif (USE_FMODSTUDIO) install(PROGRAMS ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox |