diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-12 21:51:35 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-12 21:51:35 +0800 |
| commit | 4d7727139ee3840b4794f7dc93e6113e0623f47f (patch) | |
| tree | a99dd66c0581005a433519569e943910de67ee09 /indra | |
| parent | f6fe1a886389b44d63c6a985916d7a910d27a726 (diff) | |
| parent | 52ecc4498d47a9f985955c8584de1a57584c0278 (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 40 |
2 files changed, 40 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..19de4a2cb3 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -1,7 +1,16 @@ if (DARWIN) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/English.lproj/InfoPlist.strings + ${VIEWER_APP_BUNDLE}/Contents/Resources/English.lproj/InfoPlist.strings + ) + + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/English.lproj/language.txt + DESTINATION English.lproj + ) + install(DIRECTORY - English.lproj German.lproj Japanese.lproj Korean.lproj @@ -25,6 +34,32 @@ if (DARWIN) DESTINATION . ) + add_custom_command( + OUTPUT contributors.txt + COMMAND sed + ARGS -e '/Linden Lab.*/d' ${CMAKE_HOME_DIRECTORY}/../doc/contributions.txt > ${CMAKE_CURRENT_BINARY_DIR}/contributions.txt + COMMAND sed + ARGS -i '' -e '/following residents.*/d' ${CMAKE_CURRENT_BINARY_DIR}/contributions.txt + COMMAND sed + ARGS -i '' -e '/along with.*/d' ${CMAKE_CURRENT_BINARY_DIR}/contributions.txt + COMMAND sed + ARGS -i '' -e '/^$$/d' ${CMAKE_CURRENT_BINARY_DIR}/contributions.txt + COMMAND sed + ARGS -i '' -e '/\t.*/d' ${CMAKE_CURRENT_BINARY_DIR}/contributions.txt + COMMAND sed + ARGS -i '' -e '/^ .*/d' ${CMAKE_CURRENT_BINARY_DIR}/contributions.txt + COMMAND sort + ARGS -R contributions.txt -o ${CMAKE_CURRENT_BINARY_DIR}/contributions.txt + COMMAND paste + ARGS -s -d, ${CMAKE_CURRENT_BINARY_DIR}/contributions.txt > ${CMAKE_CURRENT_BINARY_DIR}/contributors.txt + COMMAND sed + ARGS -i '' -e 's/,/, /g' ${CMAKE_CURRENT_BINARY_DIR}/contributors.txt + ) + + add_custom_target(contributors ALL + DEPENDS contributors.txt + ) + install(FILES SecondLife.nib ${AUTOBUILD_INSTALL_DIR}/ca-bundle.crt @@ -50,6 +85,7 @@ if (DARWIN) install(FILES ${SCRIPTS_DIR}/messages/message_template.msg ${SCRIPTS_DIR}/../etc/message.xml + ${CMAKE_CURRENT_BINARY_DIR}/contributors.txt DESTINATION app_settings ) @@ -112,7 +148,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 |