summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-09-02 12:17:06 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-09-02 12:17:06 -0400
commit2eda2eb21b720646ec8acc16d47551226f1c059d (patch)
tree2171f3f47dbc7175d077e4a4c244800a253ab530 /indra
parent3eea556c28f86d1c1334879ff4d7dfc36201485e (diff)
SL-19242: Fix duplicated 'Second Life Mumble.app' path component
in the path passed as the macOS viewer_exe GitHub output.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/viewer_manifest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 1f67324aaa..f6282743bb 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -853,7 +853,8 @@ 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'], self.channel()+".app"), dst="")
- self.set_github_output_path('viewer_exe', self.channel() + ".app/")
+ # capture the entire destination app bundle
+ self.set_github_output_path('viewer_exe', '')
pkgdir = os.path.join(self.args['build'], os.pardir, 'packages')
relpkgdir = os.path.join(pkgdir, "lib", "release")