From 5aa1521625f39825f31163a5ab0a64a73d96de95 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 4 Aug 2011 11:52:32 -0400 Subject: fix path choice for project branches, attempt to fix linux icon --- indra/newview/icons/beta/secondlife_256.BMP | Bin 0 -> 196662 bytes indra/newview/icons/development/secondlife_256.BMP | Bin 0 -> 196662 bytes indra/newview/icons/project/secondlife_256.BMP | Bin 0 -> 196662 bytes indra/newview/icons/release/secondlife_256.BMP | Bin 0 -> 196662 bytes indra/newview/icons/test/secondlife_256.BMP | Bin 0 -> 196662 bytes indra/newview/viewer_manifest.py | 26 ++++++++++----------- 6 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 indra/newview/icons/beta/secondlife_256.BMP create mode 100644 indra/newview/icons/development/secondlife_256.BMP create mode 100644 indra/newview/icons/project/secondlife_256.BMP create mode 100644 indra/newview/icons/release/secondlife_256.BMP create mode 100644 indra/newview/icons/test/secondlife_256.BMP (limited to 'indra/newview') diff --git a/indra/newview/icons/beta/secondlife_256.BMP b/indra/newview/icons/beta/secondlife_256.BMP new file mode 100644 index 0000000000..97bd67d3d6 Binary files /dev/null and b/indra/newview/icons/beta/secondlife_256.BMP differ diff --git a/indra/newview/icons/development/secondlife_256.BMP b/indra/newview/icons/development/secondlife_256.BMP new file mode 100644 index 0000000000..174b22319a Binary files /dev/null and b/indra/newview/icons/development/secondlife_256.BMP differ diff --git a/indra/newview/icons/project/secondlife_256.BMP b/indra/newview/icons/project/secondlife_256.BMP new file mode 100644 index 0000000000..cd890725f8 Binary files /dev/null and b/indra/newview/icons/project/secondlife_256.BMP differ diff --git a/indra/newview/icons/release/secondlife_256.BMP b/indra/newview/icons/release/secondlife_256.BMP new file mode 100644 index 0000000000..74deedd7d3 Binary files /dev/null and b/indra/newview/icons/release/secondlife_256.BMP differ diff --git a/indra/newview/icons/test/secondlife_256.BMP b/indra/newview/icons/test/secondlife_256.BMP new file mode 100644 index 0000000000..e23fcfdbe9 Binary files /dev/null and b/indra/newview/icons/test/secondlife_256.BMP differ diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index bdb18f5da5..281db4ac83 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -148,10 +148,11 @@ class ViewerManifest(LLManifest): channel_type=self.channel_lowerword() if channel_type == 'release' \ or channel_type == 'beta' \ - or channel_type == 'project' \ or channel_type == 'development' \ : icon_path += channel_type + elif re.match('project.*',channel_type) : + icon_path += 'project' else : icon_path += 'test' return icon_path @@ -624,11 +625,7 @@ class DarwinManifest(ViewerManifest): icon_path = self.icon_path() if self.prefix(src=icon_path, dst="") : - test_path = os.path.join(self.get_src_prefix(), "secondlife.icns") - if os.path.exists(test_path) : - self.path("secondlife.icns") - else : - raise Exception("Icon not found '%s'" % test_path) + self.path("secondlife.icns") self.end_prefix(icon_path) self.path("SecondLife.nib") @@ -867,14 +864,6 @@ class LinuxManifest(ViewerManifest): def construct(self): super(LinuxManifest, self).construct() self.path("licenses-linux.txt","licenses.txt") - icon_path = self.icon_path() - if self.prefix(src=icon_path, dst="") : - test_path = os.path.join(self.get_src_prefix(), "secondlife_256.png") - if os.path.exists(test_path) : - self.path("secondlife_256.png","secondlife_icon.png") - else : - raise Exception("Icon not found '%s'" % test_path) - self.end_prefix(icon_path) if self.prefix("linux_tools", dst=""): self.path("client-readme.txt","README-linux.txt") self.path("client-readme-voice.txt","README-linux-voice.txt") @@ -900,6 +889,15 @@ class LinuxManifest(ViewerManifest): # recurse self.end_prefix("res-sdl") + # Get the icons based on the channel + icon_path = self.icon_path() + if self.prefix(src=icon_path, dst="") : + self.path("secondlife_256.png","secondlife_icon.png") + if self.prefix(src="",dst="res-sdl") : + self.path("secondlife_256.BMP","ll_icon.BMP") + self.end_prefix("res-sdl") + self.end_prefix(icon_path) + self.path("../viewer_components/updater/scripts/linux/update_install", "bin/update_install") # plugins -- cgit v1.2.3