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 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.2.3