Mac build changes to create specific channel installers

indra/newview/CMakeLists.txt

@@ -1141,7 +1141,6 @@ if (DARWIN)
     ${VIEWER_BRANDING_ID}.icns
     macview.r
     gpu_table.txt
-    Info-${VIEWER_BRANDING_ID}.plist
     SecondLife.nib/
     # CMake doesn't seem to support Xcode language variants well just yet
     English.lproj/InfoPlist.strings
@@ -1707,7 +1706,7 @@ if (DARWIN)
     MACOSX_BUNDLE_BUNDLE_NAME "${VIEWER_BRANDING_NAME}"
     MACOSX_BUNDLE_SHORT_VERSION_STRING "${viewer_VERSION}"
     MACOSX_BUNDLE_BUNDLE_VERSION "${viewer_VERSION}"
-    MACOSX_BUNDLE_COPYRIGHT "Copyright 2010 Balseraph Software Group"
+    MACOSX_BUNDLE_COPYRIGHT "Copyright 2013 Siana Gearz"
     )
 
   add_custom_command(
@@ -1756,32 +1755,10 @@ if (DARWIN)
           --grid=${GRID}
           --login_channel=${VIEWER_LOGIN_CHANNEL}
           --source=${CMAKE_CURRENT_SOURCE_DIR}
-          --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
+          --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${Product}.touched
         DEPENDS
           ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
       )
-# Viewer-Development doesn't have this duplicate of the above command, here..
-# this may be a botched merge, but Mac seems to be picky, so I'm leaving it ~Liru
-      add_custom_command(
-        TARGET package POST_BUILD
-        COMMAND ${PYTHON_EXECUTABLE}
-        ARGS
-          ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-          --artwork=${ARTWORK_DIR}
-          --branding_id=${VIEWER_BRANDING_ID}
-          --build=${CMAKE_CURRENT_BINARY_DIR}
-          --buildtype=${CMAKE_BUILD_TYPE}
-          --channel=${VIEWER_CHANNEL}
-          --configuration=${CMAKE_CFG_INTDIR}
-          --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
-          --grid=${GRID}
-          --login_channel=${VIEWER_LOGIN_CHANNEL}
-          --source=${CMAKE_CURRENT_SOURCE_DIR}
-          --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
-        DEPENDS
-          ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-      )
-
   endif (PACKAGE)
 endif (DARWIN)
 

indra/newview/English.lproj/InfoPlist.strings.in

@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleName = "Singularity";
+CFBundleName = "${VIEWER_CHANNEL_ONE_WORD}";
 
-CFBundleShortVersionString = "Singularity Viewer ${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}";
+CFBundleShortVersionString = "${VIEWER_CHANNEL} Viewer ${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}";
-CFBundleGetInfoString = "Singularity Viewer ${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}, Copyright 2012 Siana Gearz";
+CFBundleGetInfoString = "${VIEWER_CHANNEL} Viewer ${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}, Copyright 2012 Siana Gearz";

indra/newview/Info-singularity.plist

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>Singularity</string>
-	<key>CFBundleIconFile</key>
-	<string>singularity.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.singularityviewer.singularity</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Singularity</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>Second Life URL</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>secondlife</string>
-			</array>
-			<key>LSIsAppleDefaultForScheme</key>
-			<true/>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.0.0.0</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-</dict>
-</plist>

indra/newview/viewer_manifest.py

@@ -139,10 +139,7 @@ class ViewerManifest(LLManifest):
     def viewer_branding_id(self):
         return self.args['branding_id']
     def installer_prefix(self):
-        mapping={"secondlife":'SecondLife_',
+        return self.channel_oneword() + "_"
-                 "snowglobe":'Snowglobe_',
-                 "singularity":'Singularity_'}
-        return mapping[self.viewer_branding_id()]
 
     def flags_list(self):
         """ Convenience function that returns the command-line flags
@@ -496,8 +493,6 @@ class DarwinManifest(ViewerManifest):
         self.path(self.args['configuration'] + "/" + self.app_name() + ".app", dst="")
 
         if self.prefix(src="", dst="Contents"):  # everything goes in Contents
-            self.path(self.info_plist_name(), dst="Info.plist")
-
             # copy additional libs in <bundle>/Contents/MacOS/
             self.path("../../libraries/universal-darwin/lib/release/libndofdev.dylib", dst="Resources/libndofdev.dylib")
             self.path("../../libraries/universal-darwin/lib/release/libhunspell-1.3.0.dylib", dst="Resources/libhunspell-1.3.0.dylib")
@@ -618,10 +613,7 @@ class DarwinManifest(ViewerManifest):
                                  { 'viewer_binary' : self.dst_path_of('Contents/MacOS/'+self.app_name())})
 
     def app_name(self):
-        return "Singularity"
+        return self.channel_oneword()
-
-    def info_plist_name(self):
-        return "Info-Singularity.plist"
 
     def package_finish(self):
         channel_standin = self.app_name()