diff options
| -rw-r--r-- | autobuild.xml | 54 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 26 |
2 files changed, 68 insertions, 12 deletions
diff --git a/autobuild.xml b/autobuild.xml index c01685ef50..0edecf0934 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2797,6 +2797,52 @@ <key>version</key> <string>8.35.500898</string> </map> + <key>requests</key> + <map> + <key>copyright</key> + <string>Kenneth Reitz</string> + <key>description</key> + <string>Python HTTP Library</string> + <key>license</key> + <string>Apache</string> + <key>license_file</key> + <string>LICENSE</string> + <key>name</key> + <string>requests</string> + <key>platforms</key> + <map> + <key>darwin64</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>14a3c749f78e8489c7291c35fe997f2e</string> + <key>url</key> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4022/11166/requests-1.0-darwin64-504010.tar.bz2</string> + </map> + <key>name</key> + <string>darwin64</string> + </map> + <key>linux64</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>7b7f5985cad7917451f9482d0727b380</string> + <key>url</key> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4021/11161/requests-1.0-linux64-504010.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>1.0</string> + </map> <key>slvoice</key> <map> <key>copyright</key> @@ -3026,9 +3072,9 @@ <key>archive</key> <map> <key>hash</key> - <string>200cc138491dc913fcbb7b173bab4f58</string> + <string>62e8464a3d020075266e3f8dbb4e89be</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3826/10314/viewer_manager-1.0-darwin64-503815.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3745/9922/viewer_manager-1.0-darwin64-503733.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3050,9 +3096,9 @@ <key>archive</key> <map> <key>hash</key> - <string>f516b8cdb5f67f86250a927b8dc6f67d</string> + <string>1e5cd892526b78ba174feb65b0653d4b</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3828/10320/viewer_manager-1.0-windows-503815.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3746/9929/viewer_manager-1.0-windows-503733.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 81711c717e..512a1e870d 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -436,15 +436,15 @@ class WindowsManifest(ViewerManifest): # These need to be installed as a SxS assembly, currently a 'private' assembly. # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx if self.args['configuration'].lower() == 'debug': - self.path("msvcr120d.dll") - self.path("msvcp120d.dll") - self.path("msvcr100d.dll") - self.path("msvcp100d.dll") + self.path("msvcr120d.dll") + self.path("msvcp120d.dll") + self.path("msvcr100d.dll") + self.path("msvcp100d.dll") else: - self.path("msvcr120.dll") - self.path("msvcp120.dll") - self.path("msvcr100.dll") - self.path("msvcp100.dll") + self.path("msvcr120.dll") + self.path("msvcp120.dll") + self.path("msvcr100.dll") + self.path("msvcp100.dll") # Vivox runtimes self.path("SLVoice.exe") @@ -778,7 +778,9 @@ class DarwinManifest(ViewerManifest): relpkgdir = os.path.join(pkgdir, "lib", "release") debpkgdir = os.path.join(pkgdir, "lib", "debug") vmpdir = os.path.join(pkgdir, "VMP") + vmp266dir = os.path.join(vmpdir, "2.6") llbasedir = os.path.join(pkgdir, "llbase") + requestsdir = os.path.join(pkgdir, "requests") if self.prefix(src="", dst="Contents"): # everything goes in Contents self.path("Info.plist", dst="Info.plist") @@ -799,6 +801,14 @@ class DarwinManifest(ViewerManifest): self.path2basename(llbasedir,"*.py") self.path2basename(llbasedir,"_cllsd.so") self.end_prefix() + #requests module needed by llbase/llrest.py + #this is only needed on POSIX, because in Windows we compile it into the EXE + requests_path = os.path.join(self.get_dst_prefix(),'requests') + if not os.path.exists(requests_path): + os.makedirs(requests_path) + if self.prefix(dst="requests"): + self.path2basename(requestsdir,"*") + self.end_prefix() self.end_prefix() # most everything goes in the Resources directory |