From 2eaf9a2c223396158467a98825adbab29c4eceab Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Tue, 4 Apr 2017 21:16:29 -0400
Subject: [PATCH] Add back Latif's CMake-based branding to BuildBranding.cmake

---
 indra/cmake/BuildBranding.cmake               | 37 +++++++++++++++++++
 indra/cmake/CMakeLists.txt                    |  1 +
 .../English.lproj/InfoPlist.strings.in        |  2 +-
 .../linux_tools/{wrapper.sh => wrapper.sh.in} |  2 +-
 .../res/{viewerRes.rc => viewerRes.rc.in}     |  6 +--
 5 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 indra/cmake/BuildBranding.cmake
 rename indra/newview/linux_tools/{wrapper.sh => wrapper.sh.in} (98%)
 rename indra/newview/res/{viewerRes.rc => viewerRes.rc.in} (96%)

diff --git a/indra/cmake/BuildBranding.cmake b/indra/cmake/BuildBranding.cmake
new file mode 100644
index 000000000..b68cc7483
--- /dev/null
+++ b/indra/cmake/BuildBranding.cmake
@@ -0,0 +1,37 @@
+# -*- cmake -*-
+if (WINDOWS)
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc.in
+       ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc
+   )
+endif (WINDOWS)
+
+if (DARWIN)
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings.in
+       ${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings
+   )
+endif (DARWIN)
+
+if (LINUX)
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh.in
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh
+       @ONLY
+   )
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh.in
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh
+       @ONLY
+   )
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh.in
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh
+       @ONLY
+   )
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh.in
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh
+       @ONLY
+   )
+endif (LINUX)
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 18a58fcba..7c8e616d6 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -13,6 +13,7 @@ set(cmake_SOURCE_FILES
     Audio.cmake
     BasicPluginBase.cmake
     Boost.cmake
+    BuildBranding.cmake
     BuildVersion.cmake
     CARes.cmake
     CEFPlugin.cmake
diff --git a/indra/newview/English.lproj/InfoPlist.strings.in b/indra/newview/English.lproj/InfoPlist.strings.in
index e10c86335..8a2f3a381 100644
--- a/indra/newview/English.lproj/InfoPlist.strings.in
+++ b/indra/newview/English.lproj/InfoPlist.strings.in
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleName = "${VIEWER_CHANNEL_ONE_WORD}";
+CFBundleName = "${VIEWER_CHANNEL_NOSPACE}";
 
 CFBundleShortVersionString = "${VIEWER_CHANNEL} Viewer ${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}";
 CFBundleGetInfoString = "${VIEWER_CHANNEL} Viewer ${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}, Copyright 2012 Siana Gearz";
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh.in
similarity index 98%
rename from indra/newview/linux_tools/wrapper.sh
rename to indra/newview/linux_tools/wrapper.sh.in
index 43b135a15..1c5ff1950 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh.in
@@ -142,7 +142,7 @@ if [ -n "$LL_TCMALLOC" ]; then
     fi
 fi
 
-export VIEWER_BINARY='do-not-directly-run-singularity-bin'
+export VIEWER_BINARY='do-not-directly-run-@VIEWER_BRANDING_ID@-bin'
 BINARY_TYPE=$(expr match "$(file -b bin/$VIEWER_BINARY)" '\(.*executable\)' | sed -e 's/  / /g')
 if [ "${BINARY_TYPE}" == "ELF 32-bit LSB executable" ]; then
     SL_ENV+='LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"'
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc.in
similarity index 96%
rename from indra/newview/res/viewerRes.rc
rename to indra/newview/res/viewerRes.rc.in
index bf112c35e..97859af50 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc.in
@@ -73,7 +73,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "MS Sans Serif"
 BEGIN
     ICON            IDI_LL_ICON,IDC_STATIC,7,7,20,20
-    LTEXT           "Loading Singularity Viewer...",666,36,13,91,8
+    LTEXT           "Loading ${VIEWER_CHANNEL} Viewer...",666,36,13,91,8
 END
 
 
@@ -154,12 +154,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "Siana Gearz"
-            VALUE "FileDescription", "Singularity Viewer"
+            VALUE "FileDescription", "${VIEWER_CHANNEL} Viewer"
             VALUE "FileVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz"
             VALUE "OriginalFilename", "SingularityViewer.exe"
-            VALUE "ProductName", "Singularity Viewer"
+            VALUE "ProductName", "${VIEWER_CHANNEL} Viewer"
             VALUE "ProductVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}"
         END
     END