From 4bf583aaa23700ec92df0fcf1b9d8978e29199f7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 21 Jul 2016 17:14:07 -0400 Subject: SL-429: Use a new certificate authority bundle based on data from Mozilla --- indra/newview/viewer_manifest.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 1c77cf805e..7625f977e3 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -63,7 +63,6 @@ class ViewerManifest(LLManifest): if self.prefix(src="app_settings"): self.exclude("logcontrol.xml") self.exclude("logcontrol-dev.xml") - self.path("*.pem") self.path("*.ini") self.path("*.xml") self.path("*.db2") @@ -85,11 +84,11 @@ class ViewerManifest(LLManifest): pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') if self.prefix(src=pkgdir,dst=""): self.path("dictionaries") + self.path("ca-bundle.crt") self.end_prefix(pkgdir) # include the extracted packages information (see BuildPackagesInfo.cmake) self.path(src=os.path.join(self.args['build'],"packages-info.txt"), dst="packages-info.txt") - # CHOP-955: If we have "sourceid" or "viewer_channel" in the # build process environment, generate it into # settings_install.xml. @@ -402,7 +401,6 @@ class Windows_i686_Manifest(ViewerManifest): self.path("ortp.dll") self.path("libsndfile-1.dll") self.path("vivoxoal.dll") - self.path("ca-bundle.crt") # Security self.path("ssleay32.dll") @@ -787,7 +785,6 @@ class Darwin_i386_Manifest(ViewerManifest): 'libvivoxoal.dylib', 'libvivoxsdk.dylib', 'libvivoxplatform.dylib', - 'ca-bundle.crt', 'SLVoice', ): self.path2basename(relpkgdir, libfile) -- cgit v1.2.3 From 0db3fa4503224c44773a0b93d0bb8cf1c863950c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 17 Jan 2018 15:21:46 -0500 Subject: use 64bit vivox sdk components in 64bit windows builds --- indra/newview/viewer_manifest.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 72a83968e9..9866d77c13 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -562,8 +562,12 @@ class WindowsManifest(ViewerManifest): # Vivox runtimes self.path("SLVoice.exe") - self.path("vivoxsdk.dll") - self.path("ortp.dll") + if (self.address_size == 64): + self.path("vivoxsdk_64.dll") + self.path("ortp_64.dll") + else: + self.path("vivoxsdk.dll") + self.path("ortp.dll") self.path("libsndfile-1.dll") self.path("vivoxoal.dll") -- cgit v1.2.3 From ac87c608de631398fd778455cbd0edf5ddea8d8e Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 18 Jan 2018 12:59:14 -0500 Subject: correct more 64bit vivox dll names --- indra/newview/viewer_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 9866d77c13..e823228681 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -563,8 +563,8 @@ class WindowsManifest(ViewerManifest): # Vivox runtimes self.path("SLVoice.exe") if (self.address_size == 64): - self.path("vivoxsdk_64.dll") - self.path("ortp_64.dll") + self.path("vivoxsdk_x64.dll") + self.path("ortp_x64.dll") else: self.path("vivoxsdk.dll") self.path("ortp.dll") -- cgit v1.2.3