diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-04-10 13:33:55 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-04-10 13:33:55 -0700 |
| commit | 6a393ada3e1d2cf0543f80dfd522436554d5bb95 (patch) | |
| tree | 305314c0d2cdfe2cbf83ef61148163ff0c932d13 /indra | |
| parent | 127ffc33df7f810ccfc8f23fdd700407cdd3b158 (diff) | |
MAINT-6928: Add in Python 2.6.6 modules
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/CMakeLists.txt | 3 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 84c2a14c6e..39f8697e8c 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -75,9 +75,6 @@ elseif (WINDOWS) endif (EXISTS ${VIEWER_DIR}win_setup) # add_dependencies(viewer windows-setup windows-crash-logger) add_dependencies(viewer windows-crash-logger) -elseif (SOLARIS) - add_subdirectory(solaris_crash_logger) - add_dependencies(viewer solaris-crash-logger) endif (LINUX) add_subdirectory(${VIEWER_PREFIX}newview) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 512a1e870d..7c1db31f04 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -790,7 +790,7 @@ class DarwinManifest(ViewerManifest): self.path(os.path.join(relpkgdir, "libhunspell-1.3.0.dylib"), dst="Resources/libhunspell-1.3.0.dylib") if self.prefix(dst="MacOS"): - #this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322 and SL-323 + #this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322, SL-323 and MAINT-6928 self.path2basename(vmpdir,"SL_Launcher") self.path2basename(vmpdir,"*.py") llbase_path = os.path.join(self.get_dst_prefix(),'llbase') @@ -808,6 +808,14 @@ class DarwinManifest(ViewerManifest): os.makedirs(requests_path) if self.prefix(dst="requests"): self.path2basename(requestsdir,"*") + self.end_prefix() + #these supplemental files are in case the user still has 2.6 as their default python + #https://jira.secondlife.com/browse/MAINT-6928 + p266_path = os.path.join(self.get_dst_prefix(),'2.6') + if not os.path.exists(p266_path): + os.makedirs(p266_path) + if self.prefix(dst="2.6"): + self.path2basename(vmp266dir,"*.py") self.end_prefix() self.end_prefix() @@ -903,7 +911,7 @@ class DarwinManifest(ViewerManifest): 'ca-bundle.crt', 'SLVoice', ): - self.path2basename(relpkgdir, libfile) + self.path2basename(relpkgdir, libfile) # dylibs that vary based on configuration if self.args['configuration'].lower() == 'debug': |