summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-09-10 17:01:53 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-09-10 17:01:53 -0400
commit298a52f96a92f4368b3c5d955eab6b37a58f4931 (patch)
treecf70c3a183b3f3abb3d3e60b56bbdf40dbfdfb5c
parent299d4807ab6bc35c3643134a142fb59d5931bed9 (diff)
DRTVWR-474, MAINT-9047: Try *not* copying the viewer built by CMake.
The start of viewer_manifest.DarwinManifest.construct() is a path() call to copy the whole viewer tree from where CMake constructs it. The comment is: "(this is a no-op if run within the xcode script)." Unfortunately, for unclear reasons, this has recently started nesting Second Life.app within the Second Life.app directory, and even to multiple levels. When that happens, copying the outermost .app directory to the sparseimage in order to convert to dmg runs out of room because we're trying to pack multiple copies of the whole viewer tree into the fixed-size sparseimage. But if it works to simply skip that entire initial copy operation, so much the better.
-rwxr-xr-xindra/newview/viewer_manifest.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 14ff2c194e..d16b5d9a7c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -880,8 +880,8 @@ class DarwinManifest(ViewerManifest):
return True
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="")
+## # 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="")
pkgdir = os.path.join(self.args['build'], os.pardir, 'packages')
relpkgdir = os.path.join(pkgdir, "lib", "release")
@@ -1238,6 +1238,11 @@ class DarwinManifest(ViewerManifest):
# the signature are preserved; moving the files using python will leave them behind
# and invalidate the signatures.
if 'signature' in self.args:
+ print 72*'='
+ print 'In {}:'.format(volpath)
+ for f in os.listdir(volpath):
+ print ' {}'.format(f)
+ print 72*'='
app_in_dmg=os.path.join(volpath,self.app_name()+".app")
print "Attempting to sign '%s'" % app_in_dmg
identity = self.args['signature']