2 files changed, 89 insertions, 85 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index cbbf4d9..a38a475 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
 2010-01-09 McCabe Maxsted  <hakushakukun@gmail.com>
+        * Always include VS2005 redist in copy_win_libs.
+        
+          modified:   linden/indra/cmake/CopyWinLibs.cmake
+          
+          
        * Fixed viewer_manifest.py and default packaging system for Windows 
          NSIS install script only works manually.
        
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index c051103..8767980 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -167,103 +167,102 @@ set(all_targets ${all_targets} ${out_targets})
 # Copy MS C runtime dlls, required for packaging.
+# We always need the VS 2005 redist.
 # *TODO - Adapt this to support VC9
-if (MSVC80)
+FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
-    FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
+    PATHS
-        PATHS
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
-         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
+    NO_DEFAULT_PATH
-        NO_DEFAULT_PATH
+    NO_DEFAULT_PATH
-        NO_DEFAULT_PATH
+    )
+if(EXISTS ${debug_msvc8_redist_path})
+    set(debug_msvc8_files
+        msvcr80d.dll
+        msvcp80d.dll
+        Microsoft.VC80.DebugCRT.manifest
        )
-    if(EXISTS ${debug_msvc8_redist_path})
+    copy_if_different(
-        set(debug_msvc8_files
+        ${debug_msvc8_redist_path} 
-            msvcr80d.dll
+        "${CMAKE_CURRENT_BINARY_DIR}/Debug"
-            msvcp80d.dll
+        out_targets 
-            Microsoft.VC80.DebugCRT.manifest
+        ${debug_msvc8_files}
-            )
+        )
+    set(all_targets ${all_targets} ${out_targets})
-        copy_if_different(
+    set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)
-            ${debug_msvc8_redist_path} 
+    add_custom_command(
-            "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+        OUTPUT ${debug_appconfig_file}
-            out_targets 
+        COMMAND ${PYTHON_EXECUTABLE}
-            ${debug_msvc8_files}
+        ARGS
-            )
+          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-        set(all_targets ${all_targets} ${out_targets})
+          ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
+          ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config
+          ${debug_appconfig_file}
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
+        COMMENT "Creating debug app config file"
+        )
-        set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)
+endif (EXISTS ${debug_msvc8_redist_path})
-        add_custom_command(
-            OUTPUT ${debug_appconfig_file}
-            COMMAND ${PYTHON_EXECUTABLE}
-            ARGS
-              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-              ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config
-              ${debug_appconfig_file}
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
-            COMMENT "Creating debug app config file"
-            )
-    endif (EXISTS ${debug_msvc8_redist_path})
+FIND_PATH(release_msvc8_redist_path msvcr80.dll
+    PATHS
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
+    NO_DEFAULT_PATH
+    NO_DEFAULT_PATH
+    )
-    FIND_PATH(release_msvc8_redist_path msvcr80.dll
+if(EXISTS ${release_msvc8_redist_path})
-        PATHS
+    set(release_msvc8_files
-         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
+        msvcr80.dll
-        NO_DEFAULT_PATH
+        msvcp80.dll
-        NO_DEFAULT_PATH
+        Microsoft.VC80.CRT.manifest
        )
-    if(EXISTS ${release_msvc8_redist_path})
+    copy_if_different(
-        set(release_msvc8_files
+        ${release_msvc8_redist_path} 
-            msvcr80.dll
+        "${CMAKE_CURRENT_BINARY_DIR}/Release"
-            msvcp80.dll
+        out_targets 
-            Microsoft.VC80.CRT.manifest
+        ${release_msvc8_files}
-            )
+        )
+    set(all_targets ${all_targets} ${out_targets})
-        copy_if_different(
-            ${release_msvc8_redist_path} 
-            "${CMAKE_CURRENT_BINARY_DIR}/Release"
-            out_targets 
-            ${release_msvc8_files}
-            )
-        set(all_targets ${all_targets} ${out_targets})
-        copy_if_different(
+    copy_if_different(
-            ${release_msvc8_redist_path} 
+        ${release_msvc8_redist_path} 
-            "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+        "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
-            out_targets 
+        out_targets 
-            ${release_msvc8_files}
+        ${release_msvc8_files}
-            )
+        )
-        set(all_targets ${all_targets} ${out_targets})
+    set(all_targets ${all_targets} ${out_targets})
-        set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
+    set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
-        add_custom_command(
+    add_custom_command(
-            OUTPUT ${release_appconfig_file}
+        OUTPUT ${release_appconfig_file}
-            COMMAND ${PYTHON_EXECUTABLE}
+        COMMAND ${PYTHON_EXECUTABLE}
-            ARGS
+        ARGS
-              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
+          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-              ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
+          ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
+          ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
-              ${release_appconfig_file}
+          ${release_appconfig_file}
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
-            COMMENT "Creating release app config file"
+        COMMENT "Creating release app config file"
-            )
+        )
-        set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
+    set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
-        add_custom_command(
+    add_custom_command(
-            OUTPUT ${relwithdebinfo_appconfig_file}
+        OUTPUT ${relwithdebinfo_appconfig_file}
-            COMMAND ${PYTHON_EXECUTABLE}
+        COMMAND ${PYTHON_EXECUTABLE}
-            ARGS
+        ARGS
-              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
+          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-              ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
+          ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
+          ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
-              ${relwithdebinfo_appconfig_file}
+          ${relwithdebinfo_appconfig_file}
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
-            COMMENT "Creating relwithdebinfo app config file"
+        COMMENT "Creating relwithdebinfo app config file"
-            )
+        )
-          
+      
-    endif (EXISTS ${release_msvc8_redist_path})
+endif (EXISTS ${release_msvc8_redist_path})
-endif (MSVC80)
 add_custom_target(copy_win_libs ALL
  DEPENDS

diff --git a/ChangeLog.txt b/ChangeLog.txt index cbbf4d9..a38a475 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
1	2010-01-09 McCabe Maxsted <hakushakukun@gmail.com>	1	2010-01-09 McCabe Maxsted <hakushakukun@gmail.com>
2		2
		3	* Always include VS2005 redist in copy_win_libs.
		4
		5	modified: linden/indra/cmake/CopyWinLibs.cmake
		6
		7
3	* Fixed viewer_manifest.py and default packaging system for Windows	8	* Fixed viewer_manifest.py and default packaging system for Windows
4	NSIS install script only works manually.	9	NSIS install script only works manually.
5		10


diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index c051103..8767980 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -167,103 +167,102 @@ set(all_targets ${all_targets} ${out_targets})
167		167
168		168
169	# Copy MS C runtime dlls, required for packaging.	169	# Copy MS C runtime dlls, required for packaging.
		170	# We always need the VS 2005 redist.
170	# *TODO - Adapt this to support VC9	171	# *TODO - Adapt this to support VC9
171	if (MSVC80)	172	FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
172	FIND_PATH(debug_msvc8_redist_path msvcr80d.dll	173	PATHS
173	PATHS	174	[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
174	[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT	175	NO_DEFAULT_PATH
175	NO_DEFAULT_PATH	176	NO_DEFAULT_PATH
176	NO_DEFAULT_PATH	177	)
		178
		179	if(EXISTS ${debug_msvc8_redist_path})
		180	set(debug_msvc8_files
		181	msvcr80d.dll
		182	msvcp80d.dll
		183	Microsoft.VC80.DebugCRT.manifest
177	)	184	)
178		185
179	if(EXISTS ${debug_msvc8_redist_path})	186	copy_if_different(
180	set(debug_msvc8_files	187	${debug_msvc8_redist_path}
181	msvcr80d.dll	188	"${CMAKE_CURRENT_BINARY_DIR}/Debug"
182	msvcp80d.dll	189	out_targets
183	Microsoft.VC80.DebugCRT.manifest	190	${debug_msvc8_files}
184	)	191	)
		192	set(all_targets ${all_targets} ${out_targets})
185		193
186	copy_if_different(	194	set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)
187	${debug_msvc8_redist_path}	195	add_custom_command(
188	"${CMAKE_CURRENT_BINARY_DIR}/Debug"	196	OUTPUT ${debug_appconfig_file}
189	out_targets	197	COMMAND ${PYTHON_EXECUTABLE}
190	${debug_msvc8_files}	198	ARGS
191	)	199	${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
192	set(all_targets ${all_targets} ${out_targets})	200	${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
		201	${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config
		202	${debug_appconfig_file}
		203	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
		204	COMMENT "Creating debug app config file"
		205	)
193		206
194	set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)	207	endif (EXISTS ${debug_msvc8_redist_path})
195	add_custom_command(
196	OUTPUT ${debug_appconfig_file}
197	COMMAND ${PYTHON_EXECUTABLE}
198	ARGS
199	${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
200	${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
201	${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config
202	${debug_appconfig_file}
203	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
204	COMMENT "Creating debug app config file"
205	)
206		208
207	endif (EXISTS ${debug_msvc8_redist_path})	209	FIND_PATH(release_msvc8_redist_path msvcr80.dll
		210	PATHS
		211	[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
		212	NO_DEFAULT_PATH
		213	NO_DEFAULT_PATH
		214	)
208		215
209	FIND_PATH(release_msvc8_redist_path msvcr80.dll	216	if(EXISTS ${release_msvc8_redist_path})
210	PATHS	217	set(release_msvc8_files
211	[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT	218	msvcr80.dll
212	NO_DEFAULT_PATH	219	msvcp80.dll
213	NO_DEFAULT_PATH	220	Microsoft.VC80.CRT.manifest
214	)	221	)
215		222
216	if(EXISTS ${release_msvc8_redist_path})	223	copy_if_different(
217	set(release_msvc8_files	224	${release_msvc8_redist_path}
218	msvcr80.dll	225	"${CMAKE_CURRENT_BINARY_DIR}/Release"
219	msvcp80.dll	226	out_targets
220	Microsoft.VC80.CRT.manifest	227	${release_msvc8_files}
221	)	228	)
222		229	set(all_targets ${all_targets} ${out_targets})
223	copy_if_different(
224	${release_msvc8_redist_path}
225	"${CMAKE_CURRENT_BINARY_DIR}/Release"
226	out_targets
227	${release_msvc8_files}
228	)
229	set(all_targets ${all_targets} ${out_targets})
230		230
231	copy_if_different(	231	copy_if_different(
232	${release_msvc8_redist_path}	232	${release_msvc8_redist_path}
233	"${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"	233	"${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
234	out_targets	234	out_targets
235	${release_msvc8_files}	235	${release_msvc8_files}
236	)	236	)
237	set(all_targets ${all_targets} ${out_targets})	237	set(all_targets ${all_targets} ${out_targets})
238		238
239	set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)	239	set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
240	add_custom_command(	240	add_custom_command(
241	OUTPUT ${release_appconfig_file}	241	OUTPUT ${release_appconfig_file}
242	COMMAND ${PYTHON_EXECUTABLE}	242	COMMAND ${PYTHON_EXECUTABLE}
243	ARGS	243	ARGS
244	${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py	244	${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
245	${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest	245	${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
246	${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config	246	${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
247	${release_appconfig_file}	247	${release_appconfig_file}
248	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest	248	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
249	COMMENT "Creating release app config file"	249	COMMENT "Creating release app config file"
250	)	250	)
251		251
252	set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)	252	set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
253	add_custom_command(	253	add_custom_command(
254	OUTPUT ${relwithdebinfo_appconfig_file}	254	OUTPUT ${relwithdebinfo_appconfig_file}
255	COMMAND ${PYTHON_EXECUTABLE}	255	COMMAND ${PYTHON_EXECUTABLE}
256	ARGS	256	ARGS
257	${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py	257	${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
258	${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest	258	${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
259	${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config	259	${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
260	${relwithdebinfo_appconfig_file}	260	${relwithdebinfo_appconfig_file}
261	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest	261	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
262	COMMENT "Creating relwithdebinfo app config file"	262	COMMENT "Creating relwithdebinfo app config file"
263	)	263	)
264		264
265	endif (EXISTS ${release_msvc8_redist_path})	265	endif (EXISTS ${release_msvc8_redist_path})
266	endif (MSVC80)
267		266
268	add_custom_target(copy_win_libs ALL	267	add_custom_target(copy_win_libs ALL
269	DEPENDS	268	DEPENDS