From 2c5d7199f69984ddba602ac50f8f55c6fd73fc9d Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 17 Oct 2018 13:53:37 -0400
Subject: [PATCH] DRTVWR-447: Restore channel-name sensitivity of Mac BugSplat
viewer.
---
indra/newview/viewer_manifest.py | 34 ++------------------------------
1 file changed, 2 insertions(+), 32 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 5dd4d13a3a5..0aea31d563a 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -902,7 +902,7 @@ def is_rearranging(self):
def construct(self):
# copy over the build result (this is a no-op if run within the xcode script)
- self.path(os.path.join(self.args['configuration'], "Second Life.app"), dst="")
+ self.path(os.path.join(self.args['configuration'], self.channel()+".app"), dst="")
pkgdir = os.path.join(self.args['build'], os.pardir, 'packages')
relpkgdir = os.path.join(pkgdir, "lib", "release")
@@ -926,7 +926,7 @@ def construct(self):
if ("package" in self.args['actions'] or
"unpacked" in self.args['actions']):
self.run_command(
- ['strip', '-S', self.dst_path_of('Second Life')])
+ ['strip', '-S', self.dst_path_of(self.channel())])
with self.prefix(dst="Resources"):
# defer cross-platform file copies until we're in the
@@ -960,8 +960,6 @@ def construct(self):
with self.prefix(src=pkgdir,dst=""):
self.path("ca-bundle.crt")
- self.path("SecondLife.nib")
-
# Translations
self.path("English.lproj/language.txt")
self.replace_in(src="English.lproj/InfoPlist.strings",
@@ -1321,34 +1319,6 @@ def package_finish(self):
else:
print >> sys.stderr, "Maximum codesign attempts exceeded; giving up"
raise
- print 72*'='
- import stat
- print app_in_dmg
- # Second Life.app
- for sub0 in os.listdir(app_in_dmg):
- print '--{}'.format(sub0)
- path0 = os.path.join(app_in_dmg, sub0)
- if os.path.isfile(path0):
- # shouldn't be any file here
- with open(path0) as inf:
- for line in inf:
- print ' {}'.format(line.rstrip())
- elif os.path.isdir(path0):
- # Contents
- for sub1 in os.listdir(path0):
- print '----{}'.format(sub1)
- path1 = os.path.join(path0, sub1)
- if os.path.isfile(path1):
- # Info.plist, PkgInfo
- with open(path1) as inf:
- for line in inf:
- print ' {}'.format(line.rstrip())
- elif os.path.isdir(path1):
- # Frameworks, MacOS, Resources
- for sub2 in os.listdir(path1):
- path2 = os.path.join(path1, sub2)
- print ' {:04o} {}'.format(stat.S_IMODE(os.stat(path2).st_mode), sub2)
- print 72*'='
self.run_command(['spctl', '-a', '-texec', '-vvvv', app_in_dmg])
finally:
--
GitLab