From d07715b5cf12d4569e6979589ecc94cc432afe2d Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Wed, 10 Jul 2013 09:48:56 -0600
Subject: [PATCH] More cleanup for mac build

---
 .../English.lproj/InfoPlist.strings.in        |  7 --
 indra/newview/Info-Firestorm.plist            |  2 +-
 indra/newview/Info-SecondLife.plist.in        | 67 -------------------
 indra/newview/viewer_manifest.py              |  2 +-
 4 files changed, 2 insertions(+), 76 deletions(-)
 delete mode 100644 indra/newview/English.lproj/InfoPlist.strings.in
 delete mode 100755 indra/newview/Info-SecondLife.plist.in

diff --git a/indra/newview/English.lproj/InfoPlist.strings.in b/indra/newview/English.lproj/InfoPlist.strings.in
deleted file mode 100644
index 61e9278e8c..0000000000
--- a/indra/newview/English.lproj/InfoPlist.strings.in
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Localized versions of Info.plist keys */
-
-CFBundleName = "Firestorm";
-
-CFBundleShortVersionString = "Firestorm version %%VERSION%%";
-CFBundleGetInfoString = "Firestorm version %%VERSION%%, Copyright 2010-2013 The Phoenix Firestorm Project, Inc.";
-
diff --git a/indra/newview/Info-Firestorm.plist b/indra/newview/Info-Firestorm.plist
index 1673c0d4a0..5dbb8ae008 100644
--- a/indra/newview/Info-Firestorm.plist
+++ b/indra/newview/Info-Firestorm.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>phoenix_icon.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.secondlife.indra.viewer</string>
+	<string>com.firestorm.indra.viewer</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/indra/newview/Info-SecondLife.plist.in b/indra/newview/Info-SecondLife.plist.in
deleted file mode 100755
index 1673c0d4a0..0000000000
--- a/indra/newview/Info-SecondLife.plist.in
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//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>Firestorm</string>
-	<key>CFBundleIconFile</key>
-	<string>phoenix_icon.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.secondlife.indra.viewer</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Firestorm</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>slurl</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>seconlife</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>application/x-grid-location-info</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>Secondlife SLURL</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>SLRL</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-			<key>LSTypeIsPackage</key>
-			<true/>
-			<key>NSDocumentClass</key>
-			<string>SecondLifeSLURL</string>
-		</dict>
-	</array>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>Second Life URL</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>secondlife</string>
-				<string>x-grid-location-info</string>
-			</array>
-			<key>LSIsAppleDefaultForScheme</key>
-			<true/>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-</dict>
-</plist>
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0bd2b1206e..a89dbd356b 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -755,7 +755,7 @@ class DarwinManifest(ViewerManifest):
         self.path(self.args['configuration'] + "/Firestorm.app", dst="")
 
         if self.prefix(src="", dst="Contents"):  # everything goes in Contents
-            self.path("Info-Firestorm.plist", dst="Info.plist")
+            self.path("Info.plist", dst="Info.plist")
 
             # copy additional libs in <bundle>/Contents/MacOS/
             self.path("../packages/lib/release/libndofdev.dylib", dst="Resources/libndofdev.dylib")