merge changes for fixes from nat and aura
Oz Linden
commit
5000a7d611
|
|
@ -838,9 +838,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>e3beae52840e51cf0aff79b93033c679</string>
|
||||
<string>171b39db6d0702535b41fad5b476e39d</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/297966/arch/Darwin/installer/google_breakpad-1413.297966-darwin-297966.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298033/arch/Darwin/installer/google_breakpad-1413.298033-darwin-298033.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin</string>
|
||||
|
|
@ -850,9 +850,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>8ad86f0b671de2a66db956a9c1264be9</string>
|
||||
<string>0bf69fbc829d964820b798a0494278c9</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/297966/arch/Linux/installer/google_breakpad-1413.297966-linux-297966.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298033/arch/Linux/installer/google_breakpad-1413.298033-linux-298033.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -862,16 +862,16 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>2d4e64c149f5593bfd5d585b0e35b7a7</string>
|
||||
<string>a124eaa547701f6d7827a7d0811d51c1</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/297966/arch/CYGWIN/installer/google_breakpad-1413.297966-windows-297966.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/298033/arch/CYGWIN/installer/google_breakpad-1413.298033-windows-298033.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>1413.297966</string>
|
||||
<string>1332.295565</string>
|
||||
</map>
|
||||
<key>googlemock</key>
|
||||
<map>
|
||||
|
|
@ -1534,11 +1534,11 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>700bce57e9db4a5add5f3b6a6f2871d1</string>
|
||||
<string>990b24876d56c2ca685f2734c9f86a9b</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/297895/arch/Darwin/installer/llphysicsextensions_source-1.0.297895-darwin-297895.tar.bz2</string>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298097/arch/Darwin/installer/llphysicsextensions_source-1.0.298097-darwin-298097.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin</string>
|
||||
|
|
@ -1548,9 +1548,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>36398845726a377fe37a60c675ad1499</string>
|
||||
<string>19a56cfd6a6f0249ac02825f435202f1</string>
|
||||
<key>url</key>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/297895/arch/Linux/installer/llphysicsextensions_source-1.0.297895-linux-297895.tar.bz2</string>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298097/arch/Linux/installer/llphysicsextensions_source-1.0.298097-linux-298097.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1560,16 +1560,16 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>bc2e7d312e35c5622cc4b01feff65a89</string>
|
||||
<string>70b4b374c7bb3a34b8089784b69599c6</string>
|
||||
<key>url</key>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/297895/arch/CYGWIN/installer/llphysicsextensions_source-1.0.297895-windows-297895.tar.bz2</string>
|
||||
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298097/arch/CYGWIN/installer/llphysicsextensions_source-1.0.298097-windows-298097.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>1.0.297895</string>
|
||||
<string>1.0.298097</string>
|
||||
</map>
|
||||
<key>llphysicsextensions_stub</key>
|
||||
<map>
|
||||
|
|
@ -1588,11 +1588,11 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>200e25ae502af90db83e88274f0f1ecf</string>
|
||||
<string>00d185f885fc7b5cebf5ae3ee172a283</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/297894/arch/Darwin/installer/llphysicsextensions_stub-1.0.297894-darwin-297894.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298098/arch/Darwin/installer/llphysicsextensions_stub-1.0.298098-darwin-298098.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin</string>
|
||||
|
|
@ -1602,9 +1602,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>5fd0fb6634d7fbc77f012a66e38063d8</string>
|
||||
<string>26bc7de44454c124ba8220cbf72c5924</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/297894/arch/Linux/installer/llphysicsextensions_stub-1.0.297894-linux-297894.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298098/arch/Linux/installer/llphysicsextensions_stub-1.0.298098-linux-298098.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
|
|
@ -1614,16 +1614,16 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>4c33f540a54591b12e3a2bc08047cd80</string>
|
||||
<string>9d6efef4e5aa74e1c846fd89558b6293</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/297894/arch/CYGWIN/installer/llphysicsextensions_stub-1.0.297894-windows-297894.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298098/arch/CYGWIN/installer/llphysicsextensions_stub-1.0.298098-windows-298098.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>1.0.297894</string>
|
||||
<string>1.0.298098</string>
|
||||
</map>
|
||||
<key>llqtwebkit</key>
|
||||
<map>
|
||||
|
|
@ -2077,6 +2077,18 @@
|
|||
<string>slplugins</string>
|
||||
<key>platforms</key>
|
||||
<map>
|
||||
<key>darwin</key>
|
||||
<map>
|
||||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>f6bfb026572f03a4c8ac6b2b7d7eb0ae</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/slplugins_3p-update-slplugins/rev/298079/arch/Darwin/installer/slplugins-3.7.24.297623.298079-darwin-298079.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin</string>
|
||||
</map>
|
||||
<key>windows</key>
|
||||
<map>
|
||||
<key>archive</key>
|
||||
|
|
@ -2093,7 +2105,7 @@
|
|||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>3.7.22.297128.297645</string>
|
||||
<string>3.7.24.297623.298079</string>
|
||||
</map>
|
||||
<key>slvoice</key>
|
||||
<map>
|
||||
|
|
|
|||
|
|
@ -619,12 +619,16 @@ class Darwin_i386_Manifest(ViewerManifest):
|
|||
# copy over the build result (this is a no-op if run within the xcode script)
|
||||
self.path(self.args['configuration'] + "/Second Life.app", dst="")
|
||||
|
||||
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(src="", dst="Contents"): # everything goes in Contents
|
||||
self.path("Info.plist", dst="Info.plist")
|
||||
|
||||
# copy additional libs in <bundle>/Contents/MacOS/
|
||||
self.path("../packages/lib/release/libndofdev.dylib", dst="Resources/libndofdev.dylib")
|
||||
self.path("../packages/lib/release/libhunspell-1.3.0.dylib", dst="Resources/libhunspell-1.3.0.dylib")
|
||||
self.path(os.path.join(relpkgdir, "libndofdev.dylib"), dst="Resources/libndofdev.dylib")
|
||||
self.path(os.path.join(relpkgdir, "libhunspell-1.3.0.dylib"), dst="Resources/libhunspell-1.3.0.dylib")
|
||||
|
||||
if self.prefix(dst="MacOS"):
|
||||
self.path2basename("../viewer_components/updater/scripts/darwin", "*.py")
|
||||
|
|
@ -684,7 +688,6 @@ class Darwin_i386_Manifest(ViewerManifest):
|
|||
print "Skipping %s" % dst
|
||||
return []
|
||||
|
||||
libdir = "../packages/lib/release"
|
||||
# dylibs is a list of all the .dylib files we expect to need
|
||||
# in our bundled sub-apps. For each of these we'll create a
|
||||
# symlink from sub-app/Contents/Resources to the real .dylib.
|
||||
|
|
@ -694,7 +697,7 @@ class Darwin_i386_Manifest(ViewerManifest):
|
|||
"llcommon",
|
||||
self.args['configuration'],
|
||||
libfile),
|
||||
os.path.join(libdir, libfile)),
|
||||
os.path.join(relpkgdir, libfile)),
|
||||
dst=libfile)
|
||||
|
||||
for libfile in (
|
||||
|
|
@ -705,7 +708,7 @@ class Darwin_i386_Manifest(ViewerManifest):
|
|||
"libexception_handler.dylib",
|
||||
"libGLOD.dylib",
|
||||
):
|
||||
dylibs += path_optional(os.path.join(libdir, libfile), libfile)
|
||||
dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
|
||||
|
||||
# SLVoice and vivox lols, no symlinks needed
|
||||
for libfile in (
|
||||
|
|
@ -717,38 +720,41 @@ class Darwin_i386_Manifest(ViewerManifest):
|
|||
'ca-bundle.crt',
|
||||
'SLVoice',
|
||||
):
|
||||
self.path2basename(libdir, libfile)
|
||||
self.path2basename(relpkgdir, libfile)
|
||||
|
||||
# dylibs that vary based on configuration
|
||||
if self.args['configuration'].lower() == 'debug':
|
||||
for libfile in (
|
||||
"libfmodexL.dylib",
|
||||
):
|
||||
dylibs += path_optional(os.path.join("../packages/lib/debug",
|
||||
libfile), libfile)
|
||||
dylibs += path_optional(os.path.join(debpkgdir, libfile), libfile)
|
||||
else:
|
||||
for libfile in (
|
||||
"libfmodex.dylib",
|
||||
):
|
||||
dylibs += path_optional(os.path.join("../packages/lib/release",
|
||||
libfile), libfile)
|
||||
dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
|
||||
|
||||
# our apps
|
||||
for app_bld_dir, app in (("mac_crash_logger", "mac-crash-logger.app"),
|
||||
for app_bld_dir, app in ((os.path.join(os.pardir,
|
||||
"mac_crash_logger",
|
||||
self.args['configuration']),
|
||||
"mac-crash-logger.app"),
|
||||
# plugin launcher
|
||||
(os.path.join("llplugin", "slplugin"), "SLPlugin.app"),
|
||||
(pkgdir, "SLPlugin.app"),
|
||||
):
|
||||
self.path2basename(os.path.join(os.pardir,
|
||||
app_bld_dir, self.args['configuration']),
|
||||
app)
|
||||
self.path2basename(app_bld_dir, app)
|
||||
|
||||
# our apps dependencies on shared libs
|
||||
# for each app, for each dylib we collected in dylibs,
|
||||
# create a symlink to the real copy of the dylib.
|
||||
resource_path = self.dst_path_of(os.path.join(app, "Contents", "Resources"))
|
||||
for libfile in dylibs:
|
||||
symlinkf(os.path.join(os.pardir, os.pardir, os.pardir, libfile),
|
||||
os.path.join(resource_path, libfile))
|
||||
src = os.path.join(os.pardir, os.pardir, os.pardir, libfile)
|
||||
dst = os.path.join(resource_path, libfile)
|
||||
try:
|
||||
symlinkf(src, dst)
|
||||
except OSError as err:
|
||||
print "Can't symlink %s -> %s: %s" % (src, dst, err)
|
||||
# SLPlugin.app/Contents/Resources gets those Qt4 libraries it needs.
|
||||
if self.prefix(src="", dst="SLPlugin.app/Contents/Resources"):
|
||||
for libfile in ('libQtCore.4.dylib',
|
||||
|
|
@ -765,26 +771,24 @@ class Darwin_i386_Manifest(ViewerManifest):
|
|||
'libQtWebKit.4.7.1.dylib',
|
||||
'libQtXml.4.dylib',
|
||||
'libQtXml.4.7.1.dylib'):
|
||||
self.path2basename("../packages/lib/release", libfile)
|
||||
self.path2basename(relpkgdir, libfile)
|
||||
self.end_prefix("SLPlugin.app/Contents/Resources")
|
||||
|
||||
# Qt4 codecs go to llplugin. Not certain why but this is the first
|
||||
# location probed according to dtruss so we'll go with that.
|
||||
if self.prefix(src="../packages/plugins/codecs/", dst="llplugin/codecs"):
|
||||
if self.prefix(src=os.path.join(pkgdir, "llplugin/codecs/"), dst="llplugin/codecs"):
|
||||
self.path("libq*.dylib")
|
||||
self.end_prefix("llplugin/codecs")
|
||||
|
||||
# Similarly for imageformats.
|
||||
if self.prefix(src="../packages/plugins/imageformats/", dst="llplugin/imageformats"):
|
||||
if self.prefix(src=os.path.join(pkgdir, "llplugin/imageformats/"), dst="llplugin/imageformats"):
|
||||
self.path("libq*.dylib")
|
||||
self.end_prefix("llplugin/imageformats")
|
||||
|
||||
# SLPlugin plugins proper
|
||||
if self.prefix(src="", dst="llplugin"):
|
||||
self.path2basename("../media_plugins/quicktime/" + self.args['configuration'],
|
||||
"media_plugin_quicktime.dylib")
|
||||
self.path2basename("../media_plugins/webkit/" + self.args['configuration'],
|
||||
"media_plugin_webkit.dylib")
|
||||
if self.prefix(src=os.path.join(pkgdir, "llplugin"), dst="llplugin"):
|
||||
self.path("media_plugin_quicktime.dylib")
|
||||
self.path("media_plugin_webkit.dylib")
|
||||
self.end_prefix("llplugin")
|
||||
|
||||
self.end_prefix("Resources")
|
||||
|
|
|
|||
Loading…
Reference in New Issue