From 03bcad61115b7128b3b1a5ede3cd7f2bf309fd39 Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Mon, 11 Jul 2016 11:24:45 -0700
Subject: SLS-323: integrate update manager with lanucher, various fixes, CMake
 changes

---
 indra/newview/CMakeLists.txt | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 767a280beb..9ee7b656c0 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1774,9 +1774,42 @@ if (WINDOWS)
        --distpath ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} 
             ${CMAKE_SOURCE_DIR}/viewer_components/manager/SL_Launcher
     COMMENT "Performing pyinstaller compile of SL_Launcher"
+    
+    add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/apply_update.exe
+    COMMAND ${PYTHON_DIRECTORY}/Scripts/pyinstaller.exe
+    ARGS
+       --onefile 
+       --log-level WARN
+       --distpath ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} 
+            ${CMAKE_SOURCE_DIR}/viewer_components/manager/apply_update.py
+    COMMENT "Performing pyinstaller compile of updater"
+    
+    add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/download_update.exe
+    COMMAND ${PYTHON_DIRECTORY}/Scripts/pyinstaller.exe
+    ARGS
+       --onefile 
+       --log-level WARN
+       --distpath ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} 
+            ${CMAKE_SOURCE_DIR}/viewer_components/manager/download_update.py
+    COMMENT "Performing pyinstaller compile of update downloader"
+    
+    add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/update_manager.exe
+    COMMAND ${PYTHON_DIRECTORY}/Scripts/pyinstaller.exe
+    ARGS
+       --onefile 
+       --log-level WARN
+       --distpath ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} 
+            ${CMAKE_SOURCE_DIR}/viewer_components/manager/update_manager.py
+    COMMENT "Performing pyinstaller compile of update manager"
 )
 
 add_custom_target(compile_w_viewer_launcher ALL DEPENDS ${CMAKE_CFG_INTDIR}/SL_Launcher.exe)
+add_custom_target(compile_w_viewer_launcher ALL DEPENDS ${CMAKE_CFG_INTDIR}/apply_update.exe)
+add_custom_target(compile_w_viewer_launcher ALL DEPENDS ${CMAKE_CFG_INTDIR}/download_update.exe)
+add_custom_target(compile_w_viewer_launcher ALL DEPENDS ${CMAKE_CFG_INTDIR}/update_manager.exe)
     
     add_custom_command(
       OUTPUT  ${CMAKE_CFG_INTDIR}/copy_touched.bat
-- 
cgit v1.3