From 6fa1495a0cd16605bbfd78c2252a94b7fbd78a89 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Fri, 12 Jul 2024 15:15:14 +0800
Subject: 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.
---
 indra/newview/English.lproj/InfoPlist.strings |  4 ++--
 indra/newview/ViewerInstall.cmake             | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'indra/newview')

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
-- 
cgit v1.2.3


From b9b9f945a97abd52a33fe9bd25d2ed98bb021f95 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Fri, 12 Jul 2024 19:12:12 +0800
Subject: Simplify InfoPlist.strings configuration

---
 indra/newview/ViewerInstall.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index ac740c406a..e548108edf 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -2,11 +2,10 @@ if (DARWIN)
 
     configure_file(
         ${CMAKE_CURRENT_SOURCE_DIR}/English.lproj/InfoPlist.strings
-        ${CMAKE_CURRENT_BINARY_DIR}/InfoPlist.strings
+        ${VIEWER_APP_BUNDLE}/Contents/Resources/English.lproj/InfoPlist.strings
         )
 
     install(FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/InfoPlist.strings
         ${CMAKE_CURRENT_SOURCE_DIR}/English.lproj/language.txt
         DESTINATION English.lproj
         )
-- 
cgit v1.2.3


From 52ecc4498d47a9f985955c8584de1a57584c0278 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Fri, 12 Jul 2024 21:38:26 +0800
Subject: Reimplementation of contributors.txt generation

We don't rely on viewer_manifest.py's extract_names any more to
generate the contributors list, it's implemented in CMake now, using
sed, paste, and sort.
---
 indra/newview/ViewerInstall.cmake | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index e548108edf..19de4a2cb3 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -34,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
@@ -59,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
         )
 
-- 
cgit v1.2.3