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

Sync with Alchemy to fix and streamline Windows plugins packaging

Browse Source
This commit is contained in:
Router Gray
2019-05-02 09:19:04 -05:00
committed by Lirusaito
parent 535a01ea30
commit 2f9a43effd
1 changed files with 82 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/viewer_manifest.py
View File

@@ -532,22 +532,26 @@ class WindowsManifest(ViewerManifest):
self.path(src="licenses-win32.txt", dst="licenses.txt") self.path(src="licenses-win32.txt", dst="licenses.txt")
self.path("featuretable.txt") self.path("featuretable.txt")
# Plugins
with self.prefix(dst="llplugin"):
with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'plugins')):
# Plugins - FilePicker # Plugins - FilePicker
with self.prefix(src='../plugins/filepicker/%s' % self.args['configuration'], dst="llplugin"): with self.prefix(src=os.path.join('filepicker', self.args['configuration'])):
self.path("basic_plugin_filepicker.dll") self.path("basic_plugin_filepicker.dll")
# Media plugins - LibVLC # Media plugins - LibVLC
with self.prefix(src='../plugins/libvlc/%s' % self.args['configuration'], dst="llplugin"): with self.prefix(src=os.path.join('libvlc', self.args['configuration'])):
self.path("media_plugin_libvlc.dll") self.path("media_plugin_libvlc.dll")
# Media plugins - CEF # Media plugins - CEF
with self.prefix(src='../plugins/cef/%s' % self.args['configuration'], dst="llplugin"): with self.prefix(src=os.path.join('cef', self.args['configuration'])):
self.path("media_plugin_cef.dll") self.path("media_plugin_cef.dll")
# CEF runtime files - debug # CEF runtime files - debug
# CEF runtime files - not debug (release, relwithdebinfo etc.) # CEF runtime files - not debug (release, relwithdebinfo etc.)
config = 'debug' if self.args['configuration'].lower() == 'debug' else 'release' config = 'debug' if self.args['configuration'].lower() == 'debug' else 'release'
with self.prefix(src=os.path.join(pkgdir, 'bin', config), dst="llplugin"): with self.prefix(src=os.path.join(pkgdir, 'bin', config)):
self.path("chrome_elf.dll") self.path("chrome_elf.dll")
self.path("d3dcompiler_43.dll") self.path("d3dcompiler_43.dll")
self.path("d3dcompiler_47.dll") self.path("d3dcompiler_47.dll")
@@ -559,12 +563,12 @@ class WindowsManifest(ViewerManifest):
self.path("snapshot_blob.bin") self.path("snapshot_blob.bin")
self.path("v8_context_snapshot.bin") self.path("v8_context_snapshot.bin")
with self.prefix(src=os.path.join(pkgdir, 'bin', config, 'swiftshader'), dst=os.path.join("llplugin", 'swiftshader')): with self.prefix(src=os.path.join(pkgdir, 'bin', config, 'swiftshader'), dst='swiftshader'):
self.path("libEGL.dll") self.path("libEGL.dll")
self.path("libGLESv2.dll") self.path("libGLESv2.dll")
# CEF files common to all configurations # CEF files common to all configurations
with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="llplugin"): with self.prefix(src=os.path.join(pkgdir, 'resources')):
self.path("cef.pak") self.path("cef.pak")
self.path("cef_100_percent.pak") self.path("cef_100_percent.pak")
self.path("cef_200_percent.pak") self.path("cef_200_percent.pak")
@@ -572,7 +576,7 @@ class WindowsManifest(ViewerManifest):
self.path("devtools_resources.pak") self.path("devtools_resources.pak")
self.path("icudtl.dat") self.path("icudtl.dat")
with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('llplugin', 'locales')): with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst='locales'):
self.path("am.pak") self.path("am.pak")
self.path("ar.pak") self.path("ar.pak")
self.path("bg.pak") self.path("bg.pak")