livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolving conflicts after merge #2

master
Andrey Kleshchev 2021-11-03 01:21:58 +02:00
parent 98d96f0dea
commit 5649bb0c22
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/viewer_manifest.py
View File

@ -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"))
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("SLPlugin.app", "Contents", "Resources")):
for libfile in dylibs:
# 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