Skip to content
Snippets Groups Projects
Commit cfe70957 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

Update viewer_package.py to grab slplugin.exe et al. from package.

This only applies to the Windows package so far, because so far only the
Windows package exists.
parent 1488f3b9
No related branches found
No related tags found
No related merge requests found
...@@ -331,14 +331,18 @@ def test_for_no_msvcrt_manifest_and_copy_action(self, src, dst): ...@@ -331,14 +331,18 @@ def test_for_no_msvcrt_manifest_and_copy_action(self, src, dst):
def construct(self): def construct(self):
super(Windows_i686_Manifest, self).construct() super(Windows_i686_Manifest, self).construct()
pkgdir = os.path.join(self.args['build'], os.pardir, 'packages')
relpkgdir = os.path.join(pkgdir, "lib", "release")
debpkgdir = os.path.join(pkgdir, "lib", "debug")
if self.is_packaging_viewer(): if self.is_packaging_viewer():
# Find secondlife-bin.exe in the 'configuration' dir, then rename it to the result of final_exe. # Find secondlife-bin.exe in the 'configuration' dir, then rename it to the result of final_exe.
self.path(src='%s/secondlife-bin.exe' % self.args['configuration'], dst=self.final_exe()) self.path(src='%s/secondlife-bin.exe' % self.args['configuration'], dst=self.final_exe())
# Plugin host application # Plugin host application
self.path2basename(os.path.join(os.pardir, # The current slplugin package places slplugin.exe right into the
'llplugin', 'slplugin', self.args['configuration']), # packages base directory.
"slplugin.exe") self.path2basename(pkgdir, "slplugin.exe")
self.path2basename("../viewer_components/updater/scripts/windows", "update_install.bat") self.path2basename("../viewer_components/updater/scripts/windows", "update_install.bat")
# Get shared libs from the shared libs staging directory # Get shared libs from the shared libs staging directory
...@@ -358,15 +362,10 @@ def construct(self): ...@@ -358,15 +362,10 @@ def construct(self):
# Mesh 3rd party libs needed for auto LOD and collada reading # Mesh 3rd party libs needed for auto LOD and collada reading
try: try:
if self.args['configuration'].lower() == 'debug':
self.path("libcollada14dom22-d.dll")
else:
self.path("libcollada14dom22.dll")
self.path("glod.dll") self.path("glod.dll")
except RuntimeError, err: except RuntimeError, err:
print err.message print err.message
print "Skipping COLLADA and GLOD libraries (assumming linked statically)" print "Skipping GLOD library (assumming linked statically)"
# Get fmodex dll, continue if missing # Get fmodex dll, continue if missing
try: try:
...@@ -425,63 +424,16 @@ def construct(self): ...@@ -425,63 +424,16 @@ def construct(self):
self.path("featuretable_xp.txt") self.path("featuretable_xp.txt")
# Media plugins - QuickTime # Media plugins - QuickTime
if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):
self.path("media_plugin_quicktime.dll")
self.end_prefix()
# Media plugins - WebKit/Qt # Media plugins - WebKit/Qt
if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"): if self.prefix(src=os.path.join(pkgdir, "llplugin"), dst="llplugin"):
self.path("media_plugin_quicktime.dll")
self.path("media_plugin_webkit.dll") self.path("media_plugin_webkit.dll")
self.end_prefix()
# winmm.dll shim
if self.prefix(src='../media_plugins/winmmshim/%s' % self.args['configuration'], dst=""):
self.path("winmm.dll")
self.end_prefix()
if self.args['configuration'].lower() == 'debug':
if self.prefix(src=os.path.join(os.pardir, 'packages', 'lib', 'debug'),
dst="llplugin"):
self.path("libeay32.dll")
self.path("qtcored4.dll")
self.path("qtguid4.dll")
self.path("qtnetworkd4.dll")
self.path("qtopengld4.dll")
self.path("qtwebkitd4.dll")
self.path("qtxmlpatternsd4.dll")
self.path("ssleay32.dll")
# For WebKit/Qt plugin runtimes (image format plugins)
if self.prefix(src="imageformats", dst="imageformats"):
self.path("qgifd4.dll")
self.path("qicod4.dll")
self.path("qjpegd4.dll")
self.path("qmngd4.dll")
self.path("qsvgd4.dll")
self.path("qtiffd4.dll")
self.end_prefix()
# For WebKit/Qt plugin runtimes (codec/character encoding plugins)
if self.prefix(src="codecs", dst="codecs"):
self.path("qcncodecsd4.dll")
self.path("qjpcodecsd4.dll")
self.path("qkrcodecsd4.dll")
self.path("qtwcodecsd4.dll")
self.end_prefix()
self.end_prefix()
else:
if self.prefix(src=os.path.join(os.pardir, 'packages', 'lib', 'release'),
dst="llplugin"):
self.path("libeay32.dll")
self.path("qtcore4.dll") self.path("qtcore4.dll")
self.path("qtgui4.dll") self.path("qtgui4.dll")
self.path("qtnetwork4.dll") self.path("qtnetwork4.dll")
self.path("qtopengl4.dll") self.path("qtopengl4.dll")
self.path("qtwebkit4.dll") self.path("qtwebkit4.dll")
self.path("qtxmlpatterns4.dll") self.path("qtxmlpatterns4.dll")
self.path("ssleay32.dll")
# For WebKit/Qt plugin runtimes (image format plugins) # For WebKit/Qt plugin runtimes (image format plugins)
if self.prefix(src="imageformats", dst="imageformats"): if self.prefix(src="imageformats", dst="imageformats"):
...@@ -503,6 +455,23 @@ def construct(self): ...@@ -503,6 +455,23 @@ def construct(self):
self.end_prefix() self.end_prefix()
# winmm.dll shim
if self.prefix(src='../media_plugins/winmmshim/%s' % self.args['configuration'], dst=""):
self.path("winmm.dll")
self.end_prefix()
if self.args['configuration'].lower() == 'debug':
if self.prefix(src=debpkgdir, dst="llplugin"):
self.path("libeay32.dll")
self.path("ssleay32.dll")
self.end_prefix()
else:
if self.prefix(src=relpkgdir, dst="llplugin"):
self.path("libeay32.dll")
self.path("ssleay32.dll")
self.end_prefix()
# pull in the crash logger and updater from other projects # pull in the crash logger and updater from other projects
# tag:"crash-logger" here as a cue to the exporter # tag:"crash-logger" here as a cue to the exporter
self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'], self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment