Resolving conflicts after merge #2

1 files changed, 13 insertions, 9 deletions

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 001cdb29f3..b932f43141 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1064,15 +1064,19 @@ class DarwinManifest(ViewerManifest):
 
                 # our apps
                 executable_path = {}
-                self.path2basename(os.path.join(os.pardir, os.path.join("llplugin", "slplugin"), self.args['configuration']), "SLPlugin.app")
-                executable_path["SLPlugin.app"] = \
-                    self.dst_path_of(os.path.join("SLPlugin.app", "Contents", "MacOS"))
-
-                # our apps dependencies on shared libs
-                # for each app, for each dylib we collected in dylibs,
-                # create a symlink to the real copy of the dylib.
-                with self.prefix(dst=os.path.join("SLPlugin.app", "Contents", "Resources")):
-                    for libfile in dylibs:
+                embedded_apps = [ (os.path.join("llplugin", "slplugin"), "SLPlugin.app") ]
+                for app_bld_dir, app in embedded_apps:
+                    self.path2basename(os.path.join(os.pardir,
+                                                    app_bld_dir, self.args['configuration']),
+                                       app)
+                    executable_path[app] = \
+                        self.dst_path_of(os.path.join(app, "Contents", "MacOS"))
+
+                    # our apps dependencies on shared libs
+                    # for each app, for each dylib we collected in dylibs,
+                    # create a symlink to the real copy of the dylib.
+                    with self.prefix(dst=os.path.join(app, "Contents", "Resources")):
+                        for libfile in dylibs:
                             self.relsymlinkf(os.path.join(libfile_parent, libfile))
 
                 # Dullahan helper apps go inside SLPlugin.app