Use viewer channel as the basis for installer file names

indra/cmake/Variables.cmake

@@ -140,12 +140,13 @@ endif(WINDOWS AND WORD_SIZE EQUAL 32)
 set(GRID agni CACHE STRING "Target Grid")
 
 set(VIEWER_CHANNEL "Singularity" CACHE STRING "Viewer Channel Name")
-set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
+set(VIEWER_LOGIN_CHANNEL "${VIEWER_CHANNEL}" CACHE STRING "Fake login channel for A/B Testing")
 set(VIEWER_BRANDING_ID "singularity" CACHE STRING "Viewer branding id (currently secondlife|snowglobe)")
 
 # *TODO: break out proper Branding-secondlife.cmake, Branding-snowglobe.cmake, etc
-set(VIEWER_BRANDING_NAME "Singularity")
-set(VIEWER_BRANDING_NAME_CAMELCASE "Singularity")
+string(REGEX REPLACE " +" "" VIEWER_CHANNEL_ONE_WORD "${VIEWER_CHANNEL}")
+set(VIEWER_BRANDING_NAME "${VIEWER_CHANNEL_ONE_WORD}")
+set(VIEWER_BRANDING_NAME_CAMELCASE "${VIEWER_CHANNEL_ONE_WORD}")
 
 set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
 

indra/newview/CMakeLists.txt

@@ -1141,7 +1141,7 @@ if (DARWIN)
     ${VIEWER_BRANDING_ID}.icns
     macview.r
     gpu_table.txt
-    Info-${VIEWER_BRANDING_NAME_CAMELCASE}.plist
+    Info-${VIEWER_BRANDING_ID}.plist
     SecondLife.nib/
     # CMake doesn't seem to support Xcode language variants well just yet
     English.lproj/InfoPlist.strings