From 124d8c8dce3a5da8aa73f12f8733c65f57479a24 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Thu, 8 Jun 2017 15:43:08 -0700 Subject: Automated merge with head of callum_linden/viewer64 that pulls in the latest version of p64_3p-dullahan version 3.3021 (Like Chrome 59) --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 7f81064379..ebf24a051c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -526,9 +526,9 @@ archive hash - da5c705fa4fae169cba26fba92dba1ef + 95a6d7d1ff2ffc8679601d9408533663 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4835/15404/dullahan-1.1.800_3.3029.1611.g44e39a8-darwin64-504824.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6185/21567/dullahan-1.1.800_3.3071.1637.gcb6cf75-darwin64-506174.tar.bz2 name darwin64 @@ -538,9 +538,9 @@ archive hash - 17cd8f6e8f95df877d0c9c234f860324 + c14caa52a6ab343c35e6e76af840257f url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4836/15410/dullahan-1.1.800_3.3029.1611.g44e39a8-windows-504824.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6187/21579/dullahan-1.1.800_3.3071.1634.g9cc59c8-windows-506174.tar.bz2 name windows @@ -550,16 +550,16 @@ archive hash - 7a478f8f0e13f5f81cab657a8c351186 + ff4d59eb23011198ccd0aa4f5875bbd1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4837/15415/dullahan-1.1.800_3.3029.1611.g44e39a8-windows64-504824.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6186/21573/dullahan-1.1.800_3.3071.1634.g9cc59c8-windows64-506174.tar.bz2 name windows64 version - 1.1.800_3.3029.1611.g44e39a8 + 1.1.800_3.3071.1634.g9cc59c8 elfio -- cgit v1.2.3 From 543d9b98a315980ee1ab35558ad07dd45673b837 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 19 Jun 2017 18:01:40 -0400 Subject: update viewer-manager, primarily to solve Mac packaging problem --- autobuild.xml | 110 +++++++++++++++++++++++++++++++++++---- indra/cmake/Requests.cmake | 3 ++ indra/newview/viewer_manifest.py | 32 +++++++++++- 3 files changed, 133 insertions(+), 12 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 9b7029745c..5e0f501765 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -225,6 +225,36 @@ 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 @@ -1435,6 +1465,36 @@ 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 @@ -2788,13 +2848,13 @@ requests copyright - Kenneth Reitz + Copyright 2016 Kenneth Reitz description Python HTTP Library license Apache license_file - requests.txt + LICENSES/requests.txt name requests platforms @@ -2804,9 +2864,9 @@ archive hash - 20a84252b40223d5c08a6c1575b3333b + b8d134a970261b445a3f376ba4e05ff7 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4106/11536/requests-1.0-darwin64-504094.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6693/23788/requests-2.18.1-darwin64-506681.tar.bz2 name darwin64 @@ -2829,7 +2889,7 @@ source_type hg version - 1.0 + 2.18.1 slvoice @@ -3041,6 +3101,36 @@ 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 @@ -3060,9 +3150,9 @@ archive hash - bd26f884a20781b349dd5f7e156896e7 + 76e5db832ec9c6aeac267b8179d9212b url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6633/23444/viewer_manager-1.0.506622-darwin64-506622.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6706/23848/viewer_manager-1.0.506695-darwin64-506695.tar.bz2 name darwin64 @@ -3084,9 +3174,9 @@ archive hash - b7056f9eb96137288ae1baba22fb7eaa + d0f708f119d5e0c437e73cf2a332bf85 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6634/23454/viewer_manager-1.0.506622-windows-506622.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6707/23854/viewer_manager-1.0.506695-windows-506695.tar.bz2 name windows @@ -3097,7 +3187,7 @@ source_type hg version - 1.0.506622 + 1.0.506695 vlc-bin diff --git a/indra/cmake/Requests.cmake b/indra/cmake/Requests.cmake index 84ee070813..b9c729d697 100644 --- a/indra/cmake/Requests.cmake +++ b/indra/cmake/Requests.cmake @@ -1,4 +1,7 @@ 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/viewer_manifest.py b/indra/newview/viewer_manifest.py index 97ed24bad7..377c46f8e0 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -793,7 +793,10 @@ class DarwinManifest(ViewerManifest): debpkgdir = os.path.join(pkgdir, "lib", "debug") vmpdir = os.path.join(pkgdir, "VMP") llbasedir = os.path.join(pkgdir, "lib", "python", "llbase") - requestsdir = os.path.join(pkgdir, "requests") + requestsdir = os.path.join(pkgdir, "lib", "python", "requests") + urllib3dir = os.path.join(pkgdir, "lib", "python", "urllib3") + chardetdir = os.path.join(pkgdir, "lib", "python", "chardet") + idnadir = os.path.join(pkgdir, "lib", "python", "idna") if self.prefix(src="", dst="Contents"): # everything goes in Contents self.path("Info.plist", dst="Info.plist") @@ -806,10 +809,17 @@ class DarwinManifest(ViewerManifest): #this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322, SL-323 self.path2basename(vmpdir,"SL_Launcher") self.path2basename(vmpdir,"*.py") + # certifi will be imported by requests; this is our custom version to get our ca-bundle.crt + certifi_path = os.path.join(self.get_dst_prefix(),'certifi') + if not os.path.exists(certifi_path): + os.makedirs(certifi_path) + if self.prefix(dst="certifi"): + self.path2basename(os.path.join(vmpdir,"certifi"),"*") + self.end_prefix() + # llbase provides our llrest service layer and llsd decoding llbase_path = os.path.join(self.get_dst_prefix(),'llbase') if not os.path.exists(llbase_path): os.makedirs(llbase_path) - #before, we only needed llbase at build time. With VMP, we need it at run time. if self.prefix(dst="llbase"): self.path2basename(llbasedir,"*.py") self.path2basename(llbasedir,"_cllsd.so") @@ -822,6 +832,24 @@ class DarwinManifest(ViewerManifest): if self.prefix(dst="requests"): self.path2basename(requestsdir,"*") self.end_prefix() + urllib3_path = os.path.join(self.get_dst_prefix(),'urllib3') + if not os.path.exists(urllib3_path): + os.makedirs(urllib3_path) + if self.prefix(dst="urllib3"): + self.path2basename(urllib3dir,"*") + self.end_prefix() + chardet_path = os.path.join(self.get_dst_prefix(),'chardet') + if not os.path.exists(chardet_path): + os.makedirs(chardet_path) + if self.prefix(dst="chardet"): + self.path2basename(chardetdir,"*") + self.end_prefix() + idna_path = os.path.join(self.get_dst_prefix(),'idna') + if not os.path.exists(idna_path): + os.makedirs(idna_path) + if self.prefix(dst="idna"): + self.path2basename(idnadir,"*") + self.end_prefix() self.end_prefix() # most everything goes in the Resources directory -- cgit v1.2.3