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

160
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 - FilePicker # Plugins
with self.prefix(src='../plugins/filepicker/%s' % self.args['configuration'], dst="llplugin"): with self.prefix(dst="llplugin"):
self.path("basic_plugin_filepicker.dll") with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'plugins')):
# Media plugins - LibVLC # Plugins - FilePicker
with self.prefix(src='../plugins/libvlc/%s' % self.args['configuration'], dst="llplugin"): with self.prefix(src=os.path.join('filepicker', self.args['configuration'])):
self.path("media_plugin_libvlc.dll") self.path("basic_plugin_filepicker.dll")
# Media plugins - CEF # Media plugins - LibVLC
with self.prefix(src='../plugins/cef/%s' % self.args['configuration'], dst="llplugin"): with self.prefix(src=os.path.join('libvlc', self.args['configuration'])):
self.path("media_plugin_cef.dll") self.path("media_plugin_libvlc.dll")
# CEF runtime files - debug # Media plugins - CEF
# CEF runtime files - not debug (release, relwithdebinfo etc.) with self.prefix(src=os.path.join('cef', self.args['configuration'])):
config = 'debug' if self.args['configuration'].lower() == 'debug' else 'release' self.path("media_plugin_cef.dll")
with self.prefix(src=os.path.join(pkgdir, 'bin', config), dst="llplugin"):
# CEF runtime files - debug
# CEF runtime files - not debug (release, relwithdebinfo etc.)
config = 'debug' if self.args['configuration'].lower() == 'debug' else 'release'
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,73 +563,73 @@ 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")
self.path("cef_extensions.pak") self.path("cef_extensions.pak")
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")
self.path("bn.pak") self.path("bn.pak")
self.path("ca.pak") self.path("ca.pak")
self.path("cs.pak") self.path("cs.pak")
self.path("da.pak") self.path("da.pak")
self.path("de.pak") self.path("de.pak")
self.path("el.pak") self.path("el.pak")
self.path("en-GB.pak") self.path("en-GB.pak")
self.path("en-US.pak") self.path("en-US.pak")
self.path("es-419.pak") self.path("es-419.pak")
self.path("es.pak") self.path("es.pak")
self.path("et.pak") self.path("et.pak")
self.path("fa.pak") self.path("fa.pak")
self.path("fi.pak") self.path("fi.pak")
self.path("fil.pak") self.path("fil.pak")
self.path("fr.pak") self.path("fr.pak")
self.path("gu.pak") self.path("gu.pak")
self.path("he.pak") self.path("he.pak")
self.path("hi.pak") self.path("hi.pak")
self.path("hr.pak") self.path("hr.pak")
self.path("hu.pak") self.path("hu.pak")
self.path("id.pak") self.path("id.pak")
self.path("it.pak") self.path("it.pak")
self.path("ja.pak") self.path("ja.pak")
self.path("kn.pak") self.path("kn.pak")
self.path("ko.pak") self.path("ko.pak")
self.path("lt.pak") self.path("lt.pak")
self.path("lv.pak") self.path("lv.pak")
self.path("ml.pak") self.path("ml.pak")
self.path("mr.pak") self.path("mr.pak")
self.path("ms.pak") self.path("ms.pak")
self.path("nb.pak") self.path("nb.pak")
self.path("nl.pak") self.path("nl.pak")
self.path("pl.pak") self.path("pl.pak")
self.path("pt-BR.pak") self.path("pt-BR.pak")
self.path("pt-PT.pak") self.path("pt-PT.pak")
self.path("ro.pak") self.path("ro.pak")
self.path("ru.pak") self.path("ru.pak")
self.path("sk.pak") self.path("sk.pak")
self.path("sl.pak") self.path("sl.pak")
self.path("sr.pak") self.path("sr.pak")
self.path("sv.pak") self.path("sv.pak")
self.path("sw.pak") self.path("sw.pak")
self.path("ta.pak") self.path("ta.pak")
self.path("te.pak") self.path("te.pak")
self.path("th.pak") self.path("th.pak")
self.path("tr.pak") self.path("tr.pak")
self.path("uk.pak") self.path("uk.pak")
self.path("vi.pak") self.path("vi.pak")
self.path("zh-CN.pak") self.path("zh-CN.pak")
self.path("zh-TW.pak") self.path("zh-TW.pak")
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')): with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')):
self.path("libvlc.dll") self.path("libvlc.dll")