From b74f698caaaa6ac8d498ea0461c354bb9cbb2b95 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 6 Sep 2019 11:51:36 -0400
Subject: handle slvoice executable separately from the vivox libraries, and
 update mac slvoice package

---
 indra/cmake/Copy3rdPartyLibs.cmake | 59 ++++++++++++++++++--------------------
 indra/newview/viewer_manifest.py   | 14 ++++++---
 2 files changed, 38 insertions(+), 35 deletions(-)

(limited to 'indra')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 808b4601fb..c73a1fdb47 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -17,17 +17,16 @@ if(WINDOWS)
 
     #*******************************
     # VIVOX - *NOTE: no debug version
-    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(vivox_files
-        SLVoice.exe
-        )
+    set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    set(slvoice_src_dir "${ARCH_PREBUILT_BIN_RELEASE}")    
+    set(slvoice_files SLVoice.exe )
     if (ADDRESS_SIZE EQUAL 64)
-        list(APPEND vivox_files
+        list(APPEND vivox_libs
             vivoxsdk_x64.dll
             ortp_x64.dll
             )
     else (ADDRESS_SIZE EQUAL 64)
-        list(APPEND vivox_files
+        list(APPEND vivox_libs
             vivoxsdk.dll
             ortp.dll
             )
@@ -169,9 +168,9 @@ elseif(DARWIN)
     set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
     set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release/Resources")
 
-    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(vivox_files
-        SLVoice
+    set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    set(slvoice_files SLVoice)
+    set(vivox_libs
         libortp.dylib
         libvivoxsdk.dylib
        )
@@ -205,14 +204,15 @@ elseif(LINUX)
     set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
     set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
 
-    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(vivox_files
+    set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    set(vivox_libs
         libsndfile.so.1
         libortp.so
         libvivoxoal.so.1
         libvivoxsdk.so
-        SLVoice
-       )
+        )
+    set(slvoice_files SLVoice)
+
     # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
     # or ARCH_PREBUILT_DIRS
     set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
@@ -249,8 +249,8 @@ elseif(LINUX)
 
 else(WINDOWS)
     message(STATUS "WARNING: unrecognized platform for staging 3rd party libs, skipping...")
-    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
-    set(vivox_files "")
+    set(vivox_lib_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
+    set(vivox_libs "")
     # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
     # or ARCH_PREBUILT_DIRS
     set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib/debug")
@@ -273,39 +273,36 @@ endif(WINDOWS)
 ################################################################
 
 copy_if_different(
-    ${vivox_src_dir}
+    ${vivox_lib_dir}
     "${SHARED_LIB_STAGING_DIR_DEBUG}"
     out_targets 
-    ${vivox_files}
+    ${vivox_libs}
     )
 set(third_party_targets ${third_party_targets} ${out_targets})
 
 copy_if_different(
-    ${vivox_src_dir}
+    ${slvoice_src_dir}
+    "${SHARED_LIB_STAGING_DIR_RELEASE}"
+    out_targets
+    ${slvoice_files}
+    )
+copy_if_different(
+    ${vivox_lib_dir}
     "${SHARED_LIB_STAGING_DIR_RELEASE}"
     out_targets
-    ${vivox_files}
+    ${vivox_libs}
     )
+
 set(third_party_targets ${third_party_targets} ${out_targets})
 
 copy_if_different(
-    ${vivox_src_dir}
+    ${vivox_lib_dir}
     "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
     out_targets
-    ${vivox_files}
+    ${vivox_libs}
     )
 set(third_party_targets ${third_party_targets} ${out_targets})
 
-
-
-#copy_if_different(
-#    ${debug_src_dir}
-#    "${SHARED_LIB_STAGING_DIR_DEBUG}"
-#    out_targets
-#    ${debug_files}
-#    )
-#set(third_party_targets ${third_party_targets} ${out_targets})
-
 copy_if_different(
     ${release_src_dir}
     "${SHARED_LIB_STAGING_DIR_RELEASE}"
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 8a38f3a742..c5cf237f63 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -534,8 +534,11 @@ class WindowsManifest(ViewerManifest):
                 self.path("msvcr120.dll")
                 self.path("msvcp120.dll")
 
-            # Vivox runtimes
-            self.path("SLVoice.exe")
+            # SLVoice executable
+            with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')):
+                self.path("SLVoice.exe")
+
+            # Vivox libraries
             if (self.address_size == 64):
                 self.path("vivoxsdk_x64.dll")
                 self.path("ortp_x64.dll")
@@ -1032,11 +1035,14 @@ class DarwinManifest(ViewerManifest):
                                 ):
                     dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
 
-                # SLVoice and vivox lols, no symlinks needed
+                # SLVoice executable
+                with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')):
+                    self.path("SLVoice.exe")
+
+                # Vivox libraries
                 for libfile in (
                                 'libortp.dylib',
                                 'libvivoxsdk.dylib',
-                                'SLVoice',
                                 ):
                     self.path2basename(relpkgdir, libfile)
 
-- 
cgit v1.2.3