From a1a2b672accbcf6f309e01b4717013a7386484bb Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 12 Sep 2018 11:30:43 -0400 Subject: DRTVWR-474: Update to viewer-manager build 519565 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index f07cae8e81..67130a60fd 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3260,9 +3260,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - f45c0a5e7b4601b355e163bf62f5718e + cc08a265bd620a5c6756a6c8ddb104ef url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/20587/147509/viewer_manager-1.0.517052-darwin64-517052.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24391/190021/viewer_manager-1.0.519565-darwin64-519565.tar.bz2 name darwin64 @@ -3284,9 +3284,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - d2443caf062697430071d458a965f611 + 40f0b7ecb420e0aa8761e434311e2d20 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/20588/147516/viewer_manager-1.0.517052-windows-517052.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24393/190032/viewer_manager-1.0.519565-windows-519565.tar.bz2 name windows @@ -3297,7 +3297,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 1.0.517052 + 1.0.519565 vlc-bin -- cgit v1.3 From d56ef598f64807100febe5efd835fd287c5f9698 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 12 Sep 2018 12:12:30 -0400 Subject: DRTVWR-474: Update to viewer-manager build 519568 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 67130a60fd..c12cf8108b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3260,9 +3260,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - cc08a265bd620a5c6756a6c8ddb104ef + 7ce54dcea1607e7cb6a9cccd9a58e628 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24391/190021/viewer_manager-1.0.519565-darwin64-519565.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24396/190047/viewer_manager-2.0.519568-darwin64-519568.tar.bz2 name darwin64 @@ -3284,9 +3284,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 40f0b7ecb420e0aa8761e434311e2d20 + 8a06295a3b351b943d2b925eb589ff2b url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24393/190032/viewer_manager-1.0.519565-windows-519565.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24395/190053/viewer_manager-2.0.519568-windows-519568.tar.bz2 name windows @@ -3297,7 +3297,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 1.0.519565 + 2.0.519568 vlc-bin -- cgit v1.3 From 0c995db8dc90f64263d09a11274088a9b3df9305 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 12 Sep 2018 14:04:36 -0400 Subject: DRTVWR-474: Update to viewer-manager build 519577 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index c12cf8108b..6b87d5575a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3260,9 +3260,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 7ce54dcea1607e7cb6a9cccd9a58e628 + 876dbbf0f479948488f04eae74dff04b url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24396/190047/viewer_manager-2.0.519568-darwin64-519568.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24410/190107/viewer_manager-2.0.519577-darwin64-519577.tar.bz2 name darwin64 @@ -3284,9 +3284,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 8a06295a3b351b943d2b925eb589ff2b + 6616fec70baf8375ed3afca9767b6be5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24395/190053/viewer_manager-2.0.519568-windows-519568.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24411/190113/viewer_manager-2.0.519577-windows-519577.tar.bz2 name windows @@ -3297,7 +3297,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.519568 + 2.0.519577 vlc-bin -- cgit v1.3 From 08fefb454bfbf98e90e95af329b21d7e6e146330 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 13 Sep 2018 16:21:50 -0400 Subject: DRTVWR-474: Update to viewer-manager build 519640 --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 6b87d5575a..1277f70b0b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3248,7 +3248,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors description Linden Lab Viewer Management Process suite. license - Proprietary + viewerlgpl license_file LICENSE name @@ -3260,9 +3260,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 876dbbf0f479948488f04eae74dff04b + 952c2e32e37ef67115ba3074892961c3 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24410/190107/viewer_manager-2.0.519577-darwin64-519577.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24508/190821/viewer_manager-2.0.519640-darwin64-519640.tar.bz2 name darwin64 @@ -3284,9 +3284,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 6616fec70baf8375ed3afca9767b6be5 + 7c8b210c1687a100f0b295d60ffac2c5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24411/190113/viewer_manager-2.0.519577-windows-519577.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24507/190827/viewer_manager-2.0.519640-windows-519640.tar.bz2 name windows @@ -3297,7 +3297,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.519577 + 2.0.519640 vlc-bin -- cgit v1.3 From 8761e87ac526034f7a601eee5fdb667eba6eefda Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 24 Sep 2018 14:02:23 -0400 Subject: DRTVWR-474: Remove Python autobuild packages and references to them. We expect the viewer-manager package to be self-contained: we expect it to bring with it any Python packages it requires. We no longer force developers to wrap third-party Python packages as autobuild packages. --- autobuild.xml | 176 --------------------------------------- indra/cmake/LLBase.cmake | 4 - indra/cmake/Requests.cmake | 7 -- indra/newview/CMakeLists.txt | 2 - indra/newview/viewer_manifest.py | 8 -- 5 files changed, 197 deletions(-) delete mode 100644 indra/cmake/LLBase.cmake delete mode 100644 indra/cmake/Requests.cmake (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 1277f70b0b..29066d7c49 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -225,36 +225,6 @@ version 1.57 - chardet - - copyright - Contributors to charset (see https://github.com/chardet/chardet) - description - Python Character Encoding Library - license - LGPL - license_file - LICENSES/chardet.txt - name - chardet - platforms - - darwin64 - - archive - - hash - 0124862b6a1b88455c78a68f8b823d21 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6662/23578/chardet-3.0.4-darwin64-506651.tar.bz2 - - name - darwin64 - - - version - 3.0.4 - colladadom copyright @@ -1465,36 +1435,6 @@ version 2012.1-2 - idna - - copyright - Copyright (c) 2013-2017, Kim Davies. All rights reserved. - description - Python Internationalized Domain Names in Applications (IDNA) Library - license - see idna.rst - license_file - LICENSES/idna.rst - name - idna - platforms - - darwin64 - - archive - - hash - 7dfe9fc4023d7d4f511dd9fac7258266 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6663/23584/idna-2.5-darwin64-506652.tar.bz2 - - name - darwin64 - - - version - 2.5 - jpeglib copyright @@ -2173,46 +2113,6 @@ version 0.0.1 - llbase - - copyright - Copyright (c) 2010, Linden Research, Inc. - license - mit - license_file - LICENSES/llbase-license.txt - name - llbase - platforms - - darwin64 - - archive - - hash - e18eeb0691af053b83bd46b76c6ee86a - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6299/21982/llbase-0.9.3.506286-darwin64-506286.tar.bz2 - - name - darwin64 - - windows - - archive - - hash - e6865670f9bca1c82fb8b91db3ea515c - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6301/21994/llbase-0.9.3.506286-windows-506286.tar.bz2 - - name - windows - - - version - 0.9.3.506286 - llca copyright @@ -2955,52 +2855,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors version 8.35.500898 - requests - - copyright - Copyright 2016 Kenneth Reitz - description - Python HTTP Library - license - Apache - license_file - LICENSES/requests.txt - name - requests - platforms - - darwin64 - - archive - - hash - b8d134a970261b445a3f376ba4e05ff7 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6693/23788/requests-2.18.1-darwin64-506681.tar.bz2 - - name - darwin64 - - linux64 - - archive - - hash - a92f2235991871c3d601a73cfef9b2af - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4105/11530/requests-1.0-linux64-504094.tar.bz2 - - name - linux64 - - - source - https://bitbucket.org/lindenlab/p64_python-requests - source_type - hg - version - 2.18.1 - slvoice copyright @@ -3211,36 +3065,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors version 0.8.0.1 - urllib3 - - copyright - Copyright 2008-2016 Andrey Petrov and contributors (see CONTRIBUTORS.txt) - description - Python HTTP Library - license - MIT - license_file - LICENSES/urllib3.txt - name - urllib3 - platforms - - darwin64 - - archive - - hash - 22f64c7fbb6704d2e9519fd1cca8e49b - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6659/23560/urllib3-1.21.1-darwin64-506648.tar.bz2 - - name - darwin64 - - - version - 1.21.1 - viewer-manager copyright diff --git a/indra/cmake/LLBase.cmake b/indra/cmake/LLBase.cmake deleted file mode 100644 index 76e3c688a3..0000000000 --- a/indra/cmake/LLBase.cmake +++ /dev/null @@ -1,4 +0,0 @@ -# -*- cmake -*- -include(Prebuilt) - -use_prebuilt_binary(llbase) diff --git a/indra/cmake/Requests.cmake b/indra/cmake/Requests.cmake deleted file mode 100644 index b9c729d697..0000000000 --- a/indra/cmake/Requests.cmake +++ /dev/null @@ -1,7 +0,0 @@ -if (DARWIN) - include (Prebuilt) - use_prebuilt_binary(requests) - use_prebuilt_binary(urllib3) - use_prebuilt_binary(chardet) - use_prebuilt_binary(idna) -endif (DARWIN) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 212677717e..e7111ebe54 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -16,7 +16,6 @@ include(GLOD) include(Hunspell) include(JsonCpp) include(LLAppearance) -include(LLBase) include(LLAudio) include(LLCA) include(LLCharacter) @@ -44,7 +43,6 @@ include(OPENAL) include(OpenGL) include(OpenSSL) include(PNG) -include(Requests) include(TemplateCheck) include(UI) include(UnixInstall) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 4f0f4b17d9..57da87a3ee 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -502,11 +502,6 @@ class WindowsManifest(ViewerManifest): self.path("*.png") self.path("*.gif") - #before, we only needed llbase at build time. With VMP, we need it at run time. - with self.prefix(src=os.path.join(pkgdir, "lib", "python", "llbase"), dst="llbase"): - self.path("*.py") - self.path("_cllsd.so") - # Plugin host application self.path2basename(os.path.join(os.pardir, 'llplugin', 'slplugin', self.args['configuration']), @@ -1386,9 +1381,6 @@ class LinuxManifest(ViewerManifest): #this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322 and SL-323 with self.prefix(src="../viewer_components/manager", dst=""): self.path("*.py") - with self.prefix(src=os.path.join("lib", "python", "llbase"), dst="llbase"): - self.path("*.py") - self.path("_cllsd.so") # recurses, packaged again self.path("res-sdl") -- cgit v1.3 From cc376f86e8496e9e924fd596064c13ee6aa0133e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 25 Sep 2018 11:21:34 -0400 Subject: DRTVWR-474: Update to viewer-manager build 519951 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 29066d7c49..7f18ab9abf 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3084,9 +3084,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 952c2e32e37ef67115ba3074892961c3 + 904caf508ec1718e1fc9cd321ad95715 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24508/190821/viewer_manager-2.0.519640-darwin64-519640.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24994/196128/viewer_manager-2.0.519951-darwin64-519951.tar.bz2 name darwin64 @@ -3108,9 +3108,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 7c8b210c1687a100f0b295d60ffac2c5 + e7f7ed2d40c1e554d038276fef690639 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24507/190827/viewer_manager-2.0.519640-windows-519640.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24996/196136/viewer_manager-2.0.519951-windows-519951.tar.bz2 name windows @@ -3121,7 +3121,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.519640 + 2.0.519951 vlc-bin -- cgit v1.3 From 267e7d7554a4c11e8d745be3657eed923fa65876 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 26 Sep 2018 16:37:14 -0400 Subject: DRTVWR-474: Finish pulling in new viewer-release. --- autobuild.xml | 188 ++-------------------------------------------------------- 1 file changed, 6 insertions(+), 182 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 3107d77548..7f18ab9abf 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -225,36 +225,6 @@ version 1.57 - chardet - - copyright - Contributors to charset (see https://github.com/chardet/chardet) - description - Python Character Encoding Library - license - LGPL - license_file - LICENSES/chardet.txt - name - chardet - platforms - - darwin64 - - archive - - hash - 0124862b6a1b88455c78a68f8b823d21 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6662/23578/chardet-3.0.4-darwin64-506651.tar.bz2 - - name - darwin64 - - - version - 3.0.4 - colladadom copyright @@ -1465,36 +1435,6 @@ version 2012.1-2 - idna - - copyright - Copyright (c) 2013-2017, Kim Davies. All rights reserved. - description - Python Internationalized Domain Names in Applications (IDNA) Library - license - see idna.rst - license_file - LICENSES/idna.rst - name - idna - platforms - - darwin64 - - archive - - hash - 7dfe9fc4023d7d4f511dd9fac7258266 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6663/23584/idna-2.5-darwin64-506652.tar.bz2 - - name - darwin64 - - - version - 2.5 - jpeglib copyright @@ -2173,46 +2113,6 @@ version 0.0.1 - llbase - - copyright - Copyright (c) 2010, Linden Research, Inc. - license - mit - license_file - LICENSES/llbase-license.txt - name - llbase - platforms - - darwin64 - - archive - - hash - e18eeb0691af053b83bd46b76c6ee86a - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6299/21982/llbase-0.9.3.506286-darwin64-506286.tar.bz2 - - name - darwin64 - - windows - - archive - - hash - e6865670f9bca1c82fb8b91db3ea515c - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6301/21994/llbase-0.9.3.506286-windows-506286.tar.bz2 - - name - windows - - - version - 0.9.3.506286 - llca copyright @@ -2955,52 +2855,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors version 8.35.500898 - requests - - copyright - Copyright 2016 Kenneth Reitz - description - Python HTTP Library - license - Apache - license_file - LICENSES/requests.txt - name - requests - platforms - - darwin64 - - archive - - hash - b8d134a970261b445a3f376ba4e05ff7 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6693/23788/requests-2.18.1-darwin64-506681.tar.bz2 - - name - darwin64 - - linux64 - - archive - - hash - a92f2235991871c3d601a73cfef9b2af - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4105/11530/requests-1.0-linux64-504094.tar.bz2 - - name - linux64 - - - source - https://bitbucket.org/lindenlab/p64_python-requests - source_type - hg - version - 2.18.1 - slvoice copyright @@ -3211,36 +3065,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors version 0.8.0.1 - urllib3 - - copyright - Copyright 2008-2016 Andrey Petrov and contributors (see CONTRIBUTORS.txt) - description - Python HTTP Library - license - MIT - license_file - LICENSES/urllib3.txt - name - urllib3 - platforms - - darwin64 - - archive - - hash - 22f64c7fbb6704d2e9519fd1cca8e49b - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6659/23560/urllib3-1.21.1-darwin64-506648.tar.bz2 - - name - darwin64 - - - version - 1.21.1 - viewer-manager copyright @@ -3248,7 +3072,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors description Linden Lab Viewer Management Process suite. license - Proprietary + viewerlgpl license_file LICENSE name @@ -3260,9 +3084,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - ce95944fb842849108102263a25fc794 + 904caf508ec1718e1fc9cd321ad95715 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/23237/178332/viewer_manager-1.0.518840-darwin64-518840.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24994/196128/viewer_manager-2.0.519951-darwin64-519951.tar.bz2 name darwin64 @@ -3284,9 +3108,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 642f847a9ac45551af65a55826974334 + e7f7ed2d40c1e554d038276fef690639 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/23236/178338/viewer_manager-1.0.518840-windows-518840.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24996/196136/viewer_manager-2.0.519951-windows-519951.tar.bz2 name windows @@ -3297,7 +3121,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 1.0.518840 + 2.0.519951 vlc-bin -- cgit v1.3 From e1826d508c7bb5edc3917e090ad087b0b3a754cb Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 26 Sep 2018 20:45:03 -0400 Subject: DRTVWR-474: Update to viewer-manager build 520047 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 7f18ab9abf..7f7cf02073 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3084,9 +3084,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 904caf508ec1718e1fc9cd321ad95715 + 0a1471744de42317b9462f0d9ddcc691 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24994/196128/viewer_manager-2.0.519951-darwin64-519951.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25167/197752/viewer_manager-2.0.520047-darwin64-520047.tar.bz2 name darwin64 @@ -3108,9 +3108,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - e7f7ed2d40c1e554d038276fef690639 + 278eb5ff960846ae69626880a2afa05a url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/24996/196136/viewer_manager-2.0.519951-windows-519951.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25168/197765/viewer_manager-2.0.520047-windows-520047.tar.bz2 name windows @@ -3121,7 +3121,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.519951 + 2.0.520047 vlc-bin -- cgit v1.3 From 371a412a28377527b9aede016e9b482df95ea901 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 27 Sep 2018 17:40:10 -0400 Subject: DRTVWR-474: Update to viewer-manager build 520085 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 7f7cf02073..243954a9ba 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3084,9 +3084,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 0a1471744de42317b9462f0d9ddcc691 + 0a254644186f5523b0261d9427bf3e31 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25167/197752/viewer_manager-2.0.520047-darwin64-520047.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25233/198295/viewer_manager-2.0.520085-darwin64-520085.tar.bz2 name darwin64 @@ -3108,9 +3108,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 278eb5ff960846ae69626880a2afa05a + fee2780a7172732633cd115fdc7925ff url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25168/197765/viewer_manager-2.0.520047-windows-520047.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25234/198302/viewer_manager-2.0.520085-windows-520085.tar.bz2 name windows @@ -3121,7 +3121,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.520047 + 2.0.520085 vlc-bin -- cgit v1.3 From b6e58b3b3af60c90a283949060f5532856d3198e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 28 Sep 2018 17:16:14 -0400 Subject: DRTVWR-474: Update to viewer-manager build 520110 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 243954a9ba..f92492ec1e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3084,9 +3084,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 0a254644186f5523b0261d9427bf3e31 + 1cb4af868486605d788ca75ffc786d2d url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25233/198295/viewer_manager-2.0.520085-darwin64-520085.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25263/198729/viewer_manager-2.0.520110-darwin64-520110.tar.bz2 name darwin64 @@ -3108,9 +3108,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - fee2780a7172732633cd115fdc7925ff + f4e68dcae8439c4e08cdb2843812e224 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25234/198302/viewer_manager-2.0.520085-windows-520085.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25264/198736/viewer_manager-2.0.520110-windows-520110.tar.bz2 name windows @@ -3121,7 +3121,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.520085 + 2.0.520110 vlc-bin -- cgit v1.3 From a11230f87ad57440585d12ed600d56ee9f654623 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 5 Oct 2018 15:29:08 -0400 Subject: DRTVWR-474: Update to viewer-manager build 520325 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index f92492ec1e..10dcc5c2a0 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3084,9 +3084,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 1cb4af868486605d788ca75ffc786d2d + be69b65c9372562ce1aeb884802fdf1e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25263/198729/viewer_manager-2.0.520110-darwin64-520110.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25619/201842/viewer_manager-2.0.520325-darwin64-520325.tar.bz2 name darwin64 @@ -3108,9 +3108,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - f4e68dcae8439c4e08cdb2843812e224 + 5934273cf5272982926f553baf5505b8 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25264/198736/viewer_manager-2.0.520110-windows-520110.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25623/201856/viewer_manager-2.0.520325-windows-520325.tar.bz2 name windows @@ -3121,7 +3121,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.520110 + 2.0.520325 vlc-bin -- cgit v1.3 From f960db28b72b9a1390e9e5e60f135806bfb9ced5 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 11 Oct 2018 20:52:01 -0400 Subject: DRTVWR-474: Update to viewer-manager build 520566 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 10dcc5c2a0..e9bd57b4e0 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3084,9 +3084,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - be69b65c9372562ce1aeb884802fdf1e + 55535daa041b922c22902b9d9e5d2b60 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25619/201842/viewer_manager-2.0.520325-darwin64-520325.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25997/204690/viewer_manager-2.0.520566-darwin64-520566.tar.bz2 name darwin64 @@ -3108,9 +3108,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 5934273cf5272982926f553baf5505b8 + 23e95f315f0adf957585af3f4eb42e88 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25623/201856/viewer_manager-2.0.520325-windows-520325.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25999/204773/viewer_manager-2.0.520566-windows-520566.tar.bz2 name windows @@ -3121,7 +3121,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.520325 + 2.0.520566 vlc-bin -- cgit v1.3 From 3abc0095c9e39faf8976ef815b0da656423c4905 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 12 Oct 2018 14:08:59 -0400 Subject: DRTVWR-474: Update to viewer-manager build 520576 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index e9bd57b4e0..f0358eb8ba 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3084,9 +3084,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 55535daa041b922c22902b9d9e5d2b60 + eeeb18f7396de3147c6d958dfbc1a2e5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25997/204690/viewer_manager-2.0.520566-darwin64-520566.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26016/204885/viewer_manager-2.0.520576-darwin64-520576.tar.bz2 name darwin64 @@ -3108,9 +3108,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 23e95f315f0adf957585af3f4eb42e88 + 2832c40449a8a8230e9072ceac5120af url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/25999/204773/viewer_manager-2.0.520566-windows-520566.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26017/204891/viewer_manager-2.0.520576-windows-520576.tar.bz2 name windows @@ -3121,7 +3121,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.520566 + 2.0.520576 vlc-bin -- cgit v1.3 From d81863d23d49f3a71fb477d7e5c9d149b14da9f2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 17 Oct 2018 10:56:43 -0400 Subject: DRTVWR-447: Finish merging Poseidon into BugSplat --- autobuild.xml | 54 +++++++ indra/newview/CMakeLists.txt | 339 +++++++++++++++++++++++++++------------ indra/newview/viewer_manifest.py | 318 +++++++++++++++++++----------------- 3 files changed, 466 insertions(+), 245 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index f0358eb8ba..b1f4597a70 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -225,6 +225,60 @@ version 1.57 + bugsplat + + copyright + Copyright 2003-2017, BugSplat + description + Bugsplat crash reporting package + license + Proprietary + license_file + LICENSES/BUGSPLAT_LICENSE.txt + name + bugsplat + platforms + + darwin64 + + archive + + hash + 436b124bce8cf57b18dbf10f5e6ebcd4 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26151/206132/bugsplat-1.0.7.520674-darwin64-520674.tar.bz2 + + name + darwin64 + + windows + + archive + + hash + 5d19acddc51ee7c802297dd176194362 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26153/206145/bugsplat-3.6.0.4.520674-windows-520674.tar.bz2 + + name + windows + + windows64 + + archive + + hash + 78f5688b694e04c052fb0a1165c98bb5 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26152/206142/bugsplat-3.6.0.4.520674-windows64-520674.tar.bz2 + + name + windows64 + + + version + 1.0.7.520674 + colladadom copyright diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index e7111ebe54..5c918fc3b2 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -3,7 +3,14 @@ project(viewer) include(00-Common) +# DON'T move Linking.cmake to its place in the alphabetized list below: it +# sets variables on which the 3p .cmake files depend. +include(Linking) + include(Boost) +if (BUGSPLAT_DB) + include(bugsplat) +endif (BUGSPLAT_DB) include(BuildPackagesInfo) include(BuildVersion) include(CMakeCopyIfDifferent) @@ -36,7 +43,6 @@ include(LLUI) include(LLVFS) include(LLWindow) include(LLXML) -include(Linking) include(NDOF) include(NVAPI) include(OPENAL) @@ -91,6 +97,12 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) +if (BUGSPLAT_DB) + include_directories( + ${BUGSPLAT_INCLUDE_DIR} + ) +endif (BUGSPLAT_DB) + include_directories(SYSTEM ${LLCOMMON_SYSTEM_INCLUDE_DIRS} ${LLXML_SYSTEM_INCLUDE_DIRS} @@ -1354,6 +1366,14 @@ if (DARWIN) # This should be compiled with the viewer. LIST(APPEND viewer_SOURCE_FILES llappdelegate-objc.mm) + set_source_files_properties( + llappdelegate-objc.mm + PROPERTIES + COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" + # BugsplatMac is a module, imported with @import. That language feature + # demands these switches. + COMPILE_FLAGS "-fmodules -fcxx-modules" + ) find_library(AGL_LIBRARY AGL) find_library(APPKIT_LIBRARY AppKit) @@ -1368,6 +1388,12 @@ if (DARWIN) ${COREAUDIO_LIBRARY} ) + if (BUGSPLAT_DB) + list(APPEND viewer_LIBRARIES + ${BUGSPLAT_LIBRARIES} + ) + endif (BUGSPLAT_DB) + # Add resource files to the project. set(viewer_RESOURCE_FILES secondlife.icns @@ -1393,6 +1419,11 @@ endif (DARWIN) if (LINUX) LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp) + set_source_files_properties( + llappviewerlinux.cpp + PROPERTIES + COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" + ) LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") @@ -1409,6 +1440,11 @@ if (WINDOWS) llappviewerwin32.cpp llwindebug.cpp ) + set_source_files_properties( + llappviewerwin32.cpp + PROPERTIES + COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" + ) list(APPEND viewer_HEADER_FILES llappviewerwin32.h @@ -1691,6 +1727,11 @@ if (SDL_FOUND) ) endif (SDL_FOUND) +if (BUGSPLAT_DB) + set_property(TARGET ${VIEWER_BINARY_NAME} + PROPERTY COMPILE_DEFINITIONS "LL_BUGSPLAT") +endif (BUGSPLAT_DB) + # add package files file(GLOB EVENT_HOST_SCRIPT_GLOB_LIST ${CMAKE_CURRENT_SOURCE_DIR}/../viewer_components/*.py) @@ -1789,7 +1830,7 @@ if (WINDOWS) ${SHARED_LIB_STAGING_DIR}/Debug/fmodexL.dll ) endif (FMODEX) - + add_custom_command( OUTPUT ${CMAKE_CFG_INTDIR}/copy_touched.bat COMMAND ${PYTHON_EXECUTABLE} @@ -1798,15 +1839,16 @@ if (WINDOWS) --actions=copy --arch=${ARCH} --artwork=${ARTWORK_DIR} + "--bugsplat=${BUGSPLAT_DB}" --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} + "--channel=${VIEWER_CHANNEL}" --configuration=${CMAKE_CFG_INTDIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} --grid=${GRID} - "--channel=${VIEWER_CHANNEL}" - --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --source=${CMAKE_CURRENT_SOURCE_DIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/copy_touched.bat + --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py stage_third_party_libs @@ -1824,24 +1866,9 @@ if (WINDOWS) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin - windows-crash-logger + windows-crash-logger ) - # sets the 'working directory' for debugging from visual studio. - if (NOT UNATTENDED) - add_custom_command( - TARGET ${VIEWER_BINARY_NAME} POST_BUILD - COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe - ARGS - --solution - ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln - --workingdir - ${VIEWER_BINARY_NAME} - "${CMAKE_CURRENT_SOURCE_DIR}" - COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging." - ) - endif (NOT UNATTENDED) - if (PACKAGE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2 @@ -1864,15 +1891,16 @@ if (WINDOWS) ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py --arch=${ARCH} --artwork=${ARTWORK_DIR} + "--bugsplat=${BUGSPLAT_DB}" --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} "--channel=${VIEWER_CHANNEL}" - --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --configuration=${CMAKE_CFG_INTDIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} --grid=${GRID} --source=${CMAKE_CURRENT_SOURCE_DIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat + --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py @@ -1903,8 +1931,8 @@ else (WINDOWS) endif (WINDOWS) # *NOTE: - this list is very sensitive to ordering, test carefully on all -# platforms if you change the releative order of the entries here. -# In particular, cmake 2.6.4 (when buidling with linux/makefile generators) +# platforms if you change the relative order of the entries here. +# In particular, cmake 2.6.4 (when building with linux/makefile generators) # appears to sometimes de-duplicate redundantly listed dependencies improperly. # To work around this, higher level modules should be listed before the modules # that they depend upon. -brad @@ -1979,6 +2007,12 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LLAPPEARANCE_LIBRARIES} ) +if (BUGSPLAT_DB) + target_link_libraries(${VIEWER_BINARY_NAME} + ${BUGSPLAT_LIBRARIES} + ) +endif (BUGSPLAT_DB) + set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Path to artwork files.") @@ -2002,15 +2036,16 @@ if (LINUX) ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py --arch=${ARCH} --artwork=${ARTWORK_DIR} + "--bugsplat=${BUGSPLAT_DB}" --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} "--channel=${VIEWER_CHANNEL}" - --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --configuration=${CMAKE_CFG_INTDIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged --grid=${GRID} --source=${CMAKE_CURRENT_SOURCE_DIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched + --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ${COPY_INPUT_DEPENDENCIES} @@ -2024,17 +2059,18 @@ if (LINUX) COMMAND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py - --arch=${ARCH} --actions=copy + --arch=${ARCH} --artwork=${ARTWORK_DIR} + "--bugsplat=${BUGSPLAT_DB}" --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} + "--channel=${VIEWER_CHANNEL}" --configuration=${CMAKE_CFG_INTDIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged --grid=${GRID} - "--channel=${VIEWER_CHANNEL}" - --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --source=${CMAKE_CURRENT_SOURCE_DIR} + --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ${COPY_INPUT_DEPENDENCIES} @@ -2052,31 +2088,45 @@ if (LINUX) endif (LINUX) if (DARWIN) - # These all get set with PROPERTIES - set(product "Second Life") - set(MACOSX_EXECUTABLE_NAME "Second Life") - set(MACOSX_BUNDLE_INFO_STRING "Second Life Viewer") + # These all get set with PROPERTIES. It's not that the property names are + # magically known to CMake -- it's that these names are referenced in the + # Info-SecondLife.plist file in the configure_file() directive below. + set(product "${VIEWER_CHANNEL}") + set(MACOSX_BUNDLE_INFO_STRING "${VIEWER_CHANNEL}") set(MACOSX_BUNDLE_ICON_FILE "secondlife.icns") set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.secondlife.indra.viewer") set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VIEWER_CHANNEL} ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}") set(MACOSX_BUNDLE_BUNDLE_NAME "SecondLife") - set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VIEWER_SHORT_VERSION}") + set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}") set(MACOSX_BUNDLE_BUNDLE_VERSION "${VIEWER_SHORT_VERSION}${VIEWER_MACOSX_PHASE}${VIEWER_REVISION}") set(MACOSX_BUNDLE_COPYRIGHT "Copyright © Linden Research, Inc. 2007") set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "SecondLife.nib") set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "NSApplication") + + # https://blog.kitware.com/upcoming-in-cmake-2-8-12-osx-rpath-support/ + set(CMAKE_MACOSX_RPATH 1) set_target_properties( ${VIEWER_BINARY_NAME} PROPERTIES OUTPUT_NAME "${product}" + # From Contents/MacOS/SecondLife, look in Contents/Frameworks + INSTALL_RPATH "@loader_path/../Frameworks" + # SIGH, as of 2018-05-24 (cmake 3.11.1) the INSTALL_RPATH property simply + # does not work. Try this: + LINK_FLAGS "-rpath @loader_path/../Frameworks" MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info-SecondLife.plist" ) + set(VIEWER_APP_BUNDLE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app") + set(VIEWER_APP_EXE "${VIEWER_APP_BUNDLE}/Contents/MacOS/${product}") + set(VIEWER_APP_DSYM "${VIEWER_APP_EXE}.dSYM") + set(VIEWER_APP_XCARCHIVE "${VIEWER_APP_BUNDLE}/../${product}.xcarchive.zip") + configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/Info-SecondLife.plist" - "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app/Contents/Info.plist" + "${VIEWER_APP_BUNDLE}/Contents/Info.plist" ) add_custom_command( @@ -2087,15 +2137,16 @@ if (DARWIN) --actions=copy --arch=${ARCH} --artwork=${ARTWORK_DIR} + "--bugsplat=${BUGSPLAT_DB}" --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} + --bundleid=${MACOSX_BUNDLE_GUI_IDENTIFIER} + "--channel=${VIEWER_CHANNEL}" --configuration=${CMAKE_CFG_INTDIR} - --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app + --dest=${VIEWER_APP_BUNDLE} --grid=${GRID} - "--channel=${VIEWER_CHANNEL}" - --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt - --bundleid=${MACOSX_BUNDLE_GUI_IDENTIFIER} --source=${CMAKE_CURRENT_SOURCE_DIR} + --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py @@ -2120,15 +2171,16 @@ if (DARWIN) ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py --arch=${ARCH} --artwork=${ARTWORK_DIR} + "--bugsplat=${BUGSPLAT_DB}" --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} + "--channel=${VIEWER_CHANNEL}" --configuration=${CMAKE_CFG_INTDIR} - --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app + --dest=${VIEWER_APP_BUNDLE} --grid=${GRID} - "--channel=${VIEWER_CHANNEL}" - --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --source=${CMAKE_CURRENT_SOURCE_DIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched + --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt ${SIGNING_SETTING} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py @@ -2140,67 +2192,152 @@ if (INSTALL) include(${CMAKE_CURRENT_SOURCE_DIR}/ViewerInstall.cmake) endif (INSTALL) -if (PACKAGE) - set(SYMBOL_SEARCH_DIRS "") - # Note that the path to VIEWER_SYMBOL_FILE must match that in ../../build.sh - if (WINDOWS) - list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}") - set(VIEWER_SYMBOL_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-symbols-windows-$ENV{AUTOBUILD_ADDRSIZE}.tar.bz2") - # slplugin.exe failing symbols dump - need to debug, might have to do with updated version of google breakpad - # set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX} slplugin.exe") - set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX}") - set(VIEWER_LIB_GLOB "*${CMAKE_SHARED_MODULE_SUFFIX}") - set(VIEWER_COPY_MANIFEST copy_w_viewer_manifest) - endif (WINDOWS) - if (DARWIN) - list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}") - # *TODO: Generate these search dirs in the cmake files related to each binary. - list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_BINARY_DIR}/llplugin/slplugin/${CMAKE_CFG_INTDIR}") - list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_BINARY_DIR}/mac_crash_logger/${CMAKE_CFG_INTDIR}") - list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_BINARY_DIR}/media_plugins/gstreamer010/${CMAKE_CFG_INTDIR}") - set(VIEWER_SYMBOL_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-symbols-darwin-$ENV{AUTOBUILD_ADDRSIZE}.tar.bz2") - set(VIEWER_EXE_GLOBS "'Second Life' SLPlugin mac-crash-logger") - set(VIEWER_EXE_GLOBS "'Second Life' mac-crash-logger") - set(VIEWER_LIB_GLOB "*.dylib") - endif (DARWIN) - if (LINUX) - list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_CURRENT_BINARY_DIR}/packaged") - set(VIEWER_SYMBOL_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-symbols-linux-$ENV{AUTOBUILD_ADDRSIZE}.tar.bz2") - set(VIEWER_EXE_GLOBS "do-not-directly-run-secondlife-bin SLPlugin") - set(VIEWER_EXE_GLOBS "do-not-directly-run-secondlife-bin") - set(VIEWER_LIB_GLOB "*${CMAKE_SHARED_MODULE_SUFFIX}*") - set(VIEWER_COPY_MANIFEST copy_l_viewer_manifest) - endif (LINUX) - - if(RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) - if(CMAKE_CFG_INTDIR STREQUAL ".") - set(LLBUILD_CONFIG ${CMAKE_BUILD_TYPE}) - else(CMAKE_CFG_INTDIR STREQUAL ".") - # set LLBUILD_CONFIG to be a shell variable evaluated at build time - # reflecting the configuration we are currently building. - set(LLBUILD_CONFIG ${CMAKE_CFG_INTDIR}) - endif(CMAKE_CFG_INTDIR STREQUAL ".") - add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}" - COMMAND "${PYTHON_EXECUTABLE}" - ARGS - "${CMAKE_CURRENT_SOURCE_DIR}/generate_breakpad_symbols.py" - "${LLBUILD_CONFIG}" - "${SYMBOL_SEARCH_DIRS}" - "${VIEWER_EXE_GLOBS}" - "${VIEWER_LIB_GLOB}" - "${AUTOBUILD_INSTALL_DIR}/bin/dump_syms" - "${VIEWER_SYMBOL_FILE}" - DEPENDS generate_breakpad_symbols.py - VERBATIM) - - add_custom_target(generate_breakpad_symbols DEPENDS "${VIEWER_SYMBOL_FILE}" "${VIEWER_BINARY_NAME}" "${VIEWER_COPY_MANIFEST}") - add_dependencies(generate_breakpad_symbols "${VIEWER_BINARY_NAME}") - if (WINDOWS OR LINUX) - add_dependencies(generate_breakpad_symbols "${VIEWER_COPY_MANIFEST}") - endif (WINDOWS OR LINUX) - add_dependencies(llpackage generate_breakpad_symbols) - endif(RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) -endif (PACKAGE) +# Note that the conventional VIEWER_SYMBOL_FILE is set by ../../build.sh +if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIEWER_SYMBOL_FILE) + if (NOT BUGSPLAT_DB) + # Breakpad symbol-file generation + set(SYMBOL_SEARCH_DIRS "") + if (WINDOWS) + list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}") + # slplugin.exe failing symbols dump - need to debug, might have to do with updated version of google breakpad + # set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX} slplugin.exe") + set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX}") + set(VIEWER_LIB_GLOB "*${CMAKE_SHARED_MODULE_SUFFIX}") + set(VIEWER_COPY_MANIFEST copy_w_viewer_manifest) + endif (WINDOWS) + if (DARWIN) + list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}") + # *TODO: Generate these search dirs in the cmake files related to each binary. + list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_BINARY_DIR}/llplugin/slplugin/${CMAKE_CFG_INTDIR}") + list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_BINARY_DIR}/mac_crash_logger/${CMAKE_CFG_INTDIR}") + list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_BINARY_DIR}/media_plugins/gstreamer010/${CMAKE_CFG_INTDIR}") + set(VIEWER_EXE_GLOBS "'${product}' SLPlugin mac-crash-logger") + set(VIEWER_EXE_GLOBS "'${product}' mac-crash-logger") + set(VIEWER_LIB_GLOB "*.dylib") + endif (DARWIN) + if (LINUX) + list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_CURRENT_BINARY_DIR}/packaged") + set(VIEWER_EXE_GLOBS "do-not-directly-run-secondlife-bin SLPlugin") + set(VIEWER_EXE_GLOBS "do-not-directly-run-secondlife-bin") + set(VIEWER_LIB_GLOB "*${CMAKE_SHARED_MODULE_SUFFIX}*") + set(VIEWER_COPY_MANIFEST copy_l_viewer_manifest) + endif (LINUX) + + if(CMAKE_CFG_INTDIR STREQUAL ".") + set(LLBUILD_CONFIG ${CMAKE_BUILD_TYPE}) + else(CMAKE_CFG_INTDIR STREQUAL ".") + # set LLBUILD_CONFIG to be a shell variable evaluated at build time + # reflecting the configuration we are currently building. + set(LLBUILD_CONFIG ${CMAKE_CFG_INTDIR}) + endif(CMAKE_CFG_INTDIR STREQUAL ".") + add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}" + COMMAND "${PYTHON_EXECUTABLE}" + ARGS + "${CMAKE_CURRENT_SOURCE_DIR}/generate_breakpad_symbols.py" + "${LLBUILD_CONFIG}" + "${SYMBOL_SEARCH_DIRS}" + "${VIEWER_EXE_GLOBS}" + "${VIEWER_LIB_GLOB}" + "${AUTOBUILD_INSTALL_DIR}/bin/dump_syms" + "${VIEWER_SYMBOL_FILE}" + DEPENDS generate_breakpad_symbols.py + VERBATIM) + + add_custom_target(generate_symbols DEPENDS "${VIEWER_SYMBOL_FILE}" ${VIEWER_BINARY_NAME} "${VIEWER_COPY_MANIFEST}") + add_dependencies(generate_symbols ${VIEWER_BINARY_NAME}) + if (WINDOWS OR LINUX) + add_dependencies(generate_symbols "${VIEWER_COPY_MANIFEST}") + endif (WINDOWS OR LINUX) + + else (NOT BUGSPLAT_DB) + # BugSplat symbol-file generation + if (WINDOWS) + # Just pack up a tarball containing only the .pdb file for the + # executable. Because we intend to use cygwin tar, we must render + # VIEWER_SYMBOL_FILE in cygwin path syntax. + execute_process(COMMAND "cygpath" "-u" "${VIEWER_SYMBOL_FILE}" + OUTPUT_VARIABLE VIEWER_SYMBOL_FILE_CYGWIN + OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND "cygpath" "-u" "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}" + OUTPUT_VARIABLE PARENT_DIRECTORY_CYGWIN + OUTPUT_STRIP_TRAILING_WHITESPACE) + add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}" + # Use of 'tar ...j' here assumes VIEWER_SYMBOL_FILE endswith .tar.bz2; + # testing a string suffix is painful enough in CMake language that + # we'll continue assuming it until forced to generalize. + COMMAND "tar" + ARGS + "cjf" + "${VIEWER_SYMBOL_FILE_CYGWIN}" + "-C" + "${PARENT_DIRECTORY_CYGWIN}" + "secondlife-bin.pdb" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-bin.pdb" + COMMENT "Packing viewer PDB into ${VIEWER_SYMBOL_FILE_CYGWIN}" + ) + add_custom_target(generate_symbols DEPENDS "${VIEWER_SYMBOL_FILE}" ${VIEWER_BINARY_NAME}) + add_dependencies(generate_symbols ${VIEWER_BINARY_NAME}) + endif (WINDOWS) + if (DARWIN) + # Have to run dsymutil first, then pack up the resulting .dSYM directory + add_custom_command(OUTPUT "${VIEWER_APP_DSYM}" + COMMAND "dsymutil" + ARGS + ${VIEWER_APP_EXE} + COMMENT "Generating ${VIEWER_APP_DSYM}" + ) + add_custom_target(dsym_generate DEPENDS "${VIEWER_APP_DSYM}") + add_dependencies(dsym_generate ${VIEWER_BINARY_NAME}) + add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}" + # See above comments about "tar ...j" + COMMAND "tar" + ARGS + "cjf" + "${VIEWER_SYMBOL_FILE}" + "-C" + "${VIEWER_APP_DSYM}/.." + "${product}.dSYM" + DEPENDS "${VIEWER_APP_DSYM}" + COMMENT "Packing dSYM into ${VIEWER_SYMBOL_FILE}" + ) + add_custom_target(dsym_tarball DEPENDS "${VIEWER_SYMBOL_FILE}") + add_dependencies(dsym_tarball dsym_generate) + add_custom_command(OUTPUT "${VIEWER_APP_XCARCHIVE}" + COMMAND "zip" + ARGS + "-r" + "${VIEWER_APP_XCARCHIVE}" + "." + WORKING_DIRECTORY "${VIEWER_APP_DSYM}/.." + DEPENDS "${VIEWER_APP_DSYM}" + COMMENT "Generating xcarchive.zip for upload to BugSplat" + ) + add_custom_target(dsym_xcarchive DEPENDS "${VIEWER_APP_XCARCHIVE}") + add_dependencies(dsym_xcarchive dsym_generate) + # Have to create a stamp file, and depend on it, to force CMake to run + # the cleanup step. + add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/dsym.stamp" + COMMAND rm -rf "${VIEWER_APP_DSYM}" + COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/dsym.stamp" + DEPENDS "${VIEWER_SYMBOL_FILE}" "${VIEWER_APP_XCARCHIVE}" + COMMENT "Cleaning up dSYM" + ) + add_custom_target(generate_symbols DEPENDS + "${VIEWER_APP_DSYM}" + "${VIEWER_SYMBOL_FILE}" + "${VIEWER_APP_XCARCHIVE}" + "${CMAKE_CURRENT_BINARY_DIR}/dsym.stamp" + ) + add_dependencies(generate_symbols dsym_tarball dsym_xcarchive) + endif (DARWIN) + if (LINUX) + # TBD + endif (LINUX) + endif (NOT BUGSPLAT_DB) + + # for both BUGSPLAT_DB and Breakpad + add_dependencies(llpackage generate_symbols) +endif () if (LL_TESTS) # To add a viewer unit test, just add the test .cpp file below diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 57da87a3ee..5dd4d13a3a 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -26,19 +26,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA $/LicenseInfo$ """ -import sys -import os -import os.path -import shutil import errno import json +import os +import os.path import plistlib import random import re +import shutil import stat import subprocess +import sys import tarfile import time +import zipfile viewer_dir = os.path.dirname(__file__) # Add indra/lib/python to our path so we don't have to muck with PYTHONPATH. @@ -63,7 +64,7 @@ class ViewerManifest(LLManifest): self.path(src="../../etc/message.xml", dst="app_settings/message.xml") if self.is_packaging_viewer(): - with self.prefix(src="app_settings"): + with self.prefix(src_dst="app_settings"): self.exclude("logcontrol.xml") self.exclude("logcontrol-dev.xml") self.path("*.ini") @@ -85,7 +86,7 @@ class ViewerManifest(LLManifest): # ... and the included spell checking dictionaries pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') - with self.prefix(src=pkgdir,dst=""): + with self.prefix(src=pkgdir): self.path("dictionaries") # include the extracted packages information (see BuildPackagesInfo.cmake) @@ -107,17 +108,18 @@ class ViewerManifest(LLManifest): Type='String', Value='')) settings_install = {} - if 'sourceid' in self.args and self.args['sourceid']: + sourceid = self.args.get('sourceid') + if sourceid: settings_install['sourceid'] = settings_template['sourceid'].copy() - settings_install['sourceid']['Value'] = self.args['sourceid'] - print "Set sourceid in settings_install.xml to '%s'" % self.args['sourceid'] + settings_install['sourceid']['Value'] = sourceid + print "Set sourceid in settings_install.xml to '%s'" % sourceid - if 'channel_suffix' in self.args and self.args['channel_suffix']: + if self.args.get('channel_suffix'): settings_install['CmdLineChannel'] = settings_template['CmdLineChannel'].copy() settings_install['CmdLineChannel']['Value'] = self.channel_with_pkg_suffix() print "Set CmdLineChannel in settings_install.xml to '%s'" % self.channel_with_pkg_suffix() - if 'grid' in self.args and self.args['grid']: + if self.args.get('grid'): settings_install['CmdLineGridChoice'] = settings_template['CmdLineGridChoice'].copy() settings_install['CmdLineGridChoice']['Value'] = self.grid() print "Set CmdLineGridChoice in settings_install.xml to '%s'" % self.grid() @@ -129,20 +131,20 @@ class ViewerManifest(LLManifest): src="environment") - with self.prefix(src="character"): + with self.prefix(src_dst="character"): self.path("*.llm") self.path("*.xml") self.path("*.tga") # Include our fonts - with self.prefix(src="fonts"): + with self.prefix(src_dst="fonts"): self.path("*.ttf") self.path("*.txt") # skins - with self.prefix(src="skins"): + with self.prefix(src_dst="skins"): # include the entire textures directory recursively - with self.prefix(src="*/textures"): + with self.prefix(src_dst="*/textures"): self.path("*/*.tga") self.path("*/*.j2c") self.path("*/*.jpg") @@ -170,7 +172,7 @@ class ViewerManifest(LLManifest): # local_assets dir (for pre-cached textures) - with self.prefix(src="local_assets"): + with self.prefix(src_dst="local_assets"): self.path("*.j2c") self.path("*.tga") @@ -186,6 +188,10 @@ class ViewerManifest(LLManifest): "Address Size":self.address_size, "Update Service":"https://update.secondlife.com/update", } + # Only store this if it's both present and non-empty + bugsplat_db = self.args.get('bugsplat') + if bugsplat_db: + build_data_dict["BugSplat DB"] = bugsplat_db build_data_dict = self.finish_build_data_dict(build_data_dict) with open(os.path.join(os.pardir,'build_data.json'), 'w') as build_data_handle: json.dump(build_data_dict,build_data_handle) @@ -206,8 +212,9 @@ class ViewerManifest(LLManifest): def channel_with_pkg_suffix(self): fullchannel=self.channel() - if 'channel_suffix' in self.args and self.args['channel_suffix']: - fullchannel+=' '+self.args['channel_suffix'] + channel_suffix = self.args.get('channel_suffix') + if channel_suffix: + fullchannel+=' '+channel_suffix return fullchannel def channel_variant(self): @@ -215,8 +222,7 @@ class ViewerManifest(LLManifest): return self.channel().replace(CHANNEL_VENDOR_BASE, "").strip() def channel_type(self): # returns 'release', 'beta', 'project', or 'test' - global CHANNEL_VENDOR_BASE - channel_qualifier=self.channel().replace(CHANNEL_VENDOR_BASE, "").lower().strip() + channel_qualifier=self.channel_variant().lower() if channel_qualifier.startswith('release'): channel_type='release' elif channel_qualifier.startswith('beta'): @@ -234,11 +240,12 @@ class ViewerManifest(LLManifest): if self.channel_type() == 'release': suffix=suffix.replace('Release', '').strip() # for the base release viewer, suffix will now be null - for any other, append what remains - if len(suffix) > 0: - suffix = "_"+ ("_".join(suffix.split())) + if suffix: + suffix = "_".join([''] + suffix.split()) # the additional_packages mechanism adds more to the installer name (but not to the app name itself) - if 'channel_suffix' in self.args and self.args['channel_suffix']: - suffix+='_'+("_".join(self.args['channel_suffix'].split())) + # ''.split() produces empty list, so suffix only changes if + # channel_suffix is non-empty + suffix = "_".join([suffix] + self.args.get('channel_suffix', '').split()) return suffix def installer_base_name(self): @@ -488,19 +495,19 @@ class WindowsManifest(ViewerManifest): # 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()) - with self.prefix(src=os.path.join(pkgdir, "VMP"), dst=""): + with self.prefix(src=os.path.join(pkgdir, "VMP")): # include the compiled launcher scripts so that it gets included in the file_list self.path('updater.exe') #IUM is not normally executed directly, just imported. No exe needed. self.path("InstallerUserMessage.py") - with self.prefix(src=self.icon_path(), dst="vmp_icons"): - self.path("secondlife.ico") - - #VMP Tkinter icons - with self.prefix("vmp_icons"): - self.path("*.png") - self.path("*.gif") + with self.prefix(dst="vmp_icons"): + with self.prefix(src=self.icon_path()): + self.path("secondlife.ico") + #VMP Tkinter icons + with self.prefix(src="vmp_icons"): + self.path("*.png") + self.path("*.gif") # Plugin host application self.path2basename(os.path.join(os.pardir, @@ -508,8 +515,8 @@ class WindowsManifest(ViewerManifest): "slplugin.exe") # Get shared libs from the shared libs staging directory - with self.prefix(src=os.path.join(os.pardir, 'sharedlibs', self.args['configuration']), - dst=""): + with self.prefix(src=os.path.join(self.args['build'], os.pardir, + 'sharedlibs', self.args['configuration'])): # Get llcommon and deps. If missing assume static linkage and continue. try: @@ -575,6 +582,17 @@ class WindowsManifest(ViewerManifest): # Hunspell self.path("libhunspell.dll") + # BugSplat + if self.args.get('bugsplat'): + if(self.address_size == 64): + self.path("BsSndRpt64.exe") + self.path("BugSplat64.dll") + self.path("BugSplatRc64.dll") + else: + self.path("BsSndRpt.exe") + self.path("BugSplat.dll") + self.path("BugSplatRc.dll") + # For google-perftools tcmalloc allocator. try: if self.args['configuration'].lower() == 'debug': @@ -584,114 +602,116 @@ class WindowsManifest(ViewerManifest): except: print "Skipping libtcmalloc_minimal.dll" - self.path(src="licenses-win32.txt", dst="licenses.txt") self.path("featuretable.txt") - with self.prefix(src=pkgdir,dst=""): + with self.prefix(src=pkgdir): self.path("ca-bundle.crt") # Media plugins - CEF - with self.prefix(src='../media_plugins/cef/%s' % self.args['configuration'], dst="llplugin"): - self.path("media_plugin_cef.dll") - - # Media plugins - LibVLC - with self.prefix(src='../media_plugins/libvlc/%s' % self.args['configuration'], dst="llplugin"): - self.path("media_plugin_libvlc.dll") - - # Media plugins - Example (useful for debugging - not shipped with release viewer) - if self.channel_type() != 'release': - with self.prefix(src='../media_plugins/example/%s' % self.args['configuration'], dst="llplugin"): - self.path("media_plugin_example.dll") - - # CEF runtime files - debug - # CEF runtime files - not debug (release, relwithdebinfo etc.) - config = 'debug' if self.args['configuration'].lower() == 'debug' else 'release' - with self.prefix(src=os.path.join(pkgdir, 'bin', config), dst="llplugin"): - self.path("chrome_elf.dll") - self.path("d3dcompiler_43.dll") - self.path("d3dcompiler_47.dll") - self.path("libcef.dll") - self.path("libEGL.dll") - self.path("libGLESv2.dll") - self.path("dullahan_host.exe") - self.path("natives_blob.bin") - self.path("snapshot_blob.bin") - self.path("widevinecdmadapter.dll") - - # MSVC DLLs needed for CEF and have to be in same directory as plugin - with self.prefix(src=os.path.join(os.pardir, 'sharedlibs', 'Release'), dst="llplugin"): - self.path("msvcp120.dll") - self.path("msvcr120.dll") - - # CEF files common to all configurations - with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="llplugin"): - self.path("cef.pak") - self.path("cef_100_percent.pak") - self.path("cef_200_percent.pak") - self.path("cef_extensions.pak") - self.path("devtools_resources.pak") - self.path("icudtl.dat") - - with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('llplugin', 'locales')): - self.path("am.pak") - self.path("ar.pak") - self.path("bg.pak") - self.path("bn.pak") - self.path("ca.pak") - self.path("cs.pak") - self.path("da.pak") - self.path("de.pak") - self.path("el.pak") - self.path("en-GB.pak") - self.path("en-US.pak") - self.path("es-419.pak") - self.path("es.pak") - self.path("et.pak") - self.path("fa.pak") - self.path("fi.pak") - self.path("fil.pak") - self.path("fr.pak") - self.path("gu.pak") - self.path("he.pak") - self.path("hi.pak") - self.path("hr.pak") - self.path("hu.pak") - self.path("id.pak") - self.path("it.pak") - self.path("ja.pak") - self.path("kn.pak") - self.path("ko.pak") - self.path("lt.pak") - self.path("lv.pak") - self.path("ml.pak") - self.path("mr.pak") - self.path("ms.pak") - self.path("nb.pak") - self.path("nl.pak") - self.path("pl.pak") - self.path("pt-BR.pak") - self.path("pt-PT.pak") - self.path("ro.pak") - self.path("ru.pak") - self.path("sk.pak") - self.path("sl.pak") - self.path("sr.pak") - self.path("sv.pak") - self.path("sw.pak") - self.path("ta.pak") - self.path("te.pak") - self.path("th.pak") - self.path("tr.pak") - self.path("uk.pak") - self.path("vi.pak") - self.path("zh-CN.pak") - self.path("zh-TW.pak") - - with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="llplugin"): - self.path("libvlc.dll") - self.path("libvlccore.dll") - self.path("plugins/") + with self.prefix(dst="llplugin"): + with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'media_plugins')): + with self.prefix(src=os.path.join('cef', self.args['configuration'])): + self.path("media_plugin_cef.dll") + + # Media plugins - LibVLC + with self.prefix(src=os.path.join('libvlc', self.args['configuration'])): + self.path("media_plugin_libvlc.dll") + + # Media plugins - Example (useful for debugging - not shipped with release viewer) + if self.channel_type() != 'release': + with self.prefix(src=os.path.join('example', self.args['configuration'])): + self.path("media_plugin_example.dll") + + # CEF runtime files - debug + # CEF runtime files - not debug (release, relwithdebinfo etc.) + config = 'debug' if self.args['configuration'].lower() == 'debug' else 'release' + with self.prefix(src=os.path.join(pkgdir, 'bin', config)): + self.path("chrome_elf.dll") + self.path("d3dcompiler_43.dll") + self.path("d3dcompiler_47.dll") + self.path("libcef.dll") + self.path("libEGL.dll") + self.path("libGLESv2.dll") + self.path("dullahan_host.exe") + self.path("natives_blob.bin") + self.path("snapshot_blob.bin") + self.path("widevinecdmadapter.dll") + + # MSVC DLLs needed for CEF and have to be in same directory as plugin + with self.prefix(src=os.path.join(self.args['build'], os.pardir, + 'sharedlibs', 'Release')): + self.path("msvcp120.dll") + self.path("msvcr120.dll") + + # CEF files common to all configurations + with self.prefix(src=os.path.join(pkgdir, 'resources')): + self.path("cef.pak") + self.path("cef_100_percent.pak") + self.path("cef_200_percent.pak") + self.path("cef_extensions.pak") + self.path("devtools_resources.pak") + self.path("icudtl.dat") + + with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst='locales'): + self.path("am.pak") + self.path("ar.pak") + self.path("bg.pak") + self.path("bn.pak") + self.path("ca.pak") + self.path("cs.pak") + self.path("da.pak") + self.path("de.pak") + self.path("el.pak") + self.path("en-GB.pak") + self.path("en-US.pak") + self.path("es-419.pak") + self.path("es.pak") + self.path("et.pak") + self.path("fa.pak") + self.path("fi.pak") + self.path("fil.pak") + self.path("fr.pak") + self.path("gu.pak") + self.path("he.pak") + self.path("hi.pak") + self.path("hr.pak") + self.path("hu.pak") + self.path("id.pak") + self.path("it.pak") + self.path("ja.pak") + self.path("kn.pak") + self.path("ko.pak") + self.path("lt.pak") + self.path("lv.pak") + self.path("ml.pak") + self.path("mr.pak") + self.path("ms.pak") + self.path("nb.pak") + self.path("nl.pak") + self.path("pl.pak") + self.path("pt-BR.pak") + self.path("pt-PT.pak") + self.path("ro.pak") + self.path("ru.pak") + self.path("sk.pak") + self.path("sl.pak") + self.path("sr.pak") + self.path("sv.pak") + self.path("sw.pak") + self.path("ta.pak") + self.path("te.pak") + self.path("th.pak") + self.path("tr.pak") + self.path("uk.pak") + self.path("vi.pak") + self.path("zh-CN.pak") + self.path("zh-TW.pak") + + with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')): + self.path("libvlc.dll") + self.path("libvlccore.dll") + self.path("plugins/") # pull in the crash logger and updater from other projects # tag:"crash-logger" here as a cue to the exporter @@ -874,6 +894,12 @@ class DarwinManifest(ViewerManifest): # darwin requires full app bundle packaging even for debugging. return True + def is_rearranging(self): + # That said, some stuff should still only be performed once. + # Are either of these actions in 'actions'? Is the set intersection + # non-empty? + return bool(set(["package", "unpacked"]).intersection(self.args['actions'])) + def construct(self): # copy over the build result (this is a no-op if run within the xcode script) self.path(os.path.join(self.args['configuration'], "Second Life.app"), dst="") @@ -1362,19 +1388,19 @@ class LinuxManifest(ViewerManifest): debpkgdir = os.path.join(pkgdir, "lib", "debug") self.path("licenses-linux.txt","licenses.txt") - with self.prefix("linux_tools", dst=""): + with self.prefix("linux_tools"): self.path("client-readme.txt","README-linux.txt") self.path("client-readme-voice.txt","README-linux-voice.txt") self.path("client-readme-joystick.txt","README-linux-joystick.txt") self.path("wrapper.sh","secondlife") - with self.prefix(src="", dst="etc"): + with self.prefix(dst="etc"): self.path("handle_secondlifeprotocol.sh") self.path("register_secondlifeprotocol.sh") self.path("refresh_desktop_app_entry.sh") self.path("launch_url.sh") self.path("install.sh") - with self.prefix(src="", dst="bin"): + with self.prefix(dst="bin"): self.path("secondlife-bin","do-not-directly-run-secondlife-bin") self.path("../linux_crash_logger/linux-crash-logger","linux-crash-logger.bin") self.path2basename("../llplugin/slplugin", "SLPlugin") @@ -1388,9 +1414,9 @@ class LinuxManifest(ViewerManifest): # Get the icons based on the channel type icon_path = self.icon_path() print "DEBUG: icon_path '%s'" % icon_path - with self.prefix(src=icon_path, dst="") : + with self.prefix(src=icon_path) : self.path("secondlife_256.png","secondlife_icon.png") - with self.prefix(src="",dst="res-sdl") : + with self.prefix(dst="res-sdl") : self.path("secondlife_256.BMP","ll_icon.BMP") # plugins @@ -1412,7 +1438,7 @@ class LinuxManifest(ViewerManifest): self.path("featuretable_linux.txt") - with self.prefix(src=pkgdir,dst=""): + with self.prefix(src=pkgdir): self.path("ca-bundle.crt") def package_finish(self): @@ -1468,7 +1494,7 @@ class Linux_i686_Manifest(LinuxManifest): relpkgdir = os.path.join(pkgdir, "lib", "release") debpkgdir = os.path.join(pkgdir, "lib", "debug") - with self.prefix(relpkgdir, dst="lib"): + with self.prefix(src=relpkgdir, dst="lib"): self.path("libapr-1.so") self.path("libapr-1.so.0") self.path("libapr-1.so.0.4.5") @@ -1554,4 +1580,8 @@ class Linux_x86_64_Manifest(LinuxManifest): ################################################################ if __name__ == "__main__": - main() + extra_arguments = [ + dict(name='bugsplat', description="""BugSplat database to which to post crashes, + if BugSplat crash reporting is desired""", default=''), + ] + main(extra=extra_arguments) -- cgit v1.3 From 01c6fe141e64b742bb33782238faa4a0a5ca6816 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 17 Oct 2018 11:35:01 -0400 Subject: DRTVWR-447: Update to viewer-manager build 520737 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index b1f4597a70..5b0817cbf8 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - eeeb18f7396de3147c6d958dfbc1a2e5 + 021b56ca0b1e34f40fa5fca713072c40 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26016/204885/viewer_manager-2.0.520576-darwin64-520576.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26246/206828/viewer_manager-2.0.520737-darwin64-520737.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 2832c40449a8a8230e9072ceac5120af + be91869780e39f58eaf1cd8c85b3b951 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26017/204891/viewer_manager-2.0.520576-windows-520576.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26247/206835/viewer_manager-2.0.520737-windows-520737.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.520576 + 2.0.520737 vlc-bin -- cgit v1.3 From 3c4d63c6a1b0f5567c24d457b820022cf4de45cf Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 17 Oct 2018 13:04:32 -0400 Subject: DRTVWR-447: Update to viewer-manager build 520750 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 5b0817cbf8..6ce20e45ab 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 021b56ca0b1e34f40fa5fca713072c40 + 1d801a03cb87a248b6573f8550603286 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26246/206828/viewer_manager-2.0.520737-darwin64-520737.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26264/206909/viewer_manager-2.0.520750-darwin64-520750.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - be91869780e39f58eaf1cd8c85b3b951 + 65e20bc630033178f3f7e4890c0b85f7 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26247/206835/viewer_manager-2.0.520737-windows-520737.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26265/206915/viewer_manager-2.0.520750-windows-520750.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.520737 + 2.0.520750 vlc-bin -- cgit v1.3 From fa5350db7be671b9b935383e5925dcc64d440952 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 18 Oct 2018 11:44:56 -0400 Subject: DRTVWR-447: Update to bugsplat build 520784 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 6ce20e45ab..08d4694942 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -244,9 +244,9 @@ archive hash - 436b124bce8cf57b18dbf10f5e6ebcd4 + 492f182607d6096ebc5620779fa6121d url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26151/206132/bugsplat-1.0.7.520674-darwin64-520674.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26319/207508/bugsplat-1.0.7.520784-darwin64-520784.tar.bz2 name darwin64 @@ -256,9 +256,9 @@ archive hash - 5d19acddc51ee7c802297dd176194362 + dfbc7f3c1fd88adc8015e9c2c21b2435 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26153/206145/bugsplat-3.6.0.4.520674-windows-520674.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26321/207522/bugsplat-3.6.0.4.520784-windows-520784.tar.bz2 name windows @@ -268,16 +268,16 @@ archive hash - 78f5688b694e04c052fb0a1165c98bb5 + 131db9b0775375386023f454cce9b803 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26152/206142/bugsplat-3.6.0.4.520674-windows64-520674.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26320/207516/bugsplat-3.6.0.4.520784-windows64-520784.tar.bz2 name windows64 version - 1.0.7.520674 + 1.0.7.520784 colladadom -- cgit v1.3 From b4bc7f7c0c1c8804ad9688e1759cc86629193a37 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 18 Oct 2018 13:55:55 -0400 Subject: DRTVWR-447: Update bugsplat to codeticket version 520791. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 08d4694942..76c33d0005 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -244,9 +244,9 @@ archive hash - 492f182607d6096ebc5620779fa6121d + c3b5e8c57bd1c92bc9e0956586908b99 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26319/207508/bugsplat-1.0.7.520784-darwin64-520784.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26330/207568/bugsplat-1.0.7.520791-darwin64-520791.tar.bz2 name darwin64 @@ -256,9 +256,9 @@ archive hash - dfbc7f3c1fd88adc8015e9c2c21b2435 + 766dfde65a5b42ea5691d41df79c43e0 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26321/207522/bugsplat-3.6.0.4.520784-windows-520784.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26332/207582/bugsplat-3.6.0.4.520791-windows-520791.tar.bz2 name windows @@ -268,16 +268,16 @@ archive hash - 131db9b0775375386023f454cce9b803 + afd01285e22f27d473fac6f88fac9a3b url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26320/207516/bugsplat-3.6.0.4.520784-windows64-520784.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/26331/207576/bugsplat-3.6.0.4.520791-windows64-520791.tar.bz2 name windows64 version - 1.0.7.520784 + 1.0.7.520791 colladadom -- cgit v1.3 From 6240677945381bf2a03d9342be9ca8beeb487edf Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 27 Oct 2018 11:37:57 -0400 Subject: DRTVWR-447: Update to viewer-manager build 521169 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 76c33d0005..22e095973e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 1d801a03cb87a248b6573f8550603286 + 1b20fe924598080e9c469931f88f0a68 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26264/206909/viewer_manager-2.0.520750-darwin64-520750.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26804/214046/viewer_manager-2.0.521169-darwin64-521169.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 65e20bc630033178f3f7e4890c0b85f7 + 87484123c7282c32f51935891e639f83 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26265/206915/viewer_manager-2.0.520750-windows-520750.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26805/214053/viewer_manager-2.0.521169-windows-521169.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.520750 + 2.0.521169 vlc-bin -- cgit v1.3 From 7aec2a7bf15c55c61ce6d4eb0bfb5f2d9d513a08 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 27 Oct 2018 12:04:57 -0400 Subject: DRTVWR-447: Update to viewer-manager build 521170 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 22e095973e..4317de3408 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 1b20fe924598080e9c469931f88f0a68 + 51f77e40a4d3a259033b3017de8f3569 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26804/214046/viewer_manager-2.0.521169-darwin64-521169.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26806/214061/viewer_manager-2.0.521170-darwin64-521170.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 87484123c7282c32f51935891e639f83 + 86a396beb2355f9bd51c912dfd679d48 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26805/214053/viewer_manager-2.0.521169-windows-521169.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26807/214067/viewer_manager-2.0.521170-windows-521170.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.521169 + 2.0.521170 vlc-bin -- cgit v1.3 From 6c51d3ba7481fbe68ed138ebb530c2875637d506 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 7 Nov 2018 15:45:18 -0800 Subject: SL-9952: Update to viewer-manager build 521490 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 4317de3408..33c9dd9e5a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 51f77e40a4d3a259033b3017de8f3569 + 9d5f69b45558d1653ebd2a3c70c869b5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26806/214061/viewer_manager-2.0.521170-darwin64-521170.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27297/218880/viewer_manager-2.0.521490-darwin64-521490.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 86a396beb2355f9bd51c912dfd679d48 + 9d26790001ccc0756e4a992dcd55cc91 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/26807/214067/viewer_manager-2.0.521170-windows-521170.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27300/218889/viewer_manager-2.0.521490-windows-521490.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.521170 + 2.0.521490 vlc-bin -- cgit v1.3 From 4e776c522cb4ba49a5b833d4b9164ab8c48f4b9b Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 8 Nov 2018 14:21:31 -0800 Subject: SL-10030: Update to viewer-manager build 521526 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 33c9dd9e5a..a51f14b274 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 9d5f69b45558d1653ebd2a3c70c869b5 + c543e73c35c605eaf509bc7651c11227 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27297/218880/viewer_manager-2.0.521490-darwin64-521490.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27348/219718/viewer_manager-2.0.521526-darwin64-521526.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 9d26790001ccc0756e4a992dcd55cc91 + fec612973e0d70f82da8c8f22a10c6f3 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27300/218889/viewer_manager-2.0.521490-windows-521490.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27349/219725/viewer_manager-2.0.521526-windows-521526.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.521490 + 2.0.521526 vlc-bin -- cgit v1.3 From feb886e08a3cc3ce9a64a16e72cb17b3d5910ab3 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 21 Nov 2018 14:40:12 -0500 Subject: DRTVWR-447: Update to viewer-manager build 521943 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index a51f14b274..5a0194cf86 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - c543e73c35c605eaf509bc7651c11227 + 15e764eb3a0efefe0eda103c72407ab4 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27348/219718/viewer_manager-2.0.521526-darwin64-521526.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27985/227818/viewer_manager-2.0.521943-darwin64-521943.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - fec612973e0d70f82da8c8f22a10c6f3 + ea65e1c59d34f19c64fa2a1b32d312ad url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27349/219725/viewer_manager-2.0.521526-windows-521526.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27986/227825/viewer_manager-2.0.521943-windows-521943.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.521526 + 2.0.521943 vlc-bin -- cgit v1.3 From a5b624fe3aac98655a0fec23044e7fbf6326c4db Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 27 Nov 2018 17:28:21 -0500 Subject: SL-10030: Update to viewer-manager build 522023 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 5a0194cf86..553b8ade24 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 15e764eb3a0efefe0eda103c72407ab4 + 7f4af59da23c015cd9cfcdd567a5966d url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27985/227818/viewer_manager-2.0.521943-darwin64-521943.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28113/229287/viewer_manager-2.0.522023-darwin64-522023.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - ea65e1c59d34f19c64fa2a1b32d312ad + 105a3eb51d99cbf6fcf4f65a7f1c3f31 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/27986/227825/viewer_manager-2.0.521943-windows-521943.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28114/229293/viewer_manager-2.0.522023-windows-522023.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.521943 + 2.0.522023 vlc-bin -- cgit v1.3 From c54d3eaa7d63ca7f864886544abe68f9be1441e5 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 28 Nov 2018 07:11:21 -0500 Subject: SL-10030: Update to viewer-manager build 522036 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 553b8ade24..b474265f40 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 7f4af59da23c015cd9cfcdd567a5966d + aa6b3ad6366967f546c9144456b8f58a url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28113/229287/viewer_manager-2.0.522023-darwin64-522023.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28129/229691/viewer_manager-2.0.522036-darwin64-522036.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 105a3eb51d99cbf6fcf4f65a7f1c3f31 + 958221ef0fd6d542f7c12d18383ec34a url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28114/229293/viewer_manager-2.0.522023-windows-522023.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28130/229697/viewer_manager-2.0.522036-windows-522036.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522023 + 2.0.522036 vlc-bin -- cgit v1.3 From 58634033918b2be86534120e08d3b49a4ebcef5a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 28 Nov 2018 15:59:06 -0500 Subject: SL-10030: Update to viewer-manager build 522055 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index b474265f40..2d63f2e3ab 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - aa6b3ad6366967f546c9144456b8f58a + 499b1cfb532786a4dee27d68e84c928b url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28129/229691/viewer_manager-2.0.522036-darwin64-522036.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28164/229888/viewer_manager-2.0.522055-darwin64-522055.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 958221ef0fd6d542f7c12d18383ec34a + 220eba0d32d7ad14c783aa1e09e5e7e9 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28130/229697/viewer_manager-2.0.522036-windows-522036.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28165/229894/viewer_manager-2.0.522055-windows-522055.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522036 + 2.0.522055 vlc-bin -- cgit v1.3 From ed5dfb0b2f8dfc4f5163fed324909c0c012df391 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 28 Nov 2018 18:32:48 -0500 Subject: SL-10030: Update to viewer-manager build 522068 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 2d63f2e3ab..9e1a54dca3 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 499b1cfb532786a4dee27d68e84c928b + 3fb7877981cf1ca6a79addf2e279a751 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28164/229888/viewer_manager-2.0.522055-darwin64-522055.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28187/230154/viewer_manager-2.0.522068-darwin64-522068.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 220eba0d32d7ad14c783aa1e09e5e7e9 + 59e9894657f0175a5c84b459098584b9 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28165/229894/viewer_manager-2.0.522055-windows-522055.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28188/230160/viewer_manager-2.0.522068-windows-522068.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522055 + 2.0.522068 vlc-bin -- cgit v1.3 From ff802c5cd20d299c773cf58cb75ff8d62aec1c11 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 28 Nov 2018 22:02:50 -0500 Subject: SL-10030: Update to viewer-manager build 522079 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 9e1a54dca3..5dfab783d6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 3fb7877981cf1ca6a79addf2e279a751 + 1859ebf1b12485211ef4243b48c19410 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28187/230154/viewer_manager-2.0.522068-darwin64-522068.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28203/230495/viewer_manager-2.0.522079-darwin64-522079.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 59e9894657f0175a5c84b459098584b9 + e6251d211ac0b5b4258c3a04fd5f3ffe url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28188/230160/viewer_manager-2.0.522068-windows-522068.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28204/230501/viewer_manager-2.0.522079-windows-522079.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522068 + 2.0.522079 vlc-bin -- cgit v1.3 From 4d9ad4612a9db32cda11a4ca62baf9ae90ae26ee Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 29 Nov 2018 14:49:19 -0500 Subject: SL-10030: Update to viewer-manager build 522096 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 5dfab783d6..a063e4be0e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 1859ebf1b12485211ef4243b48c19410 + 2040ddeb5dd2040f9d57bdc1865af520 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28203/230495/viewer_manager-2.0.522079-darwin64-522079.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28232/230664/viewer_manager-2.0.522096-darwin64-522096.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - e6251d211ac0b5b4258c3a04fd5f3ffe + a3c4980f31e3437910b72bd45efb0e6d url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28204/230501/viewer_manager-2.0.522079-windows-522079.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28233/230672/viewer_manager-2.0.522096-windows-522096.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522079 + 2.0.522096 vlc-bin -- cgit v1.3 From abf1b6474e0c75131439b6cc7888027d07fe4c7e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 3 Dec 2018 16:07:27 -0500 Subject: SL-10153: Update to viewer-manager build 522199 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index a063e4be0e..6aae9561ab 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 2040ddeb5dd2040f9d57bdc1865af520 + 3504fe5c13ff8ca3bae9de2bfda5d1a5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28232/230664/viewer_manager-2.0.522096-darwin64-522096.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28374/232934/viewer_manager-2.0.522199-darwin64-522199.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - a3c4980f31e3437910b72bd45efb0e6d + d035a93c4d8554241fd43ac91033a838 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28233/230672/viewer_manager-2.0.522096-windows-522096.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28375/232940/viewer_manager-2.0.522199-windows-522199.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522096 + 2.0.522199 vlc-bin -- cgit v1.3 From 8205bd22f16c517acbfab1661738176dc158d89b Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 3 Dec 2018 18:59:10 -0500 Subject: SL-10153: Update to viewer-manager build 522217 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 6aae9561ab..2ebb1cce23 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 3504fe5c13ff8ca3bae9de2bfda5d1a5 + 7e4fc2b997ff9ef0122e0a56fc765112 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28374/232934/viewer_manager-2.0.522199-darwin64-522199.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28398/233376/viewer_manager-2.0.522217-darwin64-522217.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - d035a93c4d8554241fd43ac91033a838 + 998737a96678a7c0881982e884a22d7e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28375/232940/viewer_manager-2.0.522199-windows-522199.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28399/233382/viewer_manager-2.0.522217-windows-522217.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522199 + 2.0.522217 vlc-bin -- cgit v1.3 From 8892ec5a3bb45eeaf3e66cb9ce884f312bfdfe71 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 4 Dec 2018 16:14:32 -0500 Subject: SL-10153: Update to viewer-manager build 522260 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 2ebb1cce23..953c703886 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 7e4fc2b997ff9ef0122e0a56fc765112 + 49d8224983843e61b2a770d0e6880c85 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28398/233376/viewer_manager-2.0.522217-darwin64-522217.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28466/235199/viewer_manager-2.0.522260-darwin64-522260.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 998737a96678a7c0881982e884a22d7e + 9fc5bf5c63b655f3ed63efd862435926 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28399/233382/viewer_manager-2.0.522217-windows-522217.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28467/235205/viewer_manager-2.0.522260-windows-522260.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522217 + 2.0.522260 vlc-bin -- cgit v1.3 From 1029f6b776fbef66959ef621f233cf1012b3f72b Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 5 Dec 2018 17:16:06 -0500 Subject: SL-10153: Update to viewer-manager build 522314 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 953c703886..5f7e22347b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 49d8224983843e61b2a770d0e6880c85 + acab355caaab1a5841a200e2d0dd9891 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28466/235199/viewer_manager-2.0.522260-darwin64-522260.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28547/236386/viewer_manager-2.0.522314-darwin64-522314.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 9fc5bf5c63b655f3ed63efd862435926 + e649491175876e6bf016a36f97c69497 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28467/235205/viewer_manager-2.0.522260-windows-522260.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28548/236392/viewer_manager-2.0.522314-windows-522314.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522260 + 2.0.522314 vlc-bin -- cgit v1.3 From 6e58201736fd3f5a0cdf5a49f2fb8a391ba58222 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 8 Dec 2018 10:25:15 -0500 Subject: SL-10153: Update to viewer-manager build 522407 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 5f7e22347b..ebda8c791d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - acab355caaab1a5841a200e2d0dd9891 + f76807ee2425b1532595bc716456fa6a url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28547/236386/viewer_manager-2.0.522314-darwin64-522314.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28665/237854/viewer_manager-2.0.522407-darwin64-522407.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - e649491175876e6bf016a36f97c69497 + 5cb25b4d66f9a8d4f485b7eab7d02ed0 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28548/236392/viewer_manager-2.0.522314-windows-522314.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28666/237860/viewer_manager-2.0.522407-windows-522407.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522314 + 2.0.522407 vlc-bin -- cgit v1.3 From 63d601679168d0bf8de2600bb74e435f54096b9a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 11 Dec 2018 09:06:41 -0500 Subject: SL-10153: Update to viewer-manager build 522443 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index ebda8c791d..f646843086 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - f76807ee2425b1532595bc716456fa6a + 9ff6f24f703663e82489253c0a1fae8a url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28665/237854/viewer_manager-2.0.522407-darwin64-522407.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28732/238505/viewer_manager-2.0.522443-darwin64-522443.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 5cb25b4d66f9a8d4f485b7eab7d02ed0 + 6e9d92a0810619377dd8f3dccee9e594 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28666/237860/viewer_manager-2.0.522407-windows-522407.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28731/238511/viewer_manager-2.0.522443-windows-522443.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522407 + 2.0.522443 vlc-bin -- cgit v1.3 From d72dd8a35dadefb816ad29bb9e41559fa288679a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 11 Dec 2018 15:47:17 -0500 Subject: SL-10153: Update to viewer-manager build 522465 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index f646843086..ddf07016ae 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 9ff6f24f703663e82489253c0a1fae8a + cf01ec13d504668201fe820ea2289024 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28732/238505/viewer_manager-2.0.522443-darwin64-522443.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28777/239560/viewer_manager-2.0.522465-darwin64-522465.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 6e9d92a0810619377dd8f3dccee9e594 + f6c99e3647a5eb01292d0a2362131869 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28731/238511/viewer_manager-2.0.522443-windows-522443.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28776/239566/viewer_manager-2.0.522465-windows-522465.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522443 + 2.0.522465 vlc-bin -- cgit v1.3 From cbf4295b63fcc7128f928d1718efe069a9f3a789 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 13 Dec 2018 12:02:38 -0500 Subject: SL-10153: Update to viewer-manager build 522507 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index ddf07016ae..3b4eb2cd87 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - cf01ec13d504668201fe820ea2289024 + e2bef561238448fe512146baa6dacabc url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28777/239560/viewer_manager-2.0.522465-darwin64-522465.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28859/240421/viewer_manager-2.0.522507-darwin64-522507.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - f6c99e3647a5eb01292d0a2362131869 + 75cdf1afc293423553b6d190ce422412 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28776/239566/viewer_manager-2.0.522465-windows-522465.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28858/240427/viewer_manager-2.0.522507-windows-522507.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522465 + 2.0.522507 vlc-bin -- cgit v1.3 From 2448856c63c9024501209473fb09dd91f858655d Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 16 Jan 2019 14:47:19 -0500 Subject: SL-10153: Update to viewer-manager build 523251 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index a353ddbbbe..382506d8ea 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - e2bef561238448fe512146baa6dacabc + 146537bed5c358f69af08b811b3920a1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28859/240421/viewer_manager-2.0.522507-darwin64-522507.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/30016/253294/viewer_manager-2.0.523251-darwin64-523251.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 75cdf1afc293423553b6d190ce422412 + fcf98bac94a5145c4f772e6e90a0a78b url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/28858/240427/viewer_manager-2.0.522507-windows-522507.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/30018/253302/viewer_manager-2.0.523251-windows-523251.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.522507 + 2.0.523251 vlc-bin -- cgit v1.3 From 7204f166369a71cbdc5858e2cab7fa39ccc53f20 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 18 Jan 2019 12:45:40 -0500 Subject: SL-10153: Update to viewer-manager build 523332 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 382506d8ea..11f7685219 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 146537bed5c358f69af08b811b3920a1 + 2757602c6f834beade37af5c44649936 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/30016/253294/viewer_manager-2.0.523251-darwin64-523251.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/30130/254747/viewer_manager-2.0.523332-darwin64-523332.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - fcf98bac94a5145c4f772e6e90a0a78b + f1e63c7ae1951d93e5dfd98bdb1a4bed url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/30018/253302/viewer_manager-2.0.523251-windows-523251.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/30131/254755/viewer_manager-2.0.523332-windows-523332.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.523251 + 2.0.523332 vlc-bin -- cgit v1.3 From 899cdb8a1b32d7d39b3a4b78ba41a0f4d87cb52f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 2 Feb 2019 16:32:22 -0500 Subject: SL-9980: Update to viewer-manager 524014 to drop Admin for viewer. But since that viewer-manager build depends on being able to read the application name from build_data.json (to locate the shortcut), add an AppName key to build_data.json. --- autobuild.xml | 10 +++++----- indra/newview/viewer_manifest.py | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 11f7685219..0773491363 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 2757602c6f834beade37af5c44649936 + 0aa5e6a12d9777ab85b8534cfce5de30 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/30130/254747/viewer_manager-2.0.523332-darwin64-523332.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31625/264561/viewer_manager-2.0.524014-darwin64-524014.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - f1e63c7ae1951d93e5dfd98bdb1a4bed + 6858cac5abba956fe9dd5c86caff809c url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/30131/254755/viewer_manager-2.0.523332-windows-523332.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31626/264568/viewer_manager-2.0.524014-windows-524014.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.523332 + 2.0.524014 vlc-bin diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 32773b2c36..c0f642c852 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -431,7 +431,8 @@ class WindowsManifest(ViewerManifest): def finish_build_data_dict(self, build_data_dict): #MAINT-7294: Windows exe names depend on channel name, so write that in also - build_data_dict.update({'Executable':self.final_exe()}) + build_data_dict['Executable'] = self.final_exe() + build_data_dict['AppName'] = self.app_name() return build_data_dict def test_msvcrt_and_copy_action(self, src, dst): -- cgit v1.3 From 35bc6df9699da11c826843e4b81a0d0216e2ca54 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 4 Feb 2019 13:15:22 -0500 Subject: SL-9980: Update to viewer-manager build 524032 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 0773491363..58b08142f4 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 0aa5e6a12d9777ab85b8534cfce5de30 + b902cbd59c65246051ae849a62db2c9d url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31625/264561/viewer_manager-2.0.524014-darwin64-524014.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31663/264771/viewer_manager-2.0.524032-darwin64-524032.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 6858cac5abba956fe9dd5c86caff809c + a56f0df71a04e868e4b992de3fe917e3 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31626/264568/viewer_manager-2.0.524014-windows-524014.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31664/264779/viewer_manager-2.0.524032-windows-524032.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.524014 + 2.0.524032 vlc-bin -- cgit v1.3 From 0d27cb37bfea618896b0b4c5a422880e1a882210 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 6 Feb 2019 13:20:26 -0500 Subject: SL-10469: Update to viewer-manager build 524157 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 58b08142f4..9b7ff39334 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - b902cbd59c65246051ae849a62db2c9d + aaf04f5ed1d28477781d976dc04871ee url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31663/264771/viewer_manager-2.0.524032-darwin64-524032.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31904/266163/viewer_manager-2.0.524157-darwin64-524157.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - a56f0df71a04e868e4b992de3fe917e3 + 4604624f11b215b052f4a840f4da4bf8 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31664/264779/viewer_manager-2.0.524032-windows-524032.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31906/266177/viewer_manager-2.0.524157-windows-524157.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.524032 + 2.0.524157 vlc-bin -- cgit v1.3