From 4e22d63352dd65085cfbba9c22070271ecdd4bcf Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Thu, 11 Nov 2010 11:05:46 -0800
Subject: [PATCH] Add very basic windows install script.
---
indra/newview/viewer_manifest.py | 4 ++++
indra/viewer_components/updater/CMakeLists.txt | 7 +++++++
.../updater/scripts/windows/update_install.bat | 1 +
3 files changed, 12 insertions(+)
create mode 100644 indra/viewer_components/updater/scripts/windows/update_install.bat
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0073641ed45..55d64fd3a65 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -251,6 +251,10 @@ def construct(self):
if self.prefix(src=os.path.join(os.pardir, 'sharedlibs', self.args['configuration']),
dst=""):
+ if self.prefix(src="../../viewer_components/updater", dst=""):
+ self.path("update_install.bat")
+ self.end_prefix()
+
self.enable_crt_manifest_check()
# Get kdu dll, continue if missing.
diff --git a/indra/viewer_components/updater/CMakeLists.txt b/indra/viewer_components/updater/CMakeLists.txt
index c5ccfbf66a2..469c0cf05e4 100644
--- a/indra/viewer_components/updater/CMakeLists.txt
+++ b/indra/viewer_components/updater/CMakeLists.txt
@@ -89,6 +89,13 @@ if(DARWIN)
update_installer_targets
"update_install"
)
+elseif(WINDOWS)
+ copy_if_different(
+ "${CMAKE_CURRENT_SOURCE_DIR}/scripts/windows"
+ "${CMAKE_CURRENT_BINARY_DIR}"
+ update_installer_targets
+ "update_install.bat"
+ )
endif()
add_custom_target(copy_update_install ALL DEPENDS ${update_installer_targets})
add_dependencies(llupdaterservice copy_update_install)
diff --git a/indra/viewer_components/updater/scripts/windows/update_install.bat b/indra/viewer_components/updater/scripts/windows/update_install.bat
new file mode 100644
index 00000000000..def33c13462
--- /dev/null
+++ b/indra/viewer_components/updater/scripts/windows/update_install.bat
@@ -0,0 +1 @@
+start /WAIT %1
\ No newline at end of file
--
GitLab