Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use pkgdir in manifest

Browse Source
This commit is contained in:
Lirusaito
2019-04-10 11:21:40 -04:00
parent 4ea1b8d666
commit 27ed3ca4b9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/viewer_manifest.py
View File

@@ -95,6 +95,7 @@ class ViewerManifest(LLManifest):
self.path("windlight")
# ... and the included spell checking dictionaries
pkgdir = os.path.join(self.args['build'], os.pardir, 'packages')
self.path("dictionaries")
# include the extracted packages information (see BuildPackagesInfo.cmake)
@@ -372,7 +373,7 @@ class WindowsManifest(ViewerManifest):
# CEF runtime files - debug
# CEF runtime files - not debug (release, relwithdebinfo etc.)
config = 'debug' if self.args['configuration'].lower() == 'debug' else 'release'
if self.prefix(src=os.path.join(os.pardir, 'packages', 'bin', config), dst="llplugin"):
if self.prefix(src=os.path.join(pkgdir, 'bin', config), dst="llplugin"):
self.path("chrome_elf.dll")
self.path("d3dcompiler_47.dll")
self.path("libcef.dll")
@@ -395,7 +396,7 @@ class WindowsManifest(ViewerManifest):
# CEF files common to all configurations
if self.prefix(src=os.path.join(os.pardir, 'packages', 'resources'), dst="llplugin"):
if self.prefix(src=os.path.join(pkgdir, 'resources'), dst="llplugin"):
self.path("cef.pak")
self.path("cef_100_percent.pak")
self.path("cef_200_percent.pak")
@@ -404,7 +405,7 @@ class WindowsManifest(ViewerManifest):
self.path("icudtl.dat")
self.end_prefix()
if self.prefix(src=os.path.join(os.pardir, 'packages', 'resources', 'locales'), dst=os.path.join('llplugin', 'locales')):
if self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('llplugin', 'locales')):
self.path("am.pak")
self.path("ar.pak")
self.path("bg.pak")