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

Make Linux viewer build consume slplugins package, and copy its files

into eventual viewer package -- instead of finding them in the viewer build
tree. Also update Windows to current slplugins package build.
parent b349bcf2
No related branches found
No related tags found
No related merge requests found
...@@ -2089,16 +2089,28 @@ ...@@ -2089,16 +2089,28 @@
<key>name</key> <key>name</key>
<string>darwin</string> <string>darwin</string>
</map> </map>
<key>linux</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>64b8a3bac95b5888a7ede3d7661a18b8</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slplugins_3p-update-slplugins/rev/298079/arch/Linux/installer/slplugins-3.7.24.297623.298079-linux-298079.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
</map>
<key>windows</key> <key>windows</key>
<map> <map>
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>55358f8aca309a73f828929cc4b1b0d2</string> <string>3a1ea3385303b78b0327c8cea929ef27</string>
<key>hash_algorithm</key> <key>hash_algorithm</key>
<string>md5</string> <string>md5</string>
<key>url</key> <key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slplugins_3p-update-slplugins/rev/297645/arch/CYGWIN/installer/slplugins-3.7.22.297128.297645-windows-297645.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slplugins_3p-update-slplugins/rev/298079/arch/CYGWIN/installer/slplugins-3.7.24.297623.298079-windows-298079.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
......
...@@ -958,6 +958,11 @@ def package_finish(self): ...@@ -958,6 +958,11 @@ def package_finish(self):
class LinuxManifest(ViewerManifest): class LinuxManifest(ViewerManifest):
def construct(self): def construct(self):
super(LinuxManifest, self).construct() super(LinuxManifest, 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")
self.path("licenses-linux.txt","licenses.txt") self.path("licenses-linux.txt","licenses.txt")
if self.prefix("linux_tools", dst=""): if self.prefix("linux_tools", dst=""):
self.path("client-readme.txt","README-linux.txt") self.path("client-readme.txt","README-linux.txt")
...@@ -976,7 +981,7 @@ def construct(self): ...@@ -976,7 +981,7 @@ def construct(self):
if self.prefix(src="", dst="bin"): if self.prefix(src="", dst="bin"):
self.path("secondlife-bin","do-not-directly-run-secondlife-bin") self.path("secondlife-bin","do-not-directly-run-secondlife-bin")
self.path("../linux_crash_logger/linux-crash-logger","linux-crash-logger.bin") self.path("../linux_crash_logger/linux-crash-logger","linux-crash-logger.bin")
self.path2basename("../llplugin/slplugin", "SLPlugin") self.path2basename(pkgdir, "SLPlugin")
self.path2basename("../viewer_components/updater/scripts/linux", "update_install") self.path2basename("../viewer_components/updater/scripts/linux", "update_install")
self.end_prefix("bin") self.end_prefix("bin")
...@@ -996,9 +1001,9 @@ def construct(self): ...@@ -996,9 +1001,9 @@ def construct(self):
self.end_prefix(icon_path) self.end_prefix(icon_path)
# plugins # plugins
if self.prefix(src="", dst="bin/llplugin"): if self.prefix(src=os.path.join(pkgdir, "llplugin"), dst="bin/llplugin"):
self.path2basename("../media_plugins/webkit", "libmedia_plugin_webkit.so") self.path("libmedia_plugin_webkit.so")
self.path("../media_plugins/gstreamer010/libmedia_plugin_gstreamer010.so", "libmedia_plugin_gstreamer.so") self.path("libmedia_plugin_gstreamer.so")
self.end_prefix("bin/llplugin") self.end_prefix("bin/llplugin")
# llcommon # llcommon
...@@ -1060,7 +1065,11 @@ class Linux_i686_Manifest(LinuxManifest): ...@@ -1060,7 +1065,11 @@ class Linux_i686_Manifest(LinuxManifest):
def construct(self): def construct(self):
super(Linux_i686_Manifest, self).construct() super(Linux_i686_Manifest, self).construct()
if self.prefix("../packages/lib/release", dst="lib"): 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.prefix(relpkgdir, dst="lib"):
self.path("libapr-1.so") self.path("libapr-1.so")
self.path("libapr-1.so.0") self.path("libapr-1.so.0")
self.path("libapr-1.so.0.4.5") self.path("libapr-1.so.0.4.5")
...@@ -1123,10 +1132,10 @@ def construct(self): ...@@ -1123,10 +1132,10 @@ def construct(self):
self.end_prefix("lib") self.end_prefix("lib")
# Vivox runtimes # Vivox runtimes
if self.prefix(src="../packages/lib/release", dst="bin"): if self.prefix(src=relpkgdir, dst="bin"):
self.path("SLVoice") self.path("SLVoice")
self.end_prefix() self.end_prefix()
if self.prefix(src="../packages/lib/release", dst="lib"): if self.prefix(src=relpkgdir, dst="lib"):
self.path("libortp.so") self.path("libortp.so")
self.path("libsndfile.so.1") self.path("libsndfile.so.1")
#self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib
...@@ -1135,7 +1144,7 @@ def construct(self): ...@@ -1135,7 +1144,7 @@ def construct(self):
self.end_prefix("lib") self.end_prefix("lib")
# plugin runtime # plugin runtime
if self.prefix(src="../packages/lib/release", dst="lib"): if self.prefix(src=os.path.join(pkgdir, "lib"), dst="lib"):
self.path("libQtCore.so*") self.path("libQtCore.so*")
self.path("libQtGui.so*") self.path("libQtGui.so*")
self.path("libQtNetwork.so*") self.path("libQtNetwork.so*")
...@@ -1146,7 +1155,8 @@ def construct(self): ...@@ -1146,7 +1155,8 @@ def construct(self):
self.end_prefix("lib") self.end_prefix("lib")
# For WebKit/Qt plugin runtimes (image format plugins) # For WebKit/Qt plugin runtimes (image format plugins)
if self.prefix(src="../packages/plugins/imageformats", dst="bin/llplugin/imageformats"): if self.prefix(src=os.path.join(pkgdir, "llplugin", "imageformats"),
dst="bin/llplugin/imageformats"):
self.path("libqgif.so") self.path("libqgif.so")
self.path("libqico.so") self.path("libqico.so")
self.path("libqjpeg.so") self.path("libqjpeg.so")
...@@ -1156,7 +1166,8 @@ def construct(self): ...@@ -1156,7 +1166,8 @@ def construct(self):
self.end_prefix("bin/llplugin/imageformats") self.end_prefix("bin/llplugin/imageformats")
# For WebKit/Qt plugin runtimes (codec/character encoding plugins) # For WebKit/Qt plugin runtimes (codec/character encoding plugins)
if self.prefix(src="../packages/plugins/codecs", dst="bin/llplugin/codecs"): if self.prefix(src=os.path.join(pkgdir, "llplugin", "codecs"),
dst="bin/llplugin/codecs"):
self.path("libqcncodecs.so") self.path("libqcncodecs.so")
self.path("libqjpcodecs.so") self.path("libqjpcodecs.so")
self.path("libqkrcodecs.so") self.path("libqkrcodecs.so")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment