livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

All: Update openssl to 1.0.1h/290662, curl to 290664, llqtwebkit to 290663. 

Linux:  Include libQtXml and libQtSvg in manifest for libqsvg.so.
More documentation thoughts for library package structure.
master
Monty Brandenberg 2014-06-05 18:37:24 -04:00
parent eb8cf27cc5
commit 2ccbef39a6
3 changed files with 64 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
autobuild.xml
View File

@ -282,9 +282,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>9a3e5c5df35a8a3971b0c2c86549ff29</string>
<string>f5a699c93beb1a854d0b51382b5cecc8</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-curl-update/rev/290567/arch/Darwin/installer/curl-7.37.0-darwin-20140602.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-curl-update/rev/290664/arch/Darwin/installer/curl-7.37.0-darwin-20140605.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -294,9 +294,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>e28e06e73852c1fee0b3c6689aa3180d</string>
<string>2bc285edffd0e55e0cd6290f39854a89</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-curl-update/rev/290567/arch/Linux/installer/curl-7.37.0-linux-20140602.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-curl-update/rev/290664/arch/Linux/installer/curl-7.37.0-linux-20140605.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -306,9 +306,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>e5194983014a6182457ceca4cf7a5d0c</string>
<string>8d3b197d7a114d2b688d2831a0a59757</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-curl-update/rev/290567/arch/CYGWIN/installer/curl-7.37.0-windows-20140602.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-curl-update/rev/290664/arch/CYGWIN/installer/curl-7.37.0-windows-20140605.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1444,9 +1444,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ef634af120da8f8ee00d06d294a701af</string>
<string>79afb464255be2be7c02fdfac10bcd5c</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-llqtwebkit2/rev/290578/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20140602.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-llqtwebkit2/rev/290663/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20140605.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -1456,9 +1456,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>cb9e94219391c4ca7d904ff7fab68a20</string>
<string>090190a8dd80efe1f0933c7ed307e6f1</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-llqtwebkit2/rev/290578/arch/Linux/installer/llqtwebkit-4.7.1-linux-20140602.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-llqtwebkit2/rev/290663/arch/Linux/installer/llqtwebkit-4.7.1-linux-20140605.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -1468,9 +1468,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>5cb4e4d8b34e2566313fc2616dfca6bc</string>
<string>650f2a30a83eacde238fcc87ff161190</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-llqtwebkit2/rev/290578/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20140602.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-llqtwebkit2/rev/290663/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20140605.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1724,9 +1724,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ef74230aa851331bf29a3947309e9883</string>
<string>4db126327bbb125ea2490c79c73103bf</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/290560/arch/Darwin/installer/openssl-1.0.1g-darwin-20140602.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/290662/arch/Darwin/installer/openssl-1.0.1h-darwin-20140605.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -1736,9 +1736,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>0f0a72a8f0ffbf46e71551a6c545b1f5</string>
<string>0665c18f8cdbe2f90cb0a2f088cfe1a6</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/290560/arch/Linux/installer/openssl-1.0.1g-linux-20140602.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/290662/arch/Linux/installer/openssl-1.0.1h-linux-20140605.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -1748,9 +1748,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>b622c5974a2a61b473e7e0747c1e38d5</string>
<string>138997e1a73c65525d45c00f43f08010</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/290560/arch/CYGWIN/installer/openssl-1.0.1g-windows-20140602.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-openssl-update/rev/290662/arch/CYGWIN/installer/openssl-1.0.1h-windows-20140605.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>

46
indra/cmake/00-COMPILE-LINK-RUN.txt
View File

@ -10,7 +10,7 @@ Introduction
with hints and rules about doing things well. What's presented is
a guideline only. Not all suggestions are hard rules and you'll
find exceptions all over. Some exceptions arise from solid
reasining, others may be legacy that hasn't been re-examined.
reasoning, others may be legacy that hasn't been re-examined.
Use good engineering judgement when applying this information.
@ -244,7 +244,7 @@ Futures
So, what to do? My natural bias for large software is to use
shared libraries for everything. It's a path to single-version
and singleton data and isolates namespaces and prevents
interactions. It also has some field servicability benefits if
interactions. It also has some field serviceability benefits if
you need to debug some bizarre problem a user has.
But there's a local preference for static. Here, my
@ -281,6 +281,48 @@ Futures
decide what changes you need here as those changes will propagate
outwards forcing many other decisions (cf: /Zc:wchar_t- flag).
The current package structure (./include, ./lib/release,
./lib/debug, etc.) really works against the conventions used by
configure-like programs. I wasted a lot of time getting each
library to work with our structure without having to go back to
automake/autoconf. For Linux and Mac (and even for Windows), a
structure like the following where each grouping is optional would
probably save some work:
./debug/bin
/include
/lib
./debug/shared/bin
/include
/lib
./debug/static/bin
/include
/lib
./release/bin
/include
/lib
...
In zlib and openssl and in a few of the libraries that consume
them, I experimented with packaging both static and shared
libraries and then having the consumer library move the unwanted
pieces out of the way to use the library type of choice (see
restore_dylibs() and restore_sos() functions). It was a bit fussy
and simplicity and clarity are the keys to maintaining libraries
in the future.
But it did suggest another approach. The idea is that every build
pre-stages inputs. Before anything is built, package pieces are
copied or symlinked from the 'stage/packages' area to the
'stage/input' area. Builds then proceed with a single set of
-I/-L options for the dependencies. And products are built and
installed in a similar output staging structure for the next
consumer:
stage/packages/<package>/[above structure]
stage/input/{bin,include,lib}
stage/<package>/[above structure]
Next library project. I'd recommend working on the related set of
libexpat, apr, aprutil, xmlrpc-epi. We know libexpat has some
updates that should improve stability. Libapr consumes it and it

2
indra/newview/viewer_manifest.py
View File

@ -1174,7 +1174,9 @@ class Linux_i686_Manifest(LinuxManifest):
self.path("libQtGui.so*")
self.path("libQtNetwork.so*")
self.path("libQtOpenGL.so*")
self.path("libQtSvg.so*")
self.path("libQtWebKit.so*")
self.path("libQtXml.so*")
self.end_prefix("lib")
# For WebKit/Qt plugin runtimes (image format plugins)