diff options
| -rw-r--r-- | autobuild.xml | 176 | ||||
| -rw-r--r-- | indra/cmake/LLBase.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/Requests.cmake | 7 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 8 |
5 files changed, 0 insertions, 197 deletions
diff --git a/autobuild.xml b/autobuild.xml index 1277f70b0b..29066d7c49 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -225,36 +225,6 @@ <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> @@ -1465,36 +1435,6 @@ <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> @@ -2173,46 +2113,6 @@ <key>version</key> <string>0.0.1</string> </map> - <key>llbase</key> - <map> - <key>copyright</key> - <string>Copyright (c) 2010, Linden Research, Inc.</string> - <key>license</key> - <string>mit</string> - <key>license_file</key> - <string>LICENSES/llbase-license.txt</string> - <key>name</key> - <string>llbase</string> - <key>platforms</key> - <map> - <key>darwin64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>e18eeb0691af053b83bd46b76c6ee86a</string> - <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6299/21982/llbase-0.9.3.506286-darwin64-506286.tar.bz2</string> - </map> - <key>name</key> - <string>darwin64</string> - </map> - <key>windows</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>e6865670f9bca1c82fb8b91db3ea515c</string> - <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6301/21994/llbase-0.9.3.506286-windows-506286.tar.bz2</string> - </map> - <key>name</key> - <string>windows</string> - </map> - </map> - <key>version</key> - <string>0.9.3.506286</string> - </map> <key>llca</key> <map> <key>copyright</key> @@ -2955,52 +2855,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>version</key> <string>8.35.500898</string> </map> - <key>requests</key> - <map> - <key>copyright</key> - <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>LICENSES/requests.txt</string> - <key>name</key> - <string>requests</string> - <key>platforms</key> - <map> - <key>darwin64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>b8d134a970261b445a3f376ba4e05ff7</string> - <key>url</key> - <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> - </map> - <key>linux64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>a92f2235991871c3d601a73cfef9b2af</string> - <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4105/11530/requests-1.0-linux64-504094.tar.bz2</string> - </map> - <key>name</key> - <string>linux64</string> - </map> - </map> - <key>source</key> - <string>https://bitbucket.org/lindenlab/p64_python-requests</string> - <key>source_type</key> - <string>hg</string> - <key>version</key> - <string>2.18.1</string> - </map> <key>slvoice</key> <map> <key>copyright</key> @@ -3211,36 +3065,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <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/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") |