diff options
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 5dd4d13a3a..0aea31d563 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -902,7 +902,7 @@ class DarwinManifest(ViewerManifest): 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 @@ class DarwinManifest(ViewerManifest): 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 @@ class DarwinManifest(ViewerManifest): 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 @@ class DarwinManifest(ViewerManifest): 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: |