From bfc1693f2d15cd33c601f1d8b890960633cfb68d Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Mon, 12 Jan 2015 12:28:34 -0800 Subject: Latest google-breakpad repo to fix Mac Yosemite issues. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 8ae91aa63f..5bdb4dea3e 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -838,9 +838,9 @@ archive hash - a41182ffaabaf72fd170535c0879eac0 + e3beae52840e51cf0aff79b93033c679 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/294995/arch/Darwin/installer/google_breakpad-1332.294995-darwin-294995.tar.bz2 + 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 name darwin @@ -850,9 +850,9 @@ archive hash - 52257e5eb166a0b69c9c0c38f6e1920e + 8ad86f0b671de2a66db956a9c1264be9 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273079/arch/Linux/installer/google_breakpad-0.0.0-rev1099-linux-20130329.tar.bz2 + 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 name linux @@ -862,9 +862,9 @@ archive hash - 0af9ab8c34f4acb8b0c2ae56488ee0a9 + 2d4e64c149f5593bfd5d585b0e35b7a7 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/google-breakpad_3p-update-google-breakpad/rev/295565/arch/CYGWIN/installer/google_breakpad-1332.295565-windows-295565.tar.bz2 + 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 name windows -- cgit v1.2.3 From 9cca28f526693a47f6007ddca44f0a58c90f7edb Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 12 Jan 2015 17:18:28 -0500 Subject: On Mac, if we can't symlink .dylibs, print error message and continue. To this point, we've been failing the build with a Python OSError traceback, which is less than ideal. --- indra/newview/viewer_manifest.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7ee1a37175..01590db648 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -747,8 +747,12 @@ class Darwin_i386_Manifest(ViewerManifest): # 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', -- cgit v1.2.3 From 579dbbf0a59d7f20bf6340d4c77ffeb6ff67bd4c Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Tue, 13 Jan 2015 11:53:12 -0800 Subject: Updated google breakpad package. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index d7d02c437a..5d92cb2ce8 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -838,9 +838,9 @@ archive hash - e3beae52840e51cf0aff79b93033c679 + 4d689c48a843020adea1246f43260432 url - 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 + 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 name darwin @@ -850,9 +850,9 @@ archive hash - 8ad86f0b671de2a66db956a9c1264be9 + 976f0b4c5f964e19d3dc79c3d1722cde url - 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 + 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 name linux @@ -862,9 +862,9 @@ archive hash - 2d4e64c149f5593bfd5d585b0e35b7a7 + 4ce3cd02053ccb5a6b0a8ba5c450ecd4 url - 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 + 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 name windows -- cgit v1.2.3 From 253d487826bb63267526ae799b2072ce30fcbc10 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Tue, 13 Jan 2015 13:23:14 -0800 Subject: Updated breakpad repos again. Thanks Windows. --- autobuild.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 5d92cb2ce8..af05d869c7 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -838,7 +838,7 @@ archive hash - 4d689c48a843020adea1246f43260432 + 171b39db6d0702535b41fad5b476e39d url 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 @@ -850,7 +850,7 @@ archive hash - 976f0b4c5f964e19d3dc79c3d1722cde + 0bf69fbc829d964820b798a0494278c9 url 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 @@ -862,7 +862,7 @@ archive hash - 4ce3cd02053ccb5a6b0a8ba5c450ecd4 + a124eaa547701f6d7827a7d0811d51c1 url 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 -- cgit v1.2.3 From baf2153eff089d5285e31bf47118cf2bdf181b0d Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 14 Jan 2015 11:52:56 -0800 Subject: Integrate Callum's Mac slplugins package --- autobuild.xml | 14 +++++++++++- indra/newview/viewer_manifest.py | 46 ++++++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index af05d869c7..4dc3aa7af4 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2077,6 +2077,18 @@ slplugins platforms + darwin + + archive + + hash + f6bfb026572f03a4c8ac6b2b7d7eb0ae + url + 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 + + name + darwin + windows archive @@ -2093,7 +2105,7 @@ version - 3.7.22.297128.297645 + 3.7.24.297623.298079 slvoice diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 01590db648..954e454080 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -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 /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,30 +720,29 @@ 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, @@ -769,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") -- cgit v1.2.3 From ac541ec0c8a1b8aa2727834f79cd4fe4ca5c325a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 14 Jan 2015 15:58:04 -0500 Subject: Update to llphysicsextensions with platform-specific MAP pathnames. --- autobuild.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 4dc3aa7af4..9dafcc401a 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1534,11 +1534,11 @@ archive hash - 700bce57e9db4a5add5f3b6a6f2871d1 + cb503a2938a3e1ed54a88ecde25983ae hash_algorithm md5 url - 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 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298094/arch/Darwin/installer/llphysicsextensions_source-1.0.298094-darwin-298094.tar.bz2 name darwin @@ -1548,9 +1548,9 @@ archive hash - 36398845726a377fe37a60c675ad1499 + 52f0fde3aa406dfe41f22c80f14a6008 url - 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 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298094/arch/Linux/installer/llphysicsextensions_source-1.0.298094-linux-298094.tar.bz2 name linux @@ -1560,16 +1560,16 @@ archive hash - bc2e7d312e35c5622cc4b01feff65a89 + be7452203712440a45bbf13209de507c url - 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 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298094/arch/CYGWIN/installer/llphysicsextensions_source-1.0.298094-windows-298094.tar.bz2 name windows version - 1.0.297895 + 1.0.298094 llphysicsextensions_stub @@ -1588,11 +1588,11 @@ archive hash - 200e25ae502af90db83e88274f0f1ecf + f362387b4ed04570b0d6282fea5ee80b hash_algorithm md5 url - 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 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298093/arch/Darwin/installer/llphysicsextensions_stub-1.0.298093-darwin-298093.tar.bz2 name darwin @@ -1602,9 +1602,9 @@ archive hash - 5fd0fb6634d7fbc77f012a66e38063d8 + b00fbb7aa72d76576865e598eda9960d url - 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 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298093/arch/Linux/installer/llphysicsextensions_stub-1.0.298093-linux-298093.tar.bz2 name linux @@ -1614,16 +1614,16 @@ archive hash - 4c33f540a54591b12e3a2bc08047cd80 + 2b082d184d776ef3f971c40a5bc63305 url - 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 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298093/arch/CYGWIN/installer/llphysicsextensions_stub-1.0.298093-windows-298093.tar.bz2 name windows version - 1.0.297894 + 1.0.298093 llqtwebkit -- cgit v1.2.3 From c4d81df594129678914257d46438ba0bb2d0aa79 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 14 Jan 2015 17:08:58 -0500 Subject: Update to llphysicsextensions with fix for platform .MAP pathnames. --- autobuild.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 9dafcc401a..60e012ef20 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1534,11 +1534,11 @@ archive hash - cb503a2938a3e1ed54a88ecde25983ae + 990b24876d56c2ca685f2734c9f86a9b hash_algorithm md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298094/arch/Darwin/installer/llphysicsextensions_source-1.0.298094-darwin-298094.tar.bz2 + 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 name darwin @@ -1548,9 +1548,9 @@ archive hash - 52f0fde3aa406dfe41f22c80f14a6008 + 19a56cfd6a6f0249ac02825f435202f1 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298094/arch/Linux/installer/llphysicsextensions_source-1.0.298094-linux-298094.tar.bz2 + 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 name linux @@ -1560,16 +1560,16 @@ archive hash - be7452203712440a45bbf13209de507c + 70b4b374c7bb3a34b8089784b69599c6 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions-source_llphysicsextensions-update/rev/298094/arch/CYGWIN/installer/llphysicsextensions_source-1.0.298094-windows-298094.tar.bz2 + 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 name windows version - 1.0.298094 + 1.0.298097 llphysicsextensions_stub @@ -1588,11 +1588,11 @@ archive hash - f362387b4ed04570b0d6282fea5ee80b + 00d185f885fc7b5cebf5ae3ee172a283 hash_algorithm md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298093/arch/Darwin/installer/llphysicsextensions_stub-1.0.298093-darwin-298093.tar.bz2 + 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 name darwin @@ -1602,9 +1602,9 @@ archive hash - b00fbb7aa72d76576865e598eda9960d + 26bc7de44454c124ba8220cbf72c5924 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298093/arch/Linux/installer/llphysicsextensions_stub-1.0.298093-linux-298093.tar.bz2 + 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 name linux @@ -1614,16 +1614,16 @@ archive hash - 2b082d184d776ef3f971c40a5bc63305 + 9d6efef4e5aa74e1c846fd89558b6293 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions-stub_llphysicsextensions-update/rev/298093/arch/CYGWIN/installer/llphysicsextensions_stub-1.0.298093-windows-298093.tar.bz2 + 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 name windows version - 1.0.298093 + 1.0.298098 llqtwebkit -- cgit v1.2.3