diff options
| -rw-r--r-- | autobuild.xml | 114 | ||||
| -rw-r--r-- | indra/cmake/Requests.cmake | 3 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 32 |
3 files changed, 135 insertions, 14 deletions
diff --git a/autobuild.xml b/autobuild.xml index adbcb02f60..6dcf3fd903 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -225,6 +225,36 @@ <key>version</key> <string>1.57</string> </map> + <key>chardet</key> + <map> + <key>copyright</key> + <string>Contributors to charset (see https://github.com/chardet/chardet)</string> + <key>description</key> + <string>Python Character Encoding Library</string> + <key>license</key> + <string>LGPL</string> + <key>license_file</key> + <string>LICENSES/chardet.txt</string> + <key>name</key> + <string>chardet</string> + <key>platforms</key> + <map> + <key>darwin64</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>0124862b6a1b88455c78a68f8b823d21</string> + <key>url</key> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6662/23578/chardet-3.0.4-darwin64-506651.tar.bz2</string> + </map> + <key>name</key> + <string>darwin64</string> + </map> + </map> + <key>version</key> + <string>3.0.4</string> + </map> <key>colladadom</key> <map> <key>copyright</key> @@ -526,9 +556,9 @@ <key>archive</key> <map> <key>hash</key> - <string>da5c705fa4fae169cba26fba92dba1ef</string> + <string>95a6d7d1ff2ffc8679601d9408533663</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4835/15404/dullahan-1.1.800_3.3029.1611.g44e39a8-darwin64-504824.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6185/21567/dullahan-1.1.800_3.3071.1637.gcb6cf75-darwin64-506174.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -538,9 +568,9 @@ <key>archive</key> <map> <key>hash</key> - <string>17cd8f6e8f95df877d0c9c234f860324</string> + <string>c14caa52a6ab343c35e6e76af840257f</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4836/15410/dullahan-1.1.800_3.3029.1611.g44e39a8-windows-504824.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6187/21579/dullahan-1.1.800_3.3071.1634.g9cc59c8-windows-506174.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -550,16 +580,16 @@ <key>archive</key> <map> <key>hash</key> - <string>7a478f8f0e13f5f81cab657a8c351186</string> + <string>ff4d59eb23011198ccd0aa4f5875bbd1</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4837/15415/dullahan-1.1.800_3.3029.1611.g44e39a8-windows64-504824.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6186/21573/dullahan-1.1.800_3.3071.1634.g9cc59c8-windows64-506174.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>1.1.800_3.3029.1611.g44e39a8</string> + <string>1.1.800_3.3071.1634.g9cc59c8</string> </map> <key>elfio</key> <map> @@ -1435,6 +1465,36 @@ <key>version</key> <string>2012.1-2</string> </map> + <key>idna</key> + <map> + <key>copyright</key> + <string>Copyright (c) 2013-2017, Kim Davies. All rights reserved.</string> + <key>description</key> + <string>Python Internationalized Domain Names in Applications (IDNA) Library</string> + <key>license</key> + <string>see idna.rst</string> + <key>license_file</key> + <string>LICENSES/idna.rst</string> + <key>name</key> + <string>idna</string> + <key>platforms</key> + <map> + <key>darwin64</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>7dfe9fc4023d7d4f511dd9fac7258266</string> + <key>url</key> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6663/23584/idna-2.5-darwin64-506652.tar.bz2</string> + </map> + <key>name</key> + <string>darwin64</string> + </map> + </map> + <key>version</key> + <string>2.5</string> + </map> <key>jpeglib</key> <map> <key>copyright</key> @@ -2788,13 +2848,13 @@ <key>requests</key> <map> <key>copyright</key> - <string>Kenneth Reitz</string> + <string>Copyright 2016 Kenneth Reitz</string> <key>description</key> <string>Python HTTP Library</string> <key>license</key> <string>Apache</string> <key>license_file</key> - <string>requests.txt</string> + <string>LICENSES/requests.txt</string> <key>name</key> <string>requests</string> <key>platforms</key> @@ -2804,9 +2864,9 @@ <key>archive</key> <map> <key>hash</key> - <string>20a84252b40223d5c08a6c1575b3333b</string> + <string>b8d134a970261b445a3f376ba4e05ff7</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4106/11536/requests-1.0-darwin64-504094.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6693/23788/requests-2.18.1-darwin64-506681.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -2829,7 +2889,7 @@ <key>source_type</key> <string>hg</string> <key>version</key> - <string>1.0</string> + <string>2.18.1</string> </map> <key>slvoice</key> <map> @@ -3041,6 +3101,36 @@ <key>version</key> <string>0.8.0.1</string> </map> + <key>urllib3</key> + <map> + <key>copyright</key> + <string>Copyright 2008-2016 Andrey Petrov and contributors (see CONTRIBUTORS.txt)</string> + <key>description</key> + <string>Python HTTP Library</string> + <key>license</key> + <string>MIT</string> + <key>license_file</key> + <string>LICENSES/urllib3.txt</string> + <key>name</key> + <string>urllib3</string> + <key>platforms</key> + <map> + <key>darwin64</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>22f64c7fbb6704d2e9519fd1cca8e49b</string> + <key>url</key> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6659/23560/urllib3-1.21.1-darwin64-506648.tar.bz2</string> + </map> + <key>name</key> + <string>darwin64</string> + </map> + </map> + <key>version</key> + <string>1.21.1</string> + </map> <key>viewer-manager</key> <map> <key>copyright</key> 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 |