From f0e45c755576a555ef3fecdffd21a95a8635f185 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 24 Aug 2011 16:19:51 -0700 Subject: Committing a useful .bat file for windows --- linden/indra/create with package project.bat | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 linden/indra/create with package project.bat (limited to 'linden') diff --git a/linden/indra/create with package project.bat b/linden/indra/create with package project.bat new file mode 100644 index 0000000..97b1c45 --- /dev/null +++ b/linden/indra/create with package project.bat @@ -0,0 +1,2 @@ +python develop.py configure -DPACKAGE:BOOL=ON +pause \ No newline at end of file -- cgit v1.1 From 2a4afedf90d055cca16bb0ec53542ac67d2ae2c6 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 20 Jul 2011 17:52:25 -0700 Subject: Added ll_frand(min, max) function --- linden/indra/llcommon/llrand.cpp | 15 +++++++++++++++ linden/indra/llcommon/llrand.h | 5 +++++ 2 files changed, 20 insertions(+) (limited to 'linden') diff --git a/linden/indra/llcommon/llrand.cpp b/linden/indra/llcommon/llrand.cpp index 0b2f8b8..fb2bcd3 100644 --- a/linden/indra/llcommon/llrand.cpp +++ b/linden/indra/llcommon/llrand.cpp @@ -156,6 +156,21 @@ F32 ll_frand(F32 val) return rv; } +F32 ll_frand(F32 min, F32 max) +{ + llassert(min <= max); + F32 rv = min + ((max - min) * ll_internal_random_float()); + if (rv > 0) + { + if (rv >= max) return 0.0f; + } + else + { + if (rv <= min) return 0.0f; + } + return rv; +} + F64 ll_drand() { return ll_internal_random_double(); diff --git a/linden/indra/llcommon/llrand.h b/linden/indra/llcommon/llrand.h index 73ea179..0b68a17 100644 --- a/linden/indra/llcommon/llrand.h +++ b/linden/indra/llcommon/llrand.h @@ -83,6 +83,11 @@ LL_COMMON_API F32 ll_frand(); LL_COMMON_API F32 ll_frand(F32 val); /** + *@brief Generate a float from [min, max]. + */ +LL_COMMON_API F32 ll_frand(F32 min, F32 max); + +/** *@brief Generate a double from [0, 1.0). */ LL_COMMON_API F64 ll_drand(); -- cgit v1.1 From 64514186de613cfb53f08c3f11aec1c17d7cf5c9 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 12 Jul 2011 22:37:37 -0700 Subject: Added basic copying of symbol files when the windows package project is run. Todo: add SSE2 target --- linden/indra/newview/viewer_manifest.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'linden') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 5e1e816..774daa9 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -226,6 +226,15 @@ class WindowsManifest(ViewerManifest): # nor do we have a fixed name for the executable self.path(self.find_existing_file('debug/imprudence-bin.exe', 'release/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe()) + # copy over the the pdb file for the regular or SSE2 versions + try: + symbol_name = 'inworldz-%s.pdb' % ('.'.join(self.args['version'])) + self.path(self.find_existing_file('release/inworldz-bin.pdb'), dst="../../../../../pdb_files/inworldz-%s.pdb" % (symbol_ver)) + pass + except: + print "Skipping saving symbols" + pass + self.gather_documents() if self.prefix("../..", dst="doc"): -- cgit v1.1 From dffdf95bbfa5b071063a43281a330e741cf60e8c Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 13 Jul 2011 19:22:52 -0700 Subject: Ported SSE2 build target from Singularity, patch by Shyotl. Note that the package project still currently only supports 'Release' --- linden/indra/CMakeLists.txt | 2 +- linden/indra/cmake/00-Common.cmake | 41 +++++++++++++--- linden/indra/cmake/CopyWinLibs.cmake | 94 +++++++++++++++++++++++++++++------- linden/indra/develop.py | 5 +- 4 files changed, 115 insertions(+), 27 deletions(-) (limited to 'linden') diff --git a/linden/indra/CMakeLists.txt b/linden/indra/CMakeLists.txt index 64e0079..ae1ca5f 100644 --- a/linden/indra/CMakeLists.txt +++ b/linden/indra/CMakeLists.txt @@ -26,7 +26,7 @@ endif (DARWIN) if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING - "Build type. One of: Debug Release RelWithDebInfo" FORCE) + "Build type. One of: Debug Release ReleaseSSE2 RelWithDebInfo" FORCE) endif (NOT CMAKE_BUILD_TYPE) # For the library installation process; diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 1a24a41..7d50f25 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake @@ -1,6 +1,6 @@ # -*- cmake -*- # -# Compilation options shared by all Second Life components. +# Compilation options shared by all viewer components. include(Variables) @@ -10,6 +10,8 @@ include(Variables) set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1") set(CMAKE_CXX_FLAGS_RELEASE "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG") +set(CMAKE_CXX_FLAGS_RELEASESSE2 + "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1") @@ -17,7 +19,7 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO # Available build types / configurations. # Add our current build type first, to coax Xcode into selecting it by default. -set(TYPES ${CMAKE_BUILD_TYPE} RelWithDebInfo Release Debug) +set(TYPES ${CMAKE_BUILD_TYPE} RelWithDebInfo Release ReleaseSSE2 Debug) list(REMOVE_DUPLICATES TYPES) set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE) unset(TYPES) @@ -44,12 +46,18 @@ if (WINDOWS) CACHE STRING "C++ compiler release-with-debug options" FORCE) if (MSVC80) set(CMAKE_CXX_FLAGS_RELEASE - "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MD" - CACHE STRING "C++ compiler release options" FORCE) + "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MD" + CACHE STRING "C++ compiler release options" FORCE) + set(CMAKE_CXX_FLAGS_RELEASESSE2 + "${CMAKE_CXX_FLAGS_RELEASESSE2} /O2 /Ob2 /Oi /Ot /GT /Zi /MD /arch:SSE2" + CACHE STRING "C++ compiler release (SSE2 optimized) options" FORCE) else (MSVC80) set(CMAKE_CXX_FLAGS_RELEASE - "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD" - CACHE STRING "C++ compiler release options" FORCE) + "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD" + CACHE STRING "C++ compiler release options" FORCE) + set(CMAKE_CXX_FLAGS_RELEASESSE2 + "${CMAKE_CXX_FLAGS_RELEASESSE2} ${LL_CXX_FLAGS} /O2 /Zi /MD /arch:SSE2" + CACHE STRING "C++ compiler release (SSE2 optimized) options" FORCE) endif (MSVC80) set(CMAKE_CXX_STANDARD_LIBRARIES "") @@ -73,6 +81,9 @@ if (WINDOWS) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" CACHE STRING "C++ compiler release options" FORCE) + set(CMAKE_CXX_FLAGS_RELEASESSE2 + "${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" + CACHE STRING "C++ compiler release (SSE2 optimized) options" FORCE) add_definitions( /Zc:wchar_t- @@ -186,10 +197,12 @@ if (LINUX) add_definitions(-DLINUX64=1 -pipe) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") endif (${ARCH} STREQUAL "x86_64") + set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -mfpmath=sse2 -msse2") endif (VIEWER) set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}") set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}") + set(CMAKE_CXX_FLAGS_RELEASESSE2 "-O2 ${CMAKE_CXX_FLAGS_RELEASESSE2}") endif (LINUX) @@ -203,6 +216,8 @@ if (DARWIN) # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered. set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_C_FLAGS_RELWITHDEBINFO}") + set(CMAKE_CXX_FLAGS_RELEASESSE2 "-msse2 -mfpmath=sse ${CMAKE_CXX_FLAGS_RELEASESSE2}") + set(CMAKE_C_FLAGS_RELEASESSE2 "-msse2 -mfpmath=sse ${CMAKE_C_FLAGS_RELEASESSE2}") endif (DARWIN) @@ -255,3 +270,17 @@ endif (STANDALONE) if(SERVER) include_directories(${LIBS_PREBUILT_DIR}/include/havok) endif(SERVER) + +SET(CMAKE_EXE_LINKER_FLAGS_RELEASESSE2 + "${CMAKE_EXE_LINKER_FLAGS_RELEASE}" CACHE STRING + "Flags used for linking binaries under SSE2 optimized build." + FORCE ) +SET(CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2 + "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}" CACHE STRING + "Flags used by the shared libraries linker under SSE2 optimized build." + FORCE ) +MARK_AS_ADVANCED( + CMAKE_CXX_FLAGS_RELEASESSE2 + CMAKE_C_FLAGS_RELEASESSE2 + CMAKE_EXE_LINKER_FLAGS_RELEASESSE2 + CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2 ) diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index 78c7c96..e03f542 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake @@ -177,6 +177,15 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) + + copy_if_different( + ${plugintest_release_src_dir} + "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/ReleaseSSE2" + out_targets + ${plugintest_release_files} + ) +set(all_targets ${all_targets} ${out_targets}) + # Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins) set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/imageformats") set(plugintest_release_files @@ -205,6 +214,14 @@ set(all_targets ${all_targets} ${out_targets}) copy_if_different( ${plugintest_release_src_dir} + "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/ReleaseSSE2/imageformats" + out_targets + ${plugintest_release_files} + ) +set(all_targets ${all_targets} ${out_targets}) + +copy_if_different( + ${plugintest_release_src_dir} "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin/imageformats" out_targets ${plugintest_release_files} @@ -219,6 +236,14 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) +copy_if_different( + ${plugintest_release_src_dir} + "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llplugin/imageformats" + out_targets + ${plugintest_release_files} + ) +set(all_targets ${all_targets} ${out_targets}) + # Debug config runtime files required for the plugins set(plugins_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") set(plugins_debug_files @@ -267,6 +292,14 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) +copy_if_different( + ${plugins_release_src_dir} + "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llplugin" + out_targets + ${plugins_release_files} + ) +set(all_targets ${all_targets} ${out_targets}) + set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") set(release_files alut.dll @@ -364,14 +397,15 @@ copy_if_different( set(all_targets ${all_targets} ${out_targets}) copy_if_different( - ${vivox_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" + ${release_src_dir} + "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" out_targets - ${vivox_files} + ${release_files} ) 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 @@ -442,6 +476,14 @@ if(EXISTS ${release_msvc8_redist_path}) ) set(all_targets ${all_targets} ${out_targets}) + copy_if_different( + ${release_msvc8_redist_path} + "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" + out_targets + ${release_msvc8_files} + ) + set(all_targets ${all_targets} ${out_targets}) + set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config) add_custom_command( OUTPUT ${release_appconfig_file} @@ -455,25 +497,41 @@ if(EXISTS ${release_msvc8_redist_path}) COMMENT "Creating release app config file" ) - set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config) - add_custom_command( - OUTPUT ${relwithdebinfo_appconfig_file} - COMMAND ${PYTHON_EXECUTABLE} - ARGS - ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py - ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest - ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config - ${relwithdebinfo_appconfig_file} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest - COMMENT "Creating relwithdebinfo app config file" - ) - -endif (EXISTS ${release_msvc8_redist_path}) + + set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/${VIEWER_BINARY_NAME}.exe.config) + add_custom_command( + OUTPUT ${releasesse2_appconfig_file} + COMMAND ${PYTHON_EXECUTABLE} + ARGS + ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py + ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest + ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config + ${releasesse2_appconfig_file} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest + COMMENT "Creating release (SSE2 optimized) app config file" + ) + + set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config) + add_custom_command( + OUTPUT ${relwithdebinfo_appconfig_file} + COMMAND ${PYTHON_EXECUTABLE} + ARGS + ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py + ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest + ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config + ${relwithdebinfo_appconfig_file} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest + COMMENT "Creating relwithdebinfo app config file" + ) + + endif (EXISTS ${release_msvc8_redist_path}) +endif (MSVC80) add_custom_target(copy_win_libs ALL DEPENDS ${all_targets} - ${release_appconfig_file} + ${release_appconfig_file} + ${releasesse2_appconfig_file} ${relwithdebinfo_appconfig_file} ${debug_appconfig_file} ) diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 094ce3b..69542da 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py @@ -70,7 +70,7 @@ def quote(opts): class PlatformSetup(object): generator = None build_types = {} - for t in ('Debug', 'Release', 'RelWithDebInfo'): + for t in ('Debug', 'Release', 'ReleaseSSE2', 'RelWithDebInfo'): build_types[t.lower()] = t build_type = build_types['relwithdebinfo'] @@ -698,7 +698,8 @@ Options: --unattended build unattended, do not invoke any tools requiring a human response --universal build a universal binary on Mac OS X (unsupported) - -t | --type=NAME build type ("Debug", "Release", or "RelWithDebInfo") + -t | --type=NAME build type ("Debug", "Release", "ReleaseSSE2", or "RelWithDebInfo") + -m32 | -m64 build architecture (32-bit or 64-bit) -N | --no-distcc disable use of distcc -G | --generator=NAME generator name Windows: VC71 or VS2003 (default), VC80 (VS2005) or -- cgit v1.1 From 9b8d6cdbb826444cfa0f0792289daec72c1e5196 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 13 Jul 2011 20:01:57 -0700 Subject: Added SSE2 packaging and configuration the copied pdb filename, moved it up one directory to the main viewer folder --- linden/indra/newview/viewer_manifest.py | 48 ++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 21 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 774daa9..5cae0c9 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -224,17 +224,21 @@ class WindowsManifest(ViewerManifest): super(WindowsManifest, self).construct() # the final exe is complicated because we're not sure where it's coming from, # nor do we have a fixed name for the executable - self.path(self.find_existing_file('debug/imprudence-bin.exe', 'release/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe()) - - # copy over the the pdb file for the regular or SSE2 versions - try: - symbol_name = 'inworldz-%s.pdb' % ('.'.join(self.args['version'])) - self.path(self.find_existing_file('release/inworldz-bin.pdb'), dst="../../../../../pdb_files/inworldz-%s.pdb" % (symbol_ver)) - pass - except: - print "Skipping saving symbols" - pass + self.path(self.find_existing_file('debug/imprudence-bin.exe', 'release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe()) + symbol_file = 'imprudence-%s.%s.pdb' % (symbol_ver, self.args['configuration']) + symbol_path = '../../../../../pdb_files/%s' % (symbol_file) + if os.path.isfile(os.getcwd() + symbol_path): + print "%s already exists, skipping" % (symbol_path) + else: + #print "%s doesn't exist yet" % (os.getcwd() + symbol_path) + try: + self.path(self.find_existing_file('release/imprudence-bin.pdb'), dst="../%s" % (symbol_path)) + pass + except: + print "Can't save symbol file %s, skipping" % (symbol_path) + pass + self.gather_documents() if self.prefix("../..", dst="doc"): @@ -428,17 +432,19 @@ class WindowsManifest(ViewerManifest): self.path("z.dll") self.end_prefix() -# # pull in the crash logger and updater from other projects -# self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter -# "../win_crash_logger/debug/windows-crash-logger.exe", -# "../win_crash_logger/release/windows-crash-logger.exe", -# "../win_crash_logger/relwithdebinfo/windows-crash-logger.exe"), -# dst="win_crash_logger.exe") - self.path(src=self.find_existing_file( - "../win_updater/debug/windows-updater.exe", - "../win_updater/release/windows-updater.exe", - "../win_updater/relwithdebinfo/windows-updater.exe"), - dst="updater.exe") + # pull in the crash logger and updater from other projects + #self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter + # "../win_crash_logger/debug/windows-crash-logger.exe", + # "../win_crash_logger/release/windows-crash-logger.exe", + # "../win_crash_logger/releasesse2/windows-crash-logger.exe"), + # "../win_crash_logger/relwithdebinfo/windows-crash-logger.exe"), + # dst="win_crash_logger.exe") + #self.path(src=self.find_existing_file( + # "../win_updater/debug/windows-updater.exe", + # "../win_updater/release/windows-updater.exe", + # "../win_updater/releasesse2/windows-updater.exe", + # "../win_updater/relwithdebinfo/windows-updater.exe"), + # dst="updater.exe") # For google-perftools tcmalloc allocator. #if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): -- cgit v1.1 From 883b2a6adff1f5496d01572b68a12a1fbadf14e7 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 13 Jul 2011 20:05:12 -0700 Subject: Removed packaging private assemblies since that's no longer how we distribute the CRT --- linden/indra/newview/viewer_manifest.py | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 5cae0c9..19344d5 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -323,31 +323,22 @@ class WindowsManifest(ViewerManifest): self.path("qtiff4.dll") self.end_prefix() + # We no longer use private assemblies in the viewer -- MC # These need to be installed as a SxS assembly, currently a 'private' assembly. # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx - if self.prefix(src=self.args['configuration'], dst=""): - if self.args['configuration'] == 'Debug': - self.path("msvcr80d.dll") - self.path("msvcp80d.dll") - self.path("Microsoft.VC80.DebugCRT.manifest") - else: - self.path("msvcr80.dll") - self.path("msvcp80.dll") - self.path("Microsoft.VC80.CRT.manifest") - self.end_prefix() + #if self.prefix(src=self.args['configuration'], dst=""): + # if self.args['configuration'] == 'Debug': + # self.path("msvcr80d.dll") + # self.path("msvcp80d.dll") + # self.path("Microsoft.VC80.DebugCRT.manifest") + # else: + # self.path("msvcr80.dll") + # self.path("msvcp80.dll") + # self.path("Microsoft.VC80.CRT.manifest") + # self.end_prefix() # The config file name needs to match the exe's name. - self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config") - - # We need this one too, so that llkdu loads at runtime - DEV-41194 - #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="llkdu.dll.2.config") - self.path("llkdu.dll.2.config") - - # We need this one too, so that win_crash_logger.exe loads at runtime - DEV-19004 - #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="win_crash_logger.exe.config") - - # same thing for auto-updater. - #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="updater.exe.config") + #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config") # Vivox runtimes if self.prefix(src="vivox-runtime/i686-win32", dst=""): -- cgit v1.1 From 0e18be36d49140365ba1092bd965b645c4bf1eef Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 13 Jul 2011 21:35:31 -0700 Subject: Added a new Windows installer script for ISS. Packaging now just generates a versioned script that must be compiled (currently) by hand. Leaving the NSIS files to be cleaned up as the installer work continues --- linden/indra/lib/python/indra/util/llmanifest.py | 26 +- .../windows/inworldz_installer_template.iss | 367 +++++++++++++++++++++ linden/indra/newview/viewer_manifest.py | 180 ++-------- 3 files changed, 418 insertions(+), 155 deletions(-) create mode 100644 linden/indra/newview/installers/windows/inworldz_installer_template.iss (limited to 'linden') diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py index fc777b2..3cd8786 100644 --- a/linden/indra/lib/python/indra/util/llmanifest.py +++ b/linden/indra/lib/python/indra/util/llmanifest.py @@ -121,15 +121,16 @@ ARGUMENTS=[ default=""), dict(name='artwork', description='Artwork directory.', default=DEFAULT_SRCTREE), dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE), - dict(name='buildtype', - description='Set to DEBUG if this is a debug build.', - default="RELEASE"), - dict(name='channel', - description="""The channel to use for updates, packaging, settings name, etc.""", - default=get_channel), + dict(name='buildtype', description="""The build type used. ('Debug', 'Release', 'ReleaseSSE2', or 'RelWithDebInfo') + Default is Release """, + default="Release"), + dict(name='branding_id', description="""Identifier for the branding set to + use. Currently, 'imprudence')""", + default='inworldz'), dict(name='configuration', - description="""The build configuration used. Only used on OS X for - now, but it could be used for other platforms as well.""", + description="""The build configuration used. On OSX this is + Universal, etc. On Windows it's the *actual* buildtype for + some weird reason.""", default="Universal"), dict(name='dest', description='Destination directory.', default=DEFAULT_SRCTREE), dict(name='grid', @@ -137,13 +138,16 @@ ARGUMENTS=[ though it's not strictly a grid, 'firstlook' is also an acceptable value for this parameter.""", default=""), + dict(name='channel', + description="""The channel to use for updates, packaging, settings name, etc.""", + default=get_channel), + dict(name='login_channel', + description="""The channel to use for login handshake/updates only.""", + default=None), dict(name='installer_name', description=""" The name of the file that the installer should be packaged up into. Only used on Linux at the moment.""", default=None), - dict(name='login_channel', - description="""The channel to use for login handshake/updates only.""", - default=None), dict(name='login_url', description="""The url that the login screen displays in the client.""", default=None), diff --git a/linden/indra/newview/installers/windows/inworldz_installer_template.iss b/linden/indra/newview/installers/windows/inworldz_installer_template.iss new file mode 100644 index 0000000..655ebc5 --- /dev/null +++ b/linden/indra/newview/installers/windows/inworldz_installer_template.iss @@ -0,0 +1,367 @@ +; InWorldz inno setup installer template by McCabe Maxsted + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) + +; These will change +AppId={{DC6CCE02-BC61-43B1-B4CA-292C6BCCCB34} +AppName=%%APPNAME%% +AppVerName=%%APPVERNAME%% +DefaultDirName={pf}\InWorldz +DefaultGroupName=InWorldz +VersionInfoProductName=%%APPNAME%% +OutputBaseFilename=%%INSTALLERFILENAME%% +VersionInfoVersion=%%VERSION%% +VersionInfoTextVersion=%%VERSION%% +VersionInfoProductVersion=%%VERSION%% +AppVersion=%%VERSION%% +VersionInfoCopyright=2011 + +; These won't change +VersionInfoCompany=InWorldz, LLC +AppPublisher=InWorldz, LLC +AppPublisherURL=http://inworldz.com +AppSupportURL=http://inworldz.com +AllowNoIcons=true +InfoAfterFile=..\..\..\..\..\..\README.txt +OutputDir=. +SetupIconFile=..\..\..\..\newview\installers\windows\install_icon.ico +Compression=lzma2/ultra64 +InternalCompressLevel=ultra64 +SolidCompression=true +PrivilegesRequired=poweruser +AllowRootDirectory=true +WizardImageFile=..\..\..\..\newview\installers\windows\installer_icon_left.bmp +WizardSmallImageFile=..\..\..\..\newview\installers\windows\installer_icon_right.bmp +SetupLogging=true +RestartIfNeededByRun=false +AlwaysRestart=false + +[Languages] +Name: english; MessagesFile: compiler:Default.isl + +[Tasks] +Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce +Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce +; TODO: use scripting for something like this on uninstall: +; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: + +; NOTE VS2005 is currently the only version supported anywhere in the packaging system, so we can do this here +[Files] +Source: %%PACKAGEFILES%%\inworldz.exe; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\skins\*; DestDir: {app}\skins; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\llplugin\*; DestDir: {app}\llplugin; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\doc\*; DestDir: {app}\doc; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\alut.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\dbghelp.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libapr-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libapriconv-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libaprutil-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\llcommon.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\featuretable.txt; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\gpu_table.txt; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\kdu_v64R.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\kdu_v64R.dll.config; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\openal32.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\OpenJPEG.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\README.txt; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\SLPlugin.exe; DestDir: {app}; Flags: ignoreversion + +; Gstreamer-specific files below +Source: %%PACKAGEFILES%%\lib\*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\avcodec-gpl-52.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\avdevice-gpl-52.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\avfilter-gpl-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\avformat-gpl-52.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\avutil-gpl-50.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\iconv.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\liba52-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libbz2.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libcelt-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libdca-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libexpat-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libfaad-2.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libFLAC-8.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgcrypt-11.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgio-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgnutls-26.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgobject-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgpg-error-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstapp-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstaudio-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstbase-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstcontroller-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstdataprotocol-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstfft-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstinterfaces-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstnet-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstnetbuffer-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstpbutils-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstphotography-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstreamer-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstriff-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstrtp-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstrtsp-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstsdp-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstsignalprocessor-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgsttag-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstvideo-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgthread-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libmms-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libmpeg2-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libneon-27.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libogg-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\liboil-0.3-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libsoup-2.4-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libtasn1-3.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libtheora-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libtheoradec-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libvorbisenc-2.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libvorbisfile-3.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libwavpack-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libx264-67.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libxml2.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\SDL.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\xvidcore.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\z.dll; DestDir: {app}; Flags: ignoreversion + +; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist +Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe +Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe +Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe + +; Old files we don't use anymore: +; Source: %%PACKAGEFILES%%\dronesettings.xml; DestDir: {app}; Flags: ignoreversion +; Source: %%PACKAGEFILES%%\volume_settings.xml; DestDir: {app}; Flags: ignoreversion +; Source: %%PACKAGEFILES%%\srtp.dll; DestDir: {app}; Flags: ignoreversion +; Source: %%PACKAGEFILES%%\ssleay32.dll; DestDir: {app}; Flags: ignoreversion +; Source: %%PACKAGEFILES%%\tntk.dll; DestDir: {app}; Flags: ignoreversion +; Source: %%PACKAGEFILES%%\libeay32.dll; DestDir: {app}; Flags: ignoreversion +; Source: %%PACKAGEFILES%%\lsl_guide.html; DestDir: {app}; Flags: ignoreversion + +; NOTE: Don't use "Flags: ignoreversion" on any shared system files +;Source: %%PACKAGEFILES%%\msvcr71.dll; DestDir: {app}; Flags: ignoreversion; MinVersion: 0,6.01; Tasks: ; Languages: + +[Registry] +Root: HKCR; Subkey: inworldz; ValueType: string; Flags: uninsdeletekey deletekey; ValueName: (default); ValueData: URL:InWorldz +Root: HKCR; Subkey: inworldz; ValueType: string; Flags: uninsdeletekey deletekey; ValueName: URL Protocol +Root: HKCR; Subkey: inworldz\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; ValueData: {app}\inworldz.exe +Root: HKCR; Subkey: inworldz\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; ValueData: "{app}\inworldz.exe -url ""%1"""; Languages: +; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib +; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app} + +[Icons] +Name: {group}\{cm:UninstallProgram,InWorldz}; Filename: {uninstallexe} +Name: {commondesktop}\InWorldz; Filename: {app}\inworldz.exe; Tasks: desktopicon; WorkingDir: {app}; IconIndex: 0 +Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\InWorldz; Filename: {app}\inworldz.exe; Tasks: quicklaunchicon; WorkingDir: {app} +Name: {group}\InWorldz; Filename: {app}\inworldz.exe; WorkingDir: {app}; Comment: inworldz; IconIndex: 0; + +[Run] +; Install redistributables. +; +; !!!!BEWARE!!!! +; +; Command line parameters and filenames WILL change with each version. Blame Microsoft. + +; Always use /q for VS2005 rather than something quieter such as Parameters: "/q:a c:""msiexec /i vcredist.msi /qn"" ". The redist will fail sometimes if you do otherwise. +Filename: {app}\redist\vcredist_x86_VS2005_SP1_MFC_SEC.exe; Parameters: "/q"; Check: Needs2005Redist; Flags: runhidden +Filename: {app}\redist\vcredist_x86_VS2008_SP1_ATL_SEC.exe; Parameters: "/q"; Check: Needs2008Redist; Flags: runhidden +Filename: {app}\redist\vcredist_x86_VS2010_SP1.exe; Parameters: "/q /norestart"; Check: Needs2010Redist; Flags: runhidden +Filename: {app}\inworldz.exe; WorkingDir: {app}; Flags: nowait postinstall + +[UninstallDelete] +Name: {userappdata}\InWorldz\user_settings\password.dat; Type: files; Languages: +Name: {userappdata}\InWorldz\user_settings\settings.xml; Type: files; Languages: +; 1.1 and lower cache location: +Name: {userappdata}\InWorldz\cache; Type: filesandordirs +; 1.2 and higher cache location: +Name: {localappdata}\InWorldz\cache; Type: filesandordirs +Name: {userappdata}\InWorldz\logs; Type: filesandordirs +Name: {userappdata}\InWorldz\browser_profile; Type: filesandordirs +Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs +Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs + +[InstallDelete] +; Name: {app}\*.dll; Type: files; Tasks: ; Languages: +Name: {app}\licenses.txt; Type: files; Tasks: ; Languages: +; ALWAYS delete the plugins! Beware if you don't +Name: {app}\lib\gstreamer-plugins\*; Type: filesandordirs; Tasks: ; Languages: +; Name: {app}\skins\default\xui\*; Type: filesandordirs; Tasks: ; Languages: +; Old xui skin files can cause bugs, always kill them +Name: {app}\skins\silver\xui\en-us\*; Type: filesandordirs; Tasks: ; Languages: +Name: {app}\app_settings\mozilla; Type: filesandordirs; Tasks: ; Languages: +Name: {app}\app_settings\mozilla_debug; Type: filesandordirs; Tasks: ; Languages: +Name: {app}\app_settings\viewerversion.xml; Type: filesandordirs; Tasks: ; Languages: +Name: C:\Documents and Settings\{username}\.gstreamer-0.10\*; Type: filesandordirs +Name: C:\Users\{username}\.gstreamer-0.10\*; Type: filesandordirs +; Breaks the browser if installing on top of 1.1: +Name: {app}\gksvggdiplus.dll; Type: files; Tasks: ; Languages: +; Breaks inworld audio if it's from an old version with a different GUID +Name: {app}\alut.dll; Type: files; Tasks: ; Languages: + +; Old plugin files we want to kill: +Name: {app}\charset.dll; Type: files; Tasks: ; Languages: +Name: {app}\freebl3.dll; Type: files; Tasks: ; Languages: +Name: {app}\glew32.dll; Type: files; Tasks: ; Languages: +Name: {app}\iconv.dll; Type: files; Tasks: ; Languages: +Name: {app}\intl.dll; Type: files; Tasks: ; Languages: +Name: {app}\InWorldzViewer.exe; Type: files; Tasks: ; Languages: +Name: {app}\js3250.dll; Type: files; Tasks: ; Languages: +Name: {app}\libcairo-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libfaad-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgcrypt-11.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgio-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libglib-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgmodule-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgnutls-26.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgobject-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgpg-error-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstapp.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstaudio.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstaudio-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstbase-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstcdda.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstcontroller-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstdataprotocol-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstdshow.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstfft.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstinterfaces.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstnet-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstnetbuffer.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstpbutils.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstreamer-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstriff.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstrtp.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstrtsp.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstsdp.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgsttag.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstvideo.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgthread-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libjpeg.dll; Type: files; Tasks: ; Languages: +Name: {app}\libmp3lame-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libneon-27.dll; Type: files; Tasks: ; Languages: +Name: {app}\libogg-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\liboil-0.3-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libopenjpeg-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libpng12-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libschroedinger-1.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libspeex-1.dll; Type: files; Tasks: ; Languages: +Name: {app}\libtheora-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libvorbis-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libvorbisenc-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libxml2-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libxml2.dll; Type: files; Tasks: ; Languages: +Name: {app}\nspr4.dll; Type: files; Tasks: ; Languages: +Name: {app}\nss3.dll; Type: files; Tasks: ; Languages: +Name: {app}\nssckbi.dll; Type: files; Tasks: ; Languages: +Name: {app}\plc4.dll; Type: files; Tasks: ; Languages: +Name: {app}\plds4.dll; Type: files; Tasks: ; Languages: +Name: {app}\smime3.dll; Type: files; Tasks: ; Languages: +Name: {app}\softokn3.dll; Type: files; Tasks: ; Languages: +Name: {app}\ssl3.dll; Type: files; Tasks: ; Languages: +Name: {app}\xpcom.dll; Type: files; Tasks: ; Languages: +Name: {app}\xul.dll; Type: files; Tasks: ; Languages: +Name: {app}\xvidcore.dll; Type: files; Tasks: ; Languages: +Name: {app}\zlib1.dll; Type: files; Tasks: ; Languages: + +; We don't distribute the CRT like this anymore; murder death kill +Name: {app}\SLPlugin.exe.config; Type: files; Tasks: ; Languages: +Name: {app}\Microsoft.VC80.CRT.manifest; Type: files; Tasks: ; Languages: +Name: {app}\msvcp80.dll; Type: files; Tasks: ; Languages: +Name: {app}\msvcr80.dll; Type: files; Tasks: ; Languages: +Name: {app}\msvcr71.dll; Type: files; Tasks: ; Languages: +Name: {app}\inworldz.exe.config; Type: files; Tasks: ; Languages: + + +[Code] +// [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86] +// Installed = 1 (REG_DWORD) +function IsVS2010RedistInstalled(): Boolean; +var + V: Cardinal; + Success: Boolean; +begin + if IsWin64 then begin + Success := RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); + end else begin + Success := RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); + end + + if Success = TRUE then begin + if V = 1 then begin + Result := TRUE; + end else begin + Result := FALSE; + end + end else begin + Result := FALSE; + end +end; + +function Needs2010Redist(): Boolean; +begin + Result := (IsVS2010RedistInstalled = FALSE); + if (Result = TRUE) then begin + Log('User system needs VS 2010 SP1 x86 Redistributable, installing.'); + end else begin + Log('User already has VS 2010 SP1 x86 Redistributable installed, skipping.'); + end +end; + +// VS2008 and 2005 x86 redists. Always look for the latest version we know about. I wish there were a better way to check for these +const + VS2005_X86 = '{A49F249F-0C91-497F-86DF-B2585E8E76B7}'; // http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE + VS2005_SP1_X86 = '{7299052B-02A4-4627-81F2-1818DA5D550D}'; // 8.0.50727.762: http://www.microsoft.com/downloads/details.aspx?FamilyID=200B2FD9-AE1A-4A14-984D-389C36F85647 + VS2005_SP1_X86_ATL_SEC = '{837B34E3-7C30-493C-8F6A-2B0F04E2912C}'; // 8.0.50727.4053: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=14431 + VS2005_SP1_X86_MFC_SEC = '{710f4c1c-cc18-4c49-8cbf-51240c89a1a2}'; // 8.0.50727.6195: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=26347 + + VS2008_X86 = '{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}'; // http://www.microsoft.com/downloads/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf + VS2008_SP1_X86 = '{9A25302D-30C0-39D9-BD6F-21E6EC160475}'; // 9.0.30729.17: http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2 + VS2008_SP1_X86_ATL_SEC = '{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}'; // 9.0.30729.4148: http://www.microsoft.com/downloads/details.aspx?familyid=2051A0C1-C9B5-4B0A-A8F5-770A549FD78C + // These updates currently don't have redist links: + // 9.0.30729.5026: + // 9.0.30729.5570: + // 9.0.30729.6161: http://support.microsoft.com/kb/2538243 + + INSTALLSTATE_INVALIDARG = -2; // An invalid parameter was passed to the function + INSTALLSTATE_UNKNOWN = -1; // The product is not advertised or installed + INSTALLSTATE_ADVERTISED = 1; // The product is advertised but not installed + INSTALLSTATE_ABSENT = 2; // The product is installed for a different user + INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user + +function MsiQueryProductState(ProductCode: String): Integer; + external 'MsiQueryProductStateA@msi.dll stdcall'; + +function IsProductCodeInstalled(ProductUUID: String): Boolean; +begin + Result := (MsiQueryProductState(ProductUUID) = INSTALLSTATE_DEFAULT); +end; + +function Needs2005Redist(): Boolean; +begin + Result:= (IsProductCodeInstalled(VS2005_SP1_X86_MFC_SEC) = FALSE); + if (Result = TRUE) then begin + Log('User system needs VS 2005 SP1 x86 Redistributable, installing.'); + end else begin + Log('User already has VS 2005 SP1 x86 Redistributable installed, skipping.'); + end +end; + +function Needs2008Redist(): Boolean; +begin + Result := (IsProductCodeInstalled(VS2008_SP1_X86_ATL_SEC) = FALSE); + if (Result = TRUE) then begin + Log('User system needs VS 2008 SP1 x86 Redistributable, installing.'); + end else begin + Log('User already has VS 2008 SP1 x86 Redistributable installed, skipping.'); + end +end; diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 19344d5..6bf9dc7 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -166,6 +166,10 @@ class ViewerManifest(LLManifest): return self.args['standalone'] == "ON" def debug(self): return self.args['buildtype'] == "DEBUG" + def buildtype(self): + return self.args['buildtype'] + def configuration(self): + return self.args['configuration'] def grid(self): return self.args['grid'] def channel(self): @@ -176,6 +180,11 @@ class ViewerManifest(LLManifest): return "".join(self.channel_unique().split()) def channel_lowerword(self): return self.channel_oneword().lower() + def viewer_branding_id(self): + return self.args['branding_id'] + def installer_prefix(self): + mapping={"imprudence":'Imprudence-'} + return mapping[self.viewer_branding_id()] def flags_list(self): """ Convenience function that returns the command-line flags @@ -443,145 +452,31 @@ class WindowsManifest(ViewerManifest): # self.end_prefix() - def nsi_file_commands(self, install=True): - def wpath(path): - if path.endswith('/') or path.endswith(os.path.sep): - path = path[:-1] - path = path.replace('/', '\\') - return path - - result = "" - dest_files = [pair[1] for pair in self.file_list if pair[0] and os.path.isfile(pair[1])] - # sort deepest hierarchy first - dest_files.sort(lambda a,b: cmp(a.count(os.path.sep),b.count(os.path.sep)) or cmp(a,b)) - dest_files.reverse() - out_path = None - for pkg_file in dest_files: - rel_file = os.path.normpath(pkg_file.replace(self.get_dst_prefix()+os.path.sep,'')) - installed_dir = wpath(os.path.join('$INSTDIR', os.path.dirname(rel_file))) - pkg_file = wpath(os.path.normpath(pkg_file)) - if installed_dir != out_path: - if install: - out_path = installed_dir - result += 'SetOutPath ' + out_path + '\n' - if install: - result += 'File ' + pkg_file + '\n' - else: - result += 'Delete ' + wpath(os.path.join('$INSTDIR', rel_file)) + '\n' - # at the end of a delete, just rmdir all the directories - if not install: - deleted_file_dirs = [os.path.dirname(pair[1].replace(self.get_dst_prefix()+os.path.sep,'')) for pair in self.file_list] - # find all ancestors so that we don't skip any dirs that happened to have no non-dir children - deleted_dirs = [] - for d in deleted_file_dirs: - deleted_dirs.extend(path_ancestors(d)) - # sort deepest hierarchy first - deleted_dirs.sort(lambda a,b: cmp(a.count(os.path.sep),b.count(os.path.sep)) or cmp(a,b)) - deleted_dirs.reverse() - prev = None - for d in deleted_dirs: - if d != prev: # skip duplicates - result += 'RMDir ' + wpath(os.path.join('$INSTDIR', os.path.normpath(d))) + '\n' - prev = d - - return result - def package_finish(self): - # a standard map of strings for replacing in the templates - substitution_strings = { - 'version' : '.'.join(self.args['version']).replace(' ', '_'), - 'version_short' : '.'.join(self.args['version'][:-1]).replace(' ', '_'), - 'version_dashes' : '-'.join(self.args['version']).replace(' ', '_'), - 'final_exe' : self.final_exe(), - 'grid':self.args['grid'], - 'grid_caps':self.args['grid'].upper(), - # escape quotes becase NSIS doesn't handle them well - 'flags':self.flags_list().replace('"', '$\\"'), - 'channel':self.channel(), - 'channel_oneword':self.channel_oneword(), - 'channel_unique':self.channel_unique(), - } - - version_vars = """ - !define INSTEXE "%(final_exe)s" - !define VERSION "%(version_short)s" - !define VERSION_LONG "%(version)s" - !define VERSION_DASHES "%(version_dashes)s" - """ % substitution_strings - if self.default_channel(): - if self.default_grid(): - # release viewer - installer_file = "Imprudence_%(version_dashes)s_Setup.exe" - grid_vars_template = """ - OutFile "%(installer_file)s" - !define INSTFLAGS "%(flags)s" - !define INSTNAME "Imprudence" - !define SHORTCUT "Imprudence" - !define URLNAME "imprudence" - Caption "Imprudence ${VERSION}" - """ - else: - # beta grid viewer - installer_file = "Imprudence_%(version_dashes)s_(%(grid_caps)s)_Setup.exe" - grid_vars_template = """ - OutFile "%(installer_file)s" - !define INSTFLAGS "%(flags)s" - !define INSTNAME "Imprudence%(grid_caps)s" - !define SHORTCUT "Imprudence (%(grid_caps)s)" - !define URLNAME "imprudence%(grid)s" - !define UNINSTALL_SETTINGS 1 - Caption "Imprudence %(grid)s ${VERSION}" - """ - else: - # some other channel on some grid - installer_file = "Imprudence_%(version_dashes)s_%(channel_oneword)s_Setup.exe" - grid_vars_template = """ - OutFile "%(installer_file)s" - !define INSTFLAGS "%(flags)s" - !define INSTNAME "Imprudence%(channel_oneword)s" - !define SHORTCUT "%(channel)s" - !define URLNAME "imprudence" - !define UNINSTALL_SETTINGS 1 - Caption "%(channel)s ${VERSION}" - """ - if 'installer_name' in self.args: - installer_file = self.args['installer_name'] - else: - installer_file = installer_file % substitution_strings - substitution_strings['installer_file'] = installer_file - - tempfile = "imprudence_setup_tmp.nsi" - # the following replaces strings in the nsi template - # it also does python-style % substitution - self.replace_in("installers/windows/installer_template.nsi", tempfile, { - "%%VERSION%%":version_vars, - "%%SOURCE%%":self.get_src_prefix(), - "%%GRID_VARS%%":grid_vars_template % substitution_strings, - "%%INSTALL_FILES%%":self.nsi_file_commands(True), - "%%DELETE_FILES%%":self.nsi_file_commands(False)}) - - # We use the Unicode version of NSIS, available from - # http://www.scratchpaper.com/ - try: - import _winreg as reg - NSIS_path = reg.QueryValue(reg.HKEY_LOCAL_MACHINE, r"SOFTWARE\NSIS\Unicode") + '\\makensis.exe' - self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile)) - except: - try: - NSIS_path = os.environ['ProgramFiles'] + '\\NSIS\\Unicode\\makensis.exe' - self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile)) - except: - NSIS_path = os.environ['ProgramFiles(X86)'] + '\\NSIS\\Unicode\\makensis.exe' - self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile)) - # self.remove(self.dst_path_of(tempfile)) - # If we're on a build machine, sign the code using our Authenticode certificate. JC - sign_py = 'C:\\buildscripts\\code-signing\\sign.py' - if os.path.exists(sign_py): - self.run_command(sign_py + ' ' + self.dst_path_of(installer_file)) - else: - print "Skipping code signing,", sign_py, "does not exist" - self.created_path(self.dst_path_of(installer_file)) - self.package_file = installer_file + # InWorldz uses Inno Setup to compile its installers. This process creates a new installer from a template + # See http://www.jrsoftware.org/isinfo.php + sse_string = '' + if self.configuration().lower() == "releasesse2": + sse_string = ".SSE2" + + version = '.'.join(self.args['version']) + base_filename = self.installer_prefix() + version + sse_string + app_name = self.channel() + app_ver_name="%s %s" % (app_name, version) + + new_script = base_filename + ".iss" + self.replace_in("installers/windows/inworldz_installer_template.iss", new_script, { + "%%VERSION%%":version, + "%%INSTALLERFILENAME%%":base_filename, + "%%PACKAGEFILES%%":self.args['dest'], + "%%APPNAME%%":app_name, + "%%APPVERNAME%%":app_ver_name, + }) + + self.created_path(self.dst_path_of(new_script)) + self.package_file = base_filename + ".exe" + + print "New ISS script created at " + self.args['dest'] + "\\" + new_script class DarwinManifest(ViewerManifest): @@ -832,20 +727,17 @@ class DarwinManifest(ViewerManifest): if not self.default_channel(): channel_standin = self.channel() - imagename="Imprudence_" + '_'.join(self.args['version']) - - # MBW -- If the mounted volume name changes, it breaks the .DS_Store's background image and icon positioning. - # If we really need differently named volumes, we'll need to create multiple DS_Store file images, or use some other trick. + imagename=self.installer_prefix() + '-'.join(self.args['version']) volname="Imprudence Installer" # DO NOT CHANGE without understanding comment above if self.default_channel(): if not self.default_grid(): # beta case - imagename = imagename + '_' + self.args['grid'].upper() + imagename = imagename + '-' + self.args['grid'].upper() else: # first look, etc - imagename = imagename + '_' + self.channel_oneword().upper() + imagename = imagename + '-' + self.channel_oneword().upper() sparsename = imagename + ".sparseimage" finalname = imagename + ".dmg" -- cgit v1.1 From 2f84e33d52540877a83aca94129379769feae9a6 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 16:58:34 -0700 Subject: Fixed cmake merge error when adding SSE2 target to copy win libs --- linden/indra/cmake/CopyWinLibs.cmake | 53 ++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 27 deletions(-) (limited to 'linden') diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index e03f542..e4d0130 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake @@ -498,34 +498,33 @@ if(EXISTS ${release_msvc8_redist_path}) ) - set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/${VIEWER_BINARY_NAME}.exe.config) - add_custom_command( - OUTPUT ${releasesse2_appconfig_file} - COMMAND ${PYTHON_EXECUTABLE} - ARGS - ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py - ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest - ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config - ${releasesse2_appconfig_file} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest - COMMENT "Creating release (SSE2 optimized) app config file" - ) - - set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config) - add_custom_command( - OUTPUT ${relwithdebinfo_appconfig_file} - COMMAND ${PYTHON_EXECUTABLE} - ARGS - ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py - ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest - ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config - ${relwithdebinfo_appconfig_file} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest - COMMENT "Creating relwithdebinfo app config file" - ) + set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/${VIEWER_BINARY_NAME}.exe.config) + add_custom_command( + OUTPUT ${releasesse2_appconfig_file} + COMMAND ${PYTHON_EXECUTABLE} + ARGS + ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py + ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest + ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config + ${releasesse2_appconfig_file} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest + COMMENT "Creating release (SSE2 optimized) app config file" + ) + + set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config) + add_custom_command( + OUTPUT ${relwithdebinfo_appconfig_file} + COMMAND ${PYTHON_EXECUTABLE} + ARGS + ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py + ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest + ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config + ${relwithdebinfo_appconfig_file} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest + COMMENT "Creating relwithdebinfo app config file" + ) - endif (EXISTS ${release_msvc8_redist_path}) -endif (MSVC80) +endif (EXISTS ${release_msvc8_redist_path}) add_custom_target(copy_win_libs ALL DEPENDS -- cgit v1.1 From 757a76a94667bacfac566cae7b2418bc5d5fe767 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 17:15:52 -0700 Subject: Rebranded the Windows isntaller template back to Imp --- .../windows/imprudence_installer_template.iss | 379 +++++++++++++++++++++ .../windows/inworldz_installer_template.iss | 367 -------------------- linden/indra/newview/viewer_manifest.py | 6 +- 3 files changed, 382 insertions(+), 370 deletions(-) create mode 100644 linden/indra/newview/installers/windows/imprudence_installer_template.iss delete mode 100644 linden/indra/newview/installers/windows/inworldz_installer_template.iss (limited to 'linden') diff --git a/linden/indra/newview/installers/windows/imprudence_installer_template.iss b/linden/indra/newview/installers/windows/imprudence_installer_template.iss new file mode 100644 index 0000000..0605fba --- /dev/null +++ b/linden/indra/newview/installers/windows/imprudence_installer_template.iss @@ -0,0 +1,379 @@ +; Imprudence inno setup installer template by McCabe Maxsted + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +; Imp Stable ID: D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8 +; Imp Experimental ID: 1B3E68BC-13EB-4277-9439-CB5FF9259460 + +; These will change +AppId={{D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8} +AppName=%%APPNAME%% +AppVerName=%%APPVERNAME%% +DefaultDirName={pf}\Imprudence +DefaultGroupName=Imprudence Viewer +VersionInfoProductName=%%APPNAME%% +OutputBaseFilename=%%INSTALLERFILENAME%% +VersionInfoVersion=%%VERSION%% +VersionInfoTextVersion=%%VERSION%% +VersionInfoProductVersion=%%VERSION%% +AppVersion=%%VERSION%% +VersionInfoCopyright=2011 + +; These won't change +VersionInfoCompany=Imprudence +AppPublisher=The Imprudence Project +AppPublisherURL=http://kokuaviewer.org +AppSupportURL=http://kokuaviewer.org +AllowNoIcons=true +InfoAfterFile=..\..\..\..\..\..\README.txt +OutputDir=. +SetupIconFile=..\..\..\..\newview\installers\windows\imp_icon.ico +Compression=lzma2/ultra64 +InternalCompressLevel=ultra64 +SolidCompression=true +PrivilegesRequired=poweruser +AllowRootDirectory=true +WizardImageFile=..\..\..\..\newview\installers\windows\imprudence_installer_icon_left.bmp +WizardSmallImageFile=..\..\..\..\newview\installers\windows\imprudence_installer_icon_right.bmp +SetupLogging=true +RestartIfNeededByRun=false +AlwaysRestart=false + +[Languages] +Name: english; MessagesFile: compiler:Default.isl + +[Tasks] +Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce +Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce +; TODO: use scripting for something like this on uninstall: +; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: + +; NOTE VS2005 is currently the only version supported anywhere in the packaging system, so we can do this here +[Files] +Source: %%PACKAGEFILES%%\imprudence.exe; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\skins\*; DestDir: {app}\skins; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\llplugin\*; DestDir: {app}\llplugin; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\doc\*; DestDir: {app}\doc; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\alut.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\dbghelp.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libapr-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libapriconv-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libaprutil-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\llcommon.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libhunspell.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\featuretable.txt; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\gpu_table.txt; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\imprudence.url; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\llkdu.dll.2.config; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\openal32.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\OpenJPEG.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\README.txt; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\SLPlugin.exe; DestDir: {app}; Flags: ignoreversion + +; Gstreamer-specific files below +Source: %%PACKAGEFILES%%\lib\*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs createallsubdirs +Source: %%PACKAGEFILES%%\avcodec-gpl-52.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\avdevice-gpl-52.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\avfilter-gpl-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\avformat-gpl-52.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\avutil-gpl-50.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\iconv.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\liba52-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libbz2.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libcelt-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libdca-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libexpat-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libfaad-2.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libFLAC-8.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgcrypt-11.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgio-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgnutls-26.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgobject-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgpg-error-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstapp-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstaudio-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstbase-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstcontroller-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstdataprotocol-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstfft-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstinterfaces-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstnet-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstnetbuffer-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstpbutils-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstphotography-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstreamer-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstriff-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstrtp-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstrtsp-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstsdp-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstsignalprocessor-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgsttag-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgstvideo-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libgthread-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libmms-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libmpeg2-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libneon-27.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libogg-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\liboil-0.3-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libsoup-2.4-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libtasn1-3.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libtheora-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libtheoradec-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libvorbisenc-2.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libvorbisfile-3.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libwavpack-1.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libx264-67.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\libxml2.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\SDL.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\xvidcore.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\z.dll; DestDir: {app}; Flags: ignoreversion + +; Voice files +Source: %%PACKAGEFILES%%\ortp.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\SLVoice.exe; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion +Source: %%PACKAGEFILES%%\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion + +; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist +Source: ..\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe +;Source: ..\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe +Source: ..\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe + +; Old files we don't use anymore: +; Source: %%PACKAGEFILES%%\dronesettings.xml; DestDir: {app}; Flags: ignoreversion +; Source: %%PACKAGEFILES%%\volume_settings.xml; DestDir: {app}; Flags: ignoreversion +; Source: %%PACKAGEFILES%%\srtp.dll; DestDir: {app}; Flags: ignoreversion +; Source: %%PACKAGEFILES%%\ssleay32.dll; DestDir: {app}; Flags: ignoreversion +; Source: %%PACKAGEFILES%%\tntk.dll; DestDir: {app}; Flags: ignoreversion +; Source: %%PACKAGEFILES%%\libeay32.dll; DestDir: {app}; Flags: ignoreversion +; Source: %%PACKAGEFILES%%\lsl_guide.html; DestDir: {app}; Flags: ignoreversion + +; NOTE: Don't use "Flags: ignoreversion" on any shared system files +;Source: %%PACKAGEFILES%%\msvcr71.dll; DestDir: {app}; Flags: ignoreversion; MinVersion: 0,6.01; Tasks: ; Languages: + +[Registry] +Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life +Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol +Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\imprudence.exe +Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\imprudence.exe --settings settings_imprudence.xml -url ""%1"""; Languages: +; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib +; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app} + +[Icons] +Name: {group}\{cm:UninstallProgram,Imprudence}; Filename: {uninstallexe} +Name: {commondesktop}\Imprudence; Filename: {app}\imprudence.exe; Tasks: desktopicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app}; IconIndex: 0 +Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Imprudence; Filename: {app}\imprudence.exe; Tasks: quicklaunchicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app} +Name: {group}\Imprudence; Filename: {app}\imprudence.exe; WorkingDir: {app}; Comment: imprudence; IconIndex: 0; Parameters: --settings settings_imprudence.xml + +[Run] +Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall +Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different + +; Install redistributables. +; +; !!!!BEWARE!!!! +; +; Command line parameters and filenames WILL change with each version. Blame Microsoft. + +; Always use /q for VS2005 rather than something quieter such as Parameters: "/q:a c:""msiexec /i vcredist.msi /qn"" ". The redist will fail sometimes if you do otherwise. +Filename: {app}\redist\vcredist_x86_VS2005_SP1_MFC_SEC.exe; Parameters: "/q"; Check: Needs2005Redist; Flags: runhidden +;Filename: {app}\redist\vcredist_x86_VS2008_SP1_ATL_SEC.exe; Parameters: "/q"; Check: Needs2008Redist; Flags: runhidden +Filename: {app}\redist\vcredist_x86_VS2010_SP1.exe; Parameters: "/q /norestart"; Check: Needs2010Redist; Flags: runhidden + +[UninstallDelete] +Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: +Name: {userappdata}\Imprudence\user_settings\settings.xml; Type: files; Languages: +Name: {userappdata}\Imprudence\user_settings\settings_imprudence.xml; Type: files; Languages: +; 1.2 and lower cache location: +Name: {userappdata}\Imprudence\cache; Type: filesandordirs +; 1.3 and higher cache location: +Name: {localappdata}\Imprudence\cache; Type: filesandordirs +Name: {userappdata}\Imprudence\logs; Type: filesandordirs +Name: {userappdata}\Imprudence\browser_profile; Type: filesandordirs +Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs +Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs + +[InstallDelete] +; Name: {app}\*.dll; Type: files; Tasks: ; Languages: +Name: {app}\licenses.txt; Type: files; Tasks: ; Languages: +; ALWAYS delete the plugins! Beware if you don't +Name: {app}\lib\gstreamer-plugins\*; Type: filesandordirs; Tasks: ; Languages: +; Name: {app}\skins\default\xui\*; Type: filesandordirs; Tasks: ; Languages: +; Old xui skin files can cause bugs, always kill them +Name: {app}\skins\silver\xui\en-us\*; Type: filesandordirs; Tasks: ; Languages: +Name: {app}\app_settings\mozilla; Type: filesandordirs; Tasks: ; Languages: +Name: {app}\app_settings\mozilla_debug; Type: filesandordirs; Tasks: ; Languages: +Name: {app}\app_settings\viewerversion.xml; Type: filesandordirs; Tasks: ; Languages: +Name: C:\Documents and Settings\{username}\.gstreamer-0.10\*; Type: filesandordirs +Name: C:\Users\{username}\.gstreamer-0.10\*; Type: filesandordirs +; Breaks the browser if installing on top of 1.1: +Name: {app}\gksvggdiplus.dll; Type: files; Tasks: ; Languages: +; Breaks inworld audio if it's from an old version with a different GUID +Name: {app}\alut.dll; Type: files; Tasks: ; Languages: + +; Old plugin files we want to kill: +Name: {app}\charset.dll; Type: files; Tasks: ; Languages: +Name: {app}\freebl3.dll; Type: files; Tasks: ; Languages: +Name: {app}\glew32.dll; Type: files; Tasks: ; Languages: +Name: {app}\iconv.dll; Type: files; Tasks: ; Languages: +Name: {app}\intl.dll; Type: files; Tasks: ; Languages: +Name: {app}\js3250.dll; Type: files; Tasks: ; Languages: +Name: {app}\libcairo-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libfaad-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgcrypt-11.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgio-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libglib-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgmodule-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgnutls-26.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgobject-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgpg-error-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstapp.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstaudio.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstaudio-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstbase-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstcdda.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstcontroller-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstdataprotocol-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstdshow.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstfft.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstinterfaces.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstnet-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstnetbuffer.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstpbutils.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstreamer-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstriff.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstrtp.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstrtsp.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstsdp.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgsttag.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstvideo.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgthread-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libjpeg.dll; Type: files; Tasks: ; Languages: +Name: {app}\libmp3lame-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libneon-27.dll; Type: files; Tasks: ; Languages: +Name: {app}\libogg-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\liboil-0.3-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libopenjpeg-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libpng12-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libschroedinger-1.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libspeex-1.dll; Type: files; Tasks: ; Languages: +Name: {app}\libtheora-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libvorbis-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libvorbisenc-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libxml2-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libxml2.dll; Type: files; Tasks: ; Languages: +Name: {app}\nspr4.dll; Type: files; Tasks: ; Languages: +Name: {app}\nss3.dll; Type: files; Tasks: ; Languages: +Name: {app}\nssckbi.dll; Type: files; Tasks: ; Languages: +Name: {app}\plc4.dll; Type: files; Tasks: ; Languages: +Name: {app}\plds4.dll; Type: files; Tasks: ; Languages: +Name: {app}\RELEASE_NOTES.txt; Type: files; Tasks: ; Languages: +Name: {app}\smime3.dll; Type: files; Tasks: ; Languages: +Name: {app}\softokn3.dll; Type: files; Tasks: ; Languages: +Name: {app}\ssl3.dll; Type: files; Tasks: ; Languages: +Name: {app}\xpcom.dll; Type: files; Tasks: ; Languages: +Name: {app}\xul.dll; Type: files; Tasks: ; Languages: +Name: {app}\xvidcore.dll; Type: files; Tasks: ; Languages: +Name: {app}\zlib1.dll; Type: files; Tasks: ; Languages: + +; We don't distribute the CRT like this anymore; murder death kill +Name: {app}\SLPlugin.exe.config; Type: files; Tasks: ; Languages: +Name: {app}\Microsoft.VC80.CRT.manifest; Type: files; Tasks: ; Languages: +Name: {app}\msvcp80.dll; Type: files; Tasks: ; Languages: +Name: {app}\msvcr80.dll; Type: files; Tasks: ; Languages: +Name: {app}\msvcr71.dll; Type: files; Tasks: ; Languages: +Name: {app}\imprudence.exe.config; Type: files; Tasks: ; Languages: + + +[Code] +// [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86] +// Installed = 1 (REG_DWORD) +function IsVS2010RedistInstalled(): Boolean; +var + V: Cardinal; + Success: Boolean; +begin + if IsWin64 then begin + Success := RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); + end else begin + Success := RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); + end + + if Success = TRUE then begin + if V = 1 then begin + Result := TRUE; + end else begin + Result := FALSE; + end + end else begin + Result := FALSE; + end +end; + +function Needs2010Redist(): Boolean; +begin + Result := (IsVS2010RedistInstalled = FALSE); + if (Result = TRUE) then begin + Log('User system needs VS 2010 SP1 x86 Redistributable, installing.'); + end else begin + Log('User already has VS 2010 SP1 x86 Redistributable installed, skipping.'); + end +end; + +// VS2008 and 2005 x86 redists. Always look for the latest version we know about. I wish there were a better way to check for these +const + VS2005_X86 = '{A49F249F-0C91-497F-86DF-B2585E8E76B7}'; // http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE + VS2005_SP1_X86 = '{7299052B-02A4-4627-81F2-1818DA5D550D}'; // 8.0.50727.762: http://www.microsoft.com/downloads/details.aspx?FamilyID=200B2FD9-AE1A-4A14-984D-389C36F85647 + VS2005_SP1_X86_ATL_SEC = '{837B34E3-7C30-493C-8F6A-2B0F04E2912C}'; // 8.0.50727.4053: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=14431 + VS2005_SP1_X86_MFC_SEC = '{710f4c1c-cc18-4c49-8cbf-51240c89a1a2}'; // 8.0.50727.6195: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=26347 + + VS2008_X86 = '{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}'; // http://www.microsoft.com/downloads/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf + VS2008_SP1_X86 = '{9A25302D-30C0-39D9-BD6F-21E6EC160475}'; // 9.0.30729.17: http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2 + VS2008_SP1_X86_ATL_SEC = '{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}'; // 9.0.30729.4148: http://www.microsoft.com/downloads/details.aspx?familyid=2051A0C1-C9B5-4B0A-A8F5-770A549FD78C + // These updates currently don't have redist links: + // 9.0.30729.5026: + // 9.0.30729.5570: + // 9.0.30729.6161: http://support.microsoft.com/kb/2538243 + + INSTALLSTATE_INVALIDARG = -2; // An invalid parameter was passed to the function + INSTALLSTATE_UNKNOWN = -1; // The product is not advertised or installed + INSTALLSTATE_ADVERTISED = 1; // The product is advertised but not installed + INSTALLSTATE_ABSENT = 2; // The product is installed for a different user + INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user + +function MsiQueryProductState(ProductCode: String): Integer; + external 'MsiQueryProductStateA@msi.dll stdcall'; + +function IsProductCodeInstalled(ProductUUID: String): Boolean; +begin + Result := (MsiQueryProductState(ProductUUID) = INSTALLSTATE_DEFAULT); +end; + +function Needs2005Redist(): Boolean; +begin + Result:= (IsProductCodeInstalled(VS2005_SP1_X86_MFC_SEC) = FALSE); + if (Result = TRUE) then begin + Log('User system needs VS 2005 SP1 x86 Redistributable, installing.'); + end else begin + Log('User already has VS 2005 SP1 x86 Redistributable installed, skipping.'); + end +end; + +function Needs2008Redist(): Boolean; +begin + Result := (IsProductCodeInstalled(VS2008_SP1_X86_ATL_SEC) = FALSE); + if (Result = TRUE) then begin + Log('User system needs VS 2008 SP1 x86 Redistributable, installing.'); + end else begin + Log('User already has VS 2008 SP1 x86 Redistributable installed, skipping.'); + end +end; diff --git a/linden/indra/newview/installers/windows/inworldz_installer_template.iss b/linden/indra/newview/installers/windows/inworldz_installer_template.iss deleted file mode 100644 index 655ebc5..0000000 --- a/linden/indra/newview/installers/windows/inworldz_installer_template.iss +++ /dev/null @@ -1,367 +0,0 @@ -; InWorldz inno setup installer template by McCabe Maxsted - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) - -; These will change -AppId={{DC6CCE02-BC61-43B1-B4CA-292C6BCCCB34} -AppName=%%APPNAME%% -AppVerName=%%APPVERNAME%% -DefaultDirName={pf}\InWorldz -DefaultGroupName=InWorldz -VersionInfoProductName=%%APPNAME%% -OutputBaseFilename=%%INSTALLERFILENAME%% -VersionInfoVersion=%%VERSION%% -VersionInfoTextVersion=%%VERSION%% -VersionInfoProductVersion=%%VERSION%% -AppVersion=%%VERSION%% -VersionInfoCopyright=2011 - -; These won't change -VersionInfoCompany=InWorldz, LLC -AppPublisher=InWorldz, LLC -AppPublisherURL=http://inworldz.com -AppSupportURL=http://inworldz.com -AllowNoIcons=true -InfoAfterFile=..\..\..\..\..\..\README.txt -OutputDir=. -SetupIconFile=..\..\..\..\newview\installers\windows\install_icon.ico -Compression=lzma2/ultra64 -InternalCompressLevel=ultra64 -SolidCompression=true -PrivilegesRequired=poweruser -AllowRootDirectory=true -WizardImageFile=..\..\..\..\newview\installers\windows\installer_icon_left.bmp -WizardSmallImageFile=..\..\..\..\newview\installers\windows\installer_icon_right.bmp -SetupLogging=true -RestartIfNeededByRun=false -AlwaysRestart=false - -[Languages] -Name: english; MessagesFile: compiler:Default.isl - -[Tasks] -Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce -Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce -; TODO: use scripting for something like this on uninstall: -; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: - -; NOTE VS2005 is currently the only version supported anywhere in the packaging system, so we can do this here -[Files] -Source: %%PACKAGEFILES%%\inworldz.exe; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs -Source: %%PACKAGEFILES%%\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs -Source: %%PACKAGEFILES%%\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs -Source: %%PACKAGEFILES%%\skins\*; DestDir: {app}\skins; Flags: ignoreversion recursesubdirs createallsubdirs -Source: %%PACKAGEFILES%%\llplugin\*; DestDir: {app}\llplugin; Flags: ignoreversion recursesubdirs createallsubdirs -Source: %%PACKAGEFILES%%\doc\*; DestDir: {app}\doc; Flags: ignoreversion recursesubdirs createallsubdirs -Source: %%PACKAGEFILES%%\alut.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\dbghelp.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libapr-1.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libapriconv-1.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libaprutil-1.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\llcommon.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\featuretable.txt; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\gpu_table.txt; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\kdu_v64R.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\kdu_v64R.dll.config; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\openal32.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\OpenJPEG.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\README.txt; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\SLPlugin.exe; DestDir: {app}; Flags: ignoreversion - -; Gstreamer-specific files below -Source: %%PACKAGEFILES%%\lib\*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs createallsubdirs -Source: %%PACKAGEFILES%%\avcodec-gpl-52.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\avdevice-gpl-52.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\avfilter-gpl-1.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\avformat-gpl-52.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\avutil-gpl-50.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\iconv.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\liba52-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libbz2.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libcelt-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libdca-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libexpat-1.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libfaad-2.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libFLAC-8.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgcrypt-11.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgio-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgnutls-26.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgobject-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgpg-error-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstapp-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstaudio-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstbase-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstcontroller-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstdataprotocol-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstfft-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstinterfaces-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstnet-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstnetbuffer-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstpbutils-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstphotography-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstreamer-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstriff-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstrtp-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstrtsp-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstsdp-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstsignalprocessor-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgsttag-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgstvideo-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libgthread-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libmms-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libmpeg2-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libneon-27.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libogg-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\liboil-0.3-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libsoup-2.4-1.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libtasn1-3.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libtheora-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libtheoradec-1.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libvorbisenc-2.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libvorbisfile-3.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libwavpack-1.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libx264-67.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\libxml2.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\SDL.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\xvidcore.dll; DestDir: {app}; Flags: ignoreversion -Source: %%PACKAGEFILES%%\z.dll; DestDir: {app}; Flags: ignoreversion - -; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist -Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe -Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe -Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe - -; Old files we don't use anymore: -; Source: %%PACKAGEFILES%%\dronesettings.xml; DestDir: {app}; Flags: ignoreversion -; Source: %%PACKAGEFILES%%\volume_settings.xml; DestDir: {app}; Flags: ignoreversion -; Source: %%PACKAGEFILES%%\srtp.dll; DestDir: {app}; Flags: ignoreversion -; Source: %%PACKAGEFILES%%\ssleay32.dll; DestDir: {app}; Flags: ignoreversion -; Source: %%PACKAGEFILES%%\tntk.dll; DestDir: {app}; Flags: ignoreversion -; Source: %%PACKAGEFILES%%\libeay32.dll; DestDir: {app}; Flags: ignoreversion -; Source: %%PACKAGEFILES%%\lsl_guide.html; DestDir: {app}; Flags: ignoreversion - -; NOTE: Don't use "Flags: ignoreversion" on any shared system files -;Source: %%PACKAGEFILES%%\msvcr71.dll; DestDir: {app}; Flags: ignoreversion; MinVersion: 0,6.01; Tasks: ; Languages: - -[Registry] -Root: HKCR; Subkey: inworldz; ValueType: string; Flags: uninsdeletekey deletekey; ValueName: (default); ValueData: URL:InWorldz -Root: HKCR; Subkey: inworldz; ValueType: string; Flags: uninsdeletekey deletekey; ValueName: URL Protocol -Root: HKCR; Subkey: inworldz\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; ValueData: {app}\inworldz.exe -Root: HKCR; Subkey: inworldz\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; ValueData: "{app}\inworldz.exe -url ""%1"""; Languages: -; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib -; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app} - -[Icons] -Name: {group}\{cm:UninstallProgram,InWorldz}; Filename: {uninstallexe} -Name: {commondesktop}\InWorldz; Filename: {app}\inworldz.exe; Tasks: desktopicon; WorkingDir: {app}; IconIndex: 0 -Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\InWorldz; Filename: {app}\inworldz.exe; Tasks: quicklaunchicon; WorkingDir: {app} -Name: {group}\InWorldz; Filename: {app}\inworldz.exe; WorkingDir: {app}; Comment: inworldz; IconIndex: 0; - -[Run] -; Install redistributables. -; -; !!!!BEWARE!!!! -; -; Command line parameters and filenames WILL change with each version. Blame Microsoft. - -; Always use /q for VS2005 rather than something quieter such as Parameters: "/q:a c:""msiexec /i vcredist.msi /qn"" ". The redist will fail sometimes if you do otherwise. -Filename: {app}\redist\vcredist_x86_VS2005_SP1_MFC_SEC.exe; Parameters: "/q"; Check: Needs2005Redist; Flags: runhidden -Filename: {app}\redist\vcredist_x86_VS2008_SP1_ATL_SEC.exe; Parameters: "/q"; Check: Needs2008Redist; Flags: runhidden -Filename: {app}\redist\vcredist_x86_VS2010_SP1.exe; Parameters: "/q /norestart"; Check: Needs2010Redist; Flags: runhidden -Filename: {app}\inworldz.exe; WorkingDir: {app}; Flags: nowait postinstall - -[UninstallDelete] -Name: {userappdata}\InWorldz\user_settings\password.dat; Type: files; Languages: -Name: {userappdata}\InWorldz\user_settings\settings.xml; Type: files; Languages: -; 1.1 and lower cache location: -Name: {userappdata}\InWorldz\cache; Type: filesandordirs -; 1.2 and higher cache location: -Name: {localappdata}\InWorldz\cache; Type: filesandordirs -Name: {userappdata}\InWorldz\logs; Type: filesandordirs -Name: {userappdata}\InWorldz\browser_profile; Type: filesandordirs -Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs -Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs - -[InstallDelete] -; Name: {app}\*.dll; Type: files; Tasks: ; Languages: -Name: {app}\licenses.txt; Type: files; Tasks: ; Languages: -; ALWAYS delete the plugins! Beware if you don't -Name: {app}\lib\gstreamer-plugins\*; Type: filesandordirs; Tasks: ; Languages: -; Name: {app}\skins\default\xui\*; Type: filesandordirs; Tasks: ; Languages: -; Old xui skin files can cause bugs, always kill them -Name: {app}\skins\silver\xui\en-us\*; Type: filesandordirs; Tasks: ; Languages: -Name: {app}\app_settings\mozilla; Type: filesandordirs; Tasks: ; Languages: -Name: {app}\app_settings\mozilla_debug; Type: filesandordirs; Tasks: ; Languages: -Name: {app}\app_settings\viewerversion.xml; Type: filesandordirs; Tasks: ; Languages: -Name: C:\Documents and Settings\{username}\.gstreamer-0.10\*; Type: filesandordirs -Name: C:\Users\{username}\.gstreamer-0.10\*; Type: filesandordirs -; Breaks the browser if installing on top of 1.1: -Name: {app}\gksvggdiplus.dll; Type: files; Tasks: ; Languages: -; Breaks inworld audio if it's from an old version with a different GUID -Name: {app}\alut.dll; Type: files; Tasks: ; Languages: - -; Old plugin files we want to kill: -Name: {app}\charset.dll; Type: files; Tasks: ; Languages: -Name: {app}\freebl3.dll; Type: files; Tasks: ; Languages: -Name: {app}\glew32.dll; Type: files; Tasks: ; Languages: -Name: {app}\iconv.dll; Type: files; Tasks: ; Languages: -Name: {app}\intl.dll; Type: files; Tasks: ; Languages: -Name: {app}\InWorldzViewer.exe; Type: files; Tasks: ; Languages: -Name: {app}\js3250.dll; Type: files; Tasks: ; Languages: -Name: {app}\libcairo-2.dll; Type: files; Tasks: ; Languages: -Name: {app}\libfaad-2.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgcrypt-11.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgio-2.0-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libglib-2.0-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgmodule-2.0-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgnutls-26.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgobject-2.0-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgpg-error-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstapp.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstaudio.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstaudio-0.10.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstbase-0.10.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstcdda.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstcontroller-0.10.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstdataprotocol-0.10.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstdshow.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstfft.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstinterfaces.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstnet-0.10.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstnetbuffer.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstpbutils.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstreamer-0.10.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstriff.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstrtp.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstrtsp.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstsdp.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgsttag.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstvideo.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgthread-2.0-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libjpeg.dll; Type: files; Tasks: ; Languages: -Name: {app}\libmp3lame-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libneon-27.dll; Type: files; Tasks: ; Languages: -Name: {app}\libogg-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\liboil-0.3-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libopenjpeg-2.dll; Type: files; Tasks: ; Languages: -Name: {app}\libpng12-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libschroedinger-1.0-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libspeex-1.dll; Type: files; Tasks: ; Languages: -Name: {app}\libtheora-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libvorbis-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libvorbisenc-2.dll; Type: files; Tasks: ; Languages: -Name: {app}\libxml2-2.dll; Type: files; Tasks: ; Languages: -Name: {app}\libxml2.dll; Type: files; Tasks: ; Languages: -Name: {app}\nspr4.dll; Type: files; Tasks: ; Languages: -Name: {app}\nss3.dll; Type: files; Tasks: ; Languages: -Name: {app}\nssckbi.dll; Type: files; Tasks: ; Languages: -Name: {app}\plc4.dll; Type: files; Tasks: ; Languages: -Name: {app}\plds4.dll; Type: files; Tasks: ; Languages: -Name: {app}\smime3.dll; Type: files; Tasks: ; Languages: -Name: {app}\softokn3.dll; Type: files; Tasks: ; Languages: -Name: {app}\ssl3.dll; Type: files; Tasks: ; Languages: -Name: {app}\xpcom.dll; Type: files; Tasks: ; Languages: -Name: {app}\xul.dll; Type: files; Tasks: ; Languages: -Name: {app}\xvidcore.dll; Type: files; Tasks: ; Languages: -Name: {app}\zlib1.dll; Type: files; Tasks: ; Languages: - -; We don't distribute the CRT like this anymore; murder death kill -Name: {app}\SLPlugin.exe.config; Type: files; Tasks: ; Languages: -Name: {app}\Microsoft.VC80.CRT.manifest; Type: files; Tasks: ; Languages: -Name: {app}\msvcp80.dll; Type: files; Tasks: ; Languages: -Name: {app}\msvcr80.dll; Type: files; Tasks: ; Languages: -Name: {app}\msvcr71.dll; Type: files; Tasks: ; Languages: -Name: {app}\inworldz.exe.config; Type: files; Tasks: ; Languages: - - -[Code] -// [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86] -// Installed = 1 (REG_DWORD) -function IsVS2010RedistInstalled(): Boolean; -var - V: Cardinal; - Success: Boolean; -begin - if IsWin64 then begin - Success := RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); - end else begin - Success := RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); - end - - if Success = TRUE then begin - if V = 1 then begin - Result := TRUE; - end else begin - Result := FALSE; - end - end else begin - Result := FALSE; - end -end; - -function Needs2010Redist(): Boolean; -begin - Result := (IsVS2010RedistInstalled = FALSE); - if (Result = TRUE) then begin - Log('User system needs VS 2010 SP1 x86 Redistributable, installing.'); - end else begin - Log('User already has VS 2010 SP1 x86 Redistributable installed, skipping.'); - end -end; - -// VS2008 and 2005 x86 redists. Always look for the latest version we know about. I wish there were a better way to check for these -const - VS2005_X86 = '{A49F249F-0C91-497F-86DF-B2585E8E76B7}'; // http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE - VS2005_SP1_X86 = '{7299052B-02A4-4627-81F2-1818DA5D550D}'; // 8.0.50727.762: http://www.microsoft.com/downloads/details.aspx?FamilyID=200B2FD9-AE1A-4A14-984D-389C36F85647 - VS2005_SP1_X86_ATL_SEC = '{837B34E3-7C30-493C-8F6A-2B0F04E2912C}'; // 8.0.50727.4053: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=14431 - VS2005_SP1_X86_MFC_SEC = '{710f4c1c-cc18-4c49-8cbf-51240c89a1a2}'; // 8.0.50727.6195: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=26347 - - VS2008_X86 = '{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}'; // http://www.microsoft.com/downloads/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf - VS2008_SP1_X86 = '{9A25302D-30C0-39D9-BD6F-21E6EC160475}'; // 9.0.30729.17: http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2 - VS2008_SP1_X86_ATL_SEC = '{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}'; // 9.0.30729.4148: http://www.microsoft.com/downloads/details.aspx?familyid=2051A0C1-C9B5-4B0A-A8F5-770A549FD78C - // These updates currently don't have redist links: - // 9.0.30729.5026: - // 9.0.30729.5570: - // 9.0.30729.6161: http://support.microsoft.com/kb/2538243 - - INSTALLSTATE_INVALIDARG = -2; // An invalid parameter was passed to the function - INSTALLSTATE_UNKNOWN = -1; // The product is not advertised or installed - INSTALLSTATE_ADVERTISED = 1; // The product is advertised but not installed - INSTALLSTATE_ABSENT = 2; // The product is installed for a different user - INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user - -function MsiQueryProductState(ProductCode: String): Integer; - external 'MsiQueryProductStateA@msi.dll stdcall'; - -function IsProductCodeInstalled(ProductUUID: String): Boolean; -begin - Result := (MsiQueryProductState(ProductUUID) = INSTALLSTATE_DEFAULT); -end; - -function Needs2005Redist(): Boolean; -begin - Result:= (IsProductCodeInstalled(VS2005_SP1_X86_MFC_SEC) = FALSE); - if (Result = TRUE) then begin - Log('User system needs VS 2005 SP1 x86 Redistributable, installing.'); - end else begin - Log('User already has VS 2005 SP1 x86 Redistributable installed, skipping.'); - end -end; - -function Needs2008Redist(): Boolean; -begin - Result := (IsProductCodeInstalled(VS2008_SP1_X86_ATL_SEC) = FALSE); - if (Result = TRUE) then begin - Log('User system needs VS 2008 SP1 x86 Redistributable, installing.'); - end else begin - Log('User already has VS 2008 SP1 x86 Redistributable installed, skipping.'); - end -end; diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 6bf9dc7..3221974 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -453,11 +453,11 @@ class WindowsManifest(ViewerManifest): def package_finish(self): - # InWorldz uses Inno Setup to compile its installers. This process creates a new installer from a template + # Imprudence uses Inno Setup to compile its installers. This process creates a new installer from a template # See http://www.jrsoftware.org/isinfo.php sse_string = '' if self.configuration().lower() == "releasesse2": - sse_string = ".SSE2" + sse_string = "-(SSE2-optimized)" version = '.'.join(self.args['version']) base_filename = self.installer_prefix() + version + sse_string @@ -465,7 +465,7 @@ class WindowsManifest(ViewerManifest): app_ver_name="%s %s" % (app_name, version) new_script = base_filename + ".iss" - self.replace_in("installers/windows/inworldz_installer_template.iss", new_script, { + self.replace_in("installers/windows/imprudence_installer_template.iss", new_script, { "%%VERSION%%":version, "%%INSTALLERFILENAME%%":base_filename, "%%PACKAGEFILES%%":self.args['dest'], -- cgit v1.1 From 31e430a85b62e92952400bfc2b092cd39cd8d663 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 17:49:52 -0700 Subject: Fixed windows packaging merge errors --- linden/indra/lib/python/indra/util/llmanifest.py | 2 +- linden/indra/newview/viewer_manifest.py | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'linden') diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py index 3cd8786..20875f9 100644 --- a/linden/indra/lib/python/indra/util/llmanifest.py +++ b/linden/indra/lib/python/indra/util/llmanifest.py @@ -126,7 +126,7 @@ ARGUMENTS=[ default="Release"), dict(name='branding_id', description="""Identifier for the branding set to use. Currently, 'imprudence')""", - default='inworldz'), + default='imprudence'), dict(name='configuration', description="""The build configuration used. On OSX this is Universal, etc. On Windows it's the *actual* buildtype for diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 3221974..4d672f0 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -35,7 +35,7 @@ # Instead, run develop.py with "configure -DPACKAGE:BOOL=ON" e.g.: # develop.py -G vc80 configure -DPACKAGE:BOOL=ON # to generate the "package" project in Visual Studio 2005 -# Note: as of Imprudence 1.3, this defaults to on for Windows +# Note: use the batch file on Windows in the indra directory import sys import os.path @@ -219,14 +219,15 @@ class ViewerManifest(LLManifest): class WindowsManifest(ViewerManifest): + # we always want these to be named imprudence.exe to avoid settings conflicts def final_exe(self): - if self.default_channel(): - if self.default_grid(): + #if self.default_channel(): + # if self.default_grid(): return "imprudence.exe" - else: - return "imprudencepreview.exe" - else: - return ''.join(self.channel().split()) + '.exe' + # else: + # return "imprudencepreview.exe" + #else: + # return ''.join(self.channel().split()) + '.exe' def construct(self): @@ -235,6 +236,8 @@ class WindowsManifest(ViewerManifest): # nor do we have a fixed name for the executable self.path(self.find_existing_file('debug/imprudence-bin.exe', 'release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe()) + # copy over the the pdb file for the regular or SSE2 versions if we don't already have one copied + symbol_ver = '.'.join(self.args['version']) symbol_file = 'imprudence-%s.%s.pdb' % (symbol_ver, self.args['configuration']) symbol_path = '../../../../../pdb_files/%s' % (symbol_file) if os.path.isfile(os.getcwd() + symbol_path): -- cgit v1.1 From 4fe672aeefeb04d43cafede0fa678db2e58a61f4 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 18:17:08 -0700 Subject: Get the default version from viewerinfo.cpp in the build system --- linden/indra/lib/python/indra/util/llmanifest.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'linden') diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py index 20875f9..fbd7fea 100644 --- a/linden/indra/lib/python/indra/util/llmanifest.py +++ b/linden/indra/lib/python/indra/util/llmanifest.py @@ -76,17 +76,15 @@ def get_default_platform(dummy): }[sys.platform] def get_default_version(srctree): - # look up llversion.h and parse out the version info - paths = [os.path.join(srctree, x, 'llversionviewer.h') for x in ['llcommon', '../llcommon', '../../indra/llcommon.h']] - for p in paths: - if os.path.exists(p): - contents = open(p, 'r').read() - major = re.search("IMP_VERSION_MAJOR\s=\s([0-9]+)", contents).group(1) - minor = re.search("IMP_VERSION_MINOR\s=\s([0-9]+)", contents).group(1) - patch = re.search("IMP_VERSION_PATCH\s=\s([0-9]+)", contents).group(1) - #build = re.search("LL_VERSION_BUILD\s=\s([0-9]+)", contents).group(1) - build = re.search('const char \* const IMP_VERSION_TEST = "(.*)";', contents).group(1) - return major, minor, patch, build + p = os.path.join(srctree, 'viewerinfo.cpp') + if os.path.exists(p): + contents = open(p, 'r').read() + major = re.search("MAJOR\s=\s([0-9]+)", contents).group(1) + minor = re.search("MINOR\s=\s([0-9]+)", contents).group(1) + patch = re.search("PATCH\s=\s([0-9]+)", contents).group(1) + rleas = re.search("RLEAS\s=\s([0-9]+)", contents).group(1) + extra = re.search('string\sEXTRA\s=\s"(.*)";', contents).group(1) + return major, minor, patch, rleas, extra def get_channel(srctree): # look up llversionserver.h and parse out the version info -- cgit v1.1 From cec4d290ebd30a1cffdb20d3f684dee84ae0fbf5 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 18:26:03 -0700 Subject: Fixed merge errors in the windows installer script template --- .../installers/windows/imprudence_installer_template.iss | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/installers/windows/imprudence_installer_template.iss b/linden/indra/newview/installers/windows/imprudence_installer_template.iss index 0605fba..7467609 100644 --- a/linden/indra/newview/installers/windows/imprudence_installer_template.iss +++ b/linden/indra/newview/installers/windows/imprudence_installer_template.iss @@ -4,8 +4,8 @@ ; NOTE: The value of AppId uniquely identifies this application. ; Do not use the same AppId value in installers for other applications. ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -; Imp Stable ID: D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8 -; Imp Experimental ID: 1B3E68BC-13EB-4277-9439-CB5FF9259460 +; Imp Stable ID: D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8 +; Imp Experimental ID: 1B3E68BC-13EB-4277-9439-CB5FF9259460 ; These will change AppId={{D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8} @@ -47,6 +47,7 @@ Name: english; MessagesFile: compiler:Default.isl [Tasks] Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce +Name: slurlassociate; Description: Associate Imprudence with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce ; TODO: use scripting for something like this on uninstall: ; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: @@ -144,9 +145,9 @@ Source: %%PACKAGEFILES%%\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion Source: %%PACKAGEFILES%%\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion ; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist -Source: ..\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe -;Source: ..\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe -Source: ..\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe +Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe +;Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe +Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe ; Old files we don't use anymore: ; Source: %%PACKAGEFILES%%\dronesettings.xml; DestDir: {app}; Flags: ignoreversion -- cgit v1.1 From 3e350fcdb6c960aa8508122e017d3cf24707c590 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 18:29:57 -0700 Subject: Fixed llkdu .config file not being copied during packaging --- linden/indra/newview/viewer_manifest.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'linden') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 4d672f0..11f9098 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -279,6 +279,9 @@ class WindowsManifest(ViewerManifest): self.path("libhunspell.dll") self.end_prefix() + # Copy the llkdu DSO .config + self.path("llkdu.dll.2.config") + # Get llcommon and deps. if self.prefix(src=self.args['configuration'], dst=""): self.path('libapr-1.dll') -- cgit v1.1 From 5648c1c1d66a2d68835c62e539bf539e9af86812 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 18:54:51 -0700 Subject: Removed old unused stable installer script. Still need to figure out a good way of determining if a build's experimental --- .../windows/imprudence_installer_script.iss | 374 --------------------- 1 file changed, 374 deletions(-) delete mode 100644 linden/indra/newview/installers/windows/imprudence_installer_script.iss (limited to 'linden') diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script.iss b/linden/indra/newview/installers/windows/imprudence_installer_script.iss deleted file mode 100644 index e463640..0000000 --- a/linden/indra/newview/installers/windows/imprudence_installer_script.iss +++ /dev/null @@ -1,374 +0,0 @@ -; Imprudence inno setup installer script by McCabe Maxsted -; This script only works with VS2005, currently - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) - -; These will change -AppId={{D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8} -AppName=Imprudence -AppVerName=Imprudence Viewer 1.4.0 beta 1 (SSE2 optimized) -DefaultDirName={pf}\Imprudence -DefaultGroupName=Imprudence Viewer -VersionInfoProductName=Imprudence Viewer -OutputBaseFilename=Imprudence-1.4.0-beta1-(SSE2-optimized) -VersionInfoVersion=1.4.0 -VersionInfoTextVersion=1.4.0 -VersionInfoProductVersion=1.4.0 -AppVersion=1.4.0 -VersionInfoCopyright=2011 - -; These won't change -VersionInfoCompany=Imprudence -AppPublisher=The Imprudence Project -AppPublisherURL=http://kokuaviewer.org -AppSupportURL=http://kokuaviewer.org -AllowNoIcons=true -InfoAfterFile=..\..\..\..\..\README.txt -OutputDir=C:\imprudence_installers -SetupIconFile=..\windows\imp_icon.ico -Compression=lzma2/ultra64 -InternalCompressLevel=ultra64 -SolidCompression=true -PrivilegesRequired=poweruser -AllowRootDirectory=true -WizardImageFile=..\windows\imprudence_installer_icon_left.bmp -WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp -SetupLogging=true -RestartIfNeededByRun=false -AlwaysRestart=false - -[Languages] -Name: english; MessagesFile: compiler:Default.isl - -[Tasks] -Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce -Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce -Name: slurlassociate; Description: Associate Imprudence with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce -; TODO: use scripting for something like this on uninstall: -; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: - -[Files] -Source: ..\..\..\build-vc80\newview\release\package\imprudence.exe; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ..\..\..\build-vc80\newview\release\package\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ..\..\..\build-vc80\newview\release\package\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ..\..\..\build-vc80\newview\release\package\skins\*; DestDir: {app}\skins; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ..\..\..\build-vc80\newview\release\package\doc\*; DestDir: {app}\doc; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ..\..\..\build-vc80\newview\release\package\llplugin\*; DestDir: {app}\llplugin; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ..\..\..\build-vc80\newview\release\package\alut.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\ChangeLog.txt; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\dbghelp.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\featuretable.txt; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\gpu_table.txt; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\imprudence.url; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libapr-1.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libapriconv-1.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libaprutil-1.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libhunspell.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\llcommon.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\llkdu.dll.2.config; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\openal32.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\OpenJPEG.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\SLPlugin.exe; DestDir: {app}; Flags: ignoreversion - -; Gstreamer-specific files below -Source: ..\..\..\build-vc80\newview\release\package\lib\*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs createallsubdirs -Source: ..\..\..\build-vc80\newview\release\package\avcodec-gpl-52.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\avdevice-gpl-52.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\avfilter-gpl-1.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\avformat-gpl-52.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\avutil-gpl-50.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\iconv.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\liba52-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libbz2.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libcelt-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libdca-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libexpat-1.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libfaad-2.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libFLAC-8.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgcrypt-11.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgio-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgnutls-26.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgobject-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgpg-error-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstapp-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstaudio-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstbase-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstcontroller-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstdataprotocol-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstfft-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstinterfaces-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstnet-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstnetbuffer-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstpbutils-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstphotography-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstreamer-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstriff-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstrtp-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstrtsp-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstsdp-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstsignalprocessor-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgsttag-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgstvideo-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libgthread-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libmms-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libmpeg2-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libneon-27.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libogg-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\liboil-0.3-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libsoup-2.4-1.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libtasn1-3.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libtheora-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libtheoradec-1.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libvorbisenc-2.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libvorbisfile-3.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libwavpack-1.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libx264-67.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\libxml2.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\SDL.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\xvidcore.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\z.dll; DestDir: {app}; Flags: ignoreversion - -; Voice files -Source: ..\..\..\build-vc80\newview\release\package\ortp.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\SLVoice.exe; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion -Source: ..\..\..\build-vc80\newview\release\package\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion - -; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist -Source: ..\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe -;Source: ..\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe -Source: ..\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe - -; Old files we don't use anymore: -; Source: ..\..\..\build-vc80\newview\release\package\dronesettings.xml; DestDir: {app}; Flags: ignoreversion -; Source: ..\..\..\build-vc80\newview\release\package\volume_settings.xml; DestDir: {app}; Flags: ignoreversion -; Source: ..\..\..\build-vc80\newview\release\package\srtp.dll; DestDir: {app}; Flags: ignoreversion -; Source: ..\..\..\build-vc80\newview\release\package\ssleay32.dll; DestDir: {app}; Flags: ignoreversion -; Source: ..\..\..\build-vc80\newview\release\package\tntk.dll; DestDir: {app}; Flags: ignoreversion -; Source: ..\..\..\build-vc80\newview\release\package\libeay32.dll; DestDir: {app}; Flags: ignoreversion -; Source: ..\..\..\build-vc80\newview\release\package\lsl_guide.html; DestDir: {app}; Flags: ignoreversion - -; NOTE: Don't use "Flags: ignoreversion" on any shared system files -;Source: ..\..\..\build-vc80\newview\release\package\msvcr71.dll; DestDir: {app}; Flags: ignoreversion; MinVersion: 0,6.01; Tasks: ; Languages: - -[Registry] -Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life -Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol -Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\imprudence.exe -Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\imprudence.exe --settings settings_imprudence.xml -url ""%1"""; Languages: -; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib -; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app} - -[Icons] -Name: {group}\{cm:UninstallProgram,Imprudence}; Filename: {uninstallexe} -Name: {commondesktop}\Imprudence; Filename: {app}\imprudence.exe; Tasks: desktopicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app}; IconIndex: 0 -Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Imprudence; Filename: {app}\imprudence.exe; Tasks: quicklaunchicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app} -Name: {group}\Imprudence; Filename: {app}\imprudence.exe; WorkingDir: {app}; Comment: imprudence; IconIndex: 0; Parameters: --settings settings_imprudence.xml - -[Run] -Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall -Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different - -; Install redistributables. -; -; !!!!BEWARE!!!! -; -; Command line parameters and filenames WILL change with each version. Blame Microsoft. - -; Always use /q for VS2005 rather than something quieter such as Parameters: "/q:a c:""msiexec /i vcredist.msi /qn"" ". The redist will fail sometimes if you do otherwise. -Filename: {app}\redist\vcredist_x86_VS2005_SP1_MFC_SEC.exe; Parameters: "/q"; Check: Needs2005Redist; Flags: runhidden -;Filename: {app}\redist\vcredist_x86_VS2008_SP1_ATL_SEC.exe; Parameters: "/q"; Check: Needs2008Redist; Flags: runhidden -Filename: {app}\redist\vcredist_x86_VS2010_SP1.exe; Parameters: "/q /norestart"; Check: Needs2010Redist; Flags: runhidden - -[UninstallDelete] -Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: -Name: {userappdata}\Imprudence\user_settings\settings.xml; Type: files; Languages: -Name: {userappdata}\Imprudence\user_settings\settings_imprudence.xml; Type: files; Languages: -; 1.2 and lower cache location: -Name: {userappdata}\Imprudence\cache; Type: filesandordirs -; 1.3 and higher cache location: -Name: {localappdata}\Imprudence\cache; Type: filesandordirs -Name: {userappdata}\Imprudence\logs; Type: filesandordirs -Name: {userappdata}\Imprudence\browser_profile; Type: filesandordirs -Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs -Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs - -[InstallDelete] -; Name: {app}\*.dll; Type: files; Tasks: ; Languages: -Name: {app}\lib\gstreamer-plugins\*; Type: filesandordirs; Tasks: ; Languages: -; Name: {app}\skins\default\xui\*; Type: filesandordirs; Tasks: ; Languages: -; Old xui skin files can cause bugs, always kill them -Name: {app}\skins\silver\xui\en-us\*; Type: filesandordirs; Tasks: ; Languages: -Name: {app}\app_settings\mozilla; Type: filesandordirs; Tasks: ; Languages: -Name: {app}\app_settings\mozilla_debug; Type: filesandordirs; Tasks: ; Languages: -Name: {app}\app_settings\viewerversion.xml; Type: filesandordirs; Tasks: ; Languages: -Name: C:\Documents and Settings\{username}\.gstreamer-0.10\*; Type: filesandordirs -Name: C:\Users\{username}\.gstreamer-0.10\*; Type: filesandordirs -; Breaks the browser if installing on top of 1.1: -Name: {app}\gksvggdiplus.dll; Type: files; Tasks: ; Languages: - -; Pre-plugin files: -Name: {app}\charset.dll; Type: files; Tasks: ; Languages: -Name: {app}\freebl3.dll; Type: files; Tasks: ; Languages: -Name: {app}\glew32.dll; Type: files; Tasks: ; Languages: -Name: {app}\iconv.dll; Type: files; Tasks: ; Languages: -Name: {app}\intl.dll; Type: files; Tasks: ; Languages: -Name: {app}\js3250.dll; Type: files; Tasks: ; Languages: -Name: {app}\libcairo-2.dll; Type: files; Tasks: ; Languages: -Name: {app}\libfaad-2.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgcrypt-11.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgio-2.0-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libglib-2.0-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgmodule-2.0-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgnutls-26.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgobject-2.0-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgpg-error-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstapp.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstaudio.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstaudio-0.10.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstbase-0.10.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstcdda.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstcontroller-0.10.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstdataprotocol-0.10.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstdshow.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstfft.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstinterfaces.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstnet-0.10.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstnetbuffer.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstpbutils.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstreamer-0.10.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstriff.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstrtp.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstrtsp.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstsdp.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgsttag.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgstvideo.dll; Type: files; Tasks: ; Languages: -Name: {app}\libgthread-2.0-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libjpeg.dll; Type: files; Tasks: ; Languages: -Name: {app}\libmp3lame-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libneon-27.dll; Type: files; Tasks: ; Languages: -Name: {app}\libogg-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\liboil-0.3-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libopenjpeg-2.dll; Type: files; Tasks: ; Languages: -Name: {app}\libpng12-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libschroedinger-1.0-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libspeex-1.dll; Type: files; Tasks: ; Languages: -Name: {app}\libtheora-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libvorbis-0.dll; Type: files; Tasks: ; Languages: -Name: {app}\libvorbisenc-2.dll; Type: files; Tasks: ; Languages: -Name: {app}\libxml2-2.dll; Type: files; Tasks: ; Languages: -Name: {app}\libxml2.dll; Type: files; Tasks: ; Languages: -Name: {app}\nspr4.dll; Type: files; Tasks: ; Languages: -Name: {app}\nss3.dll; Type: files; Tasks: ; Languages: -Name: {app}\nssckbi.dll; Type: files; Tasks: ; Languages: -Name: {app}\plc4.dll; Type: files; Tasks: ; Languages: -Name: {app}\plds4.dll; Type: files; Tasks: ; Languages: -Name: {app}\RELEASE_NOTES.txt; Type: files; Tasks: ; Languages: -Name: {app}\smime3.dll; Type: files; Tasks: ; Languages: -Name: {app}\softokn3.dll; Type: files; Tasks: ; Languages: -Name: {app}\ssl3.dll; Type: files; Tasks: ; Languages: -Name: {app}\xpcom.dll; Type: files; Tasks: ; Languages: -Name: {app}\xul.dll; Type: files; Tasks: ; Languages: -Name: {app}\xvidcore.dll; Type: files; Tasks: ; Languages: -Name: {app}\zlib1.dll; Type: files; Tasks: ; Languages: - -; We don't distribute the CRT like this anymore; kill old files -Name: {app}\SLPlugin.exe.config; Type: files; Tasks: ; Languages: -Name: {app}\Microsoft.VC80.CRT.manifest; Type: files; Tasks: ; Languages: -Name: {app}\msvcp80.dll; Type: files; Tasks: ; Languages: -Name: {app}\msvcr80.dll; Type: files; Tasks: ; Languages: -Name: {app}\msvcr71.dll; Type: files; Tasks: ; Languages: -Name: {app}\imprudence.exe.config; Type: files; Tasks: ; Languages: - - -[Code] -// [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86] -// Installed = 1 (REG_DWORD) -function IsVS2010RedistInstalled(): Boolean; -var - V: Cardinal; - Success: Boolean; -begin - if IsWin64 then begin - Success := RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); - end else begin - Success := RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V); - end - - if Success = TRUE then begin - if V = 1 then begin - Result := TRUE; - end else begin - Result := FALSE; - end - end else begin - Result := FALSE; - end -end; - -function Needs2010Redist(): Boolean; -begin - Result := (IsVS2010RedistInstalled = FALSE); - if (Result = TRUE) then begin - Log('User system needs VS 2010 SP1 x86 Redistributable, installing.'); - end else begin - Log('User already has VS 2010 SP1 x86 Redistributable installed, skipping.'); - end -end; - -// VS2008 and 2005 x86 redists. Always look for the latest version we know about. I wish there were a better way to check for these -const - VS2005_X86 = '{A49F249F-0C91-497F-86DF-B2585E8E76B7}'; // http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE - VS2005_SP1_X86 = '{7299052B-02A4-4627-81F2-1818DA5D550D}'; // 8.0.50727.762: http://www.microsoft.com/downloads/details.aspx?FamilyID=200B2FD9-AE1A-4A14-984D-389C36F85647 - VS2005_SP1_X86_ATL_SEC = '{837B34E3-7C30-493C-8F6A-2B0F04E2912C}'; // 8.0.50727.4053: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=14431 - VS2005_SP1_X86_MFC_SEC = '{710f4c1c-cc18-4c49-8cbf-51240c89a1a2}'; // 8.0.50727.6195: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=26347 - - VS2008_X86 = '{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}'; // http://www.microsoft.com/downloads/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf - VS2008_SP1_X86 = '{9A25302D-30C0-39D9-BD6F-21E6EC160475}'; // 9.0.30729.17: http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2 - VS2008_SP1_X86_ATL_SEC = '{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}'; // 9.0.30729.4148: http://www.microsoft.com/downloads/details.aspx?familyid=2051A0C1-C9B5-4B0A-A8F5-770A549FD78C - // These updates currently don't have redist links: - // 9.0.30729.5026: - // 9.0.30729.5570: - // 9.0.30729.6161: http://support.microsoft.com/kb/2538243 - - INSTALLSTATE_INVALIDARG = -2; // An invalid parameter was passed to the function - INSTALLSTATE_UNKNOWN = -1; // The product is not advertised or installed - INSTALLSTATE_ADVERTISED = 1; // The product is advertised but not installed - INSTALLSTATE_ABSENT = 2; // The product is installed for a different user - INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user - -function MsiQueryProductState(ProductCode: String): Integer; - external 'MsiQueryProductStateA@msi.dll stdcall'; - -function IsProductCodeInstalled(ProductUUID: String): Boolean; -begin - Result := (MsiQueryProductState(ProductUUID) = INSTALLSTATE_DEFAULT); -end; - -function Needs2005Redist(): Boolean; -begin - Result:= (IsProductCodeInstalled(VS2005_SP1_X86_MFC_SEC) = FALSE); - if (Result = TRUE) then begin - Log('User system needs VS 2005 SP1 x86 Redistributable, installing.'); - end else begin - Log('User already has VS 2005 SP1 x86 Redistributable installed, skipping.'); - end -end; - -function Needs2008Redist(): Boolean; -begin - Result := (IsProductCodeInstalled(VS2008_SP1_X86_ATL_SEC) = FALSE); - if (Result = TRUE) then begin - Log('User system needs VS 2008 SP1 x86 Redistributable, installing.'); - end else begin - Log('User already has VS 2008 SP1 x86 Redistributable installed, skipping.'); - end -end; -- cgit v1.1 From 345a4f9016837ce6a687ccbda6397801784885a4 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 19:05:00 -0700 Subject: Updated develop.py to find VS2010 as well (patch by DJ Wind) --- linden/indra/develop.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linden') diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 69542da..6d2ce72 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py @@ -578,7 +578,7 @@ class WindowsSetup(PlatformSetup): def get_build_cmd(self): if self.incredibuild: config = self.build_type - if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]: + if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0', r'10.0', r'7.1' ]: config = '\"%s|Win32\"' % config return "buildconsole %s.sln /build %s" % (self.project_name, config) @@ -702,8 +702,8 @@ Options: -m32 | -m64 build architecture (32-bit or 64-bit) -N | --no-distcc disable use of distcc -G | --generator=NAME generator name - Windows: VC71 or VS2003 (default), VC80 (VS2005) or - VC90 (VS2008) + Windows: VC80 (VS2005--default), VC71 (VS2003), + VC90 (VS2008), or VC100 (VS2010) Mac OS X: Xcode (default), Unix Makefiles Linux: Unix Makefiles (default), KDevelop3 -p | --project=NAME set the root project name. (Doesn't effect makefiles) -- cgit v1.1 From 8fca0f8b0f56ae6ec54200e22f85d87c53d3ea79 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 19:19:37 -0700 Subject: Create readable version string for installers, based on jacek's viewer_info.py script --- linden/indra/lib/python/indra/util/llmanifest.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py index fbd7fea..e27bd8a 100644 --- a/linden/indra/lib/python/indra/util/llmanifest.py +++ b/linden/indra/lib/python/indra/util/llmanifest.py @@ -84,7 +84,14 @@ def get_default_version(srctree): patch = re.search("PATCH\s=\s([0-9]+)", contents).group(1) rleas = re.search("RLEAS\s=\s([0-9]+)", contents).group(1) extra = re.search('string\sEXTRA\s=\s"(.*)";', contents).group(1) - return major, minor, patch, rleas, extra + version = "%s.%s.%s.%s"%(major, minor, patch, rleas) + if len(extra) > 0: + # Replace spaces and some puncuation with '-' in extra + extra = re.sub('[- \t:;,!+/\\"\'`]+', '-', extra) + # Strip any leading or trailing "-"s + extra = extra.strip('-') + version += "-" + extra + return version def get_channel(srctree): # look up llversionserver.h and parse out the version info -- cgit v1.1 From 84c9ac0328144bb923fc0b6b556681598406b76c Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 20:25:58 -0700 Subject: Fixed snapshot Capture combo --- linden/indra/newview/llfloatersnapshot.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp index e007680..55e108b 100644 --- a/linden/indra/newview/llfloatersnapshot.cpp +++ b/linden/indra/newview/llfloatersnapshot.cpp @@ -1114,10 +1114,10 @@ LLSnapshotLivePreview::ESnapshotType LLFloaterSnapshot::Impl::getTypeIndex(LLFlo LLFloaterSnapshot::ESnapshotFormat LLFloaterSnapshot::Impl::getFormatIndex(LLFloaterSnapshot* floater) { ESnapshotFormat index = SNAPSHOT_FORMAT_PNG; - if(floater->hasChild("local_format_combo")) + if (floater->hasChild("local_format_combo")) { LLComboBox* local_format_combo = floater->getChild("local_format_combo"); - const std::string id = local_format_combo->getSelectedItemLabel(); + const std::string id = local_format_combo->getValue().asString(); if (id == "PNG") index = SNAPSHOT_FORMAT_PNG; else if (id == "JPEG") @@ -1136,10 +1136,10 @@ LLFloaterSnapshot::ESnapshotFormat LLFloaterSnapshot::Impl::getFormatIndex(LLFlo LLViewerWindow::ESnapshotType LLFloaterSnapshot::Impl::getLayerType(LLFloaterSnapshot* floater) { LLViewerWindow::ESnapshotType type = LLViewerWindow::SNAPSHOT_TYPE_COLOR; - if(floater->hasChild("layer_types")) + if (floater->hasChild("layer_types")) { LLComboBox* layer_types = floater->getChild("layer_types"); - const std::string id = layer_types->getSelectedItemLabel(); + const std::string id = layer_types->getValue().asString(); if (id == "colors") type = LLViewerWindow::SNAPSHOT_TYPE_COLOR; else if (id == "depth") -- cgit v1.1 From 0b707d43d1d04808e3354b9bf1dc35d380c286be Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 20:50:39 -0700 Subject: Backout of the sculptie derender patch ported from FireStorm This also reverts 14f4622c and 534767ef --- linden/indra/newview/app_settings/settings.xml | 22 ---------------------- linden/indra/newview/llappviewer.cpp | 2 -- linden/indra/newview/llviewercontrol.cpp | 16 +--------------- linden/indra/newview/llvovolume.cpp | 19 +------------------ linden/indra/newview/llvovolume.h | 3 --- linden/indra/newview/pipeline.cpp | 3 --- linden/indra/newview/pipeline.h | 1 - 7 files changed, 2 insertions(+), 64 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index e03e1f3..74750a6 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -1097,28 +1097,6 @@ Value 1 - RenderSculptSAMax - - Comment - The maximum combined surface area of sculpts(per frame) that are above the threshold before they stop being rendered - Persist - 1 - Type - F32 - Value - 50000 - - RenderSculptSAThreshold - - Comment - Surface area at which sculpts are considered for not being rendered - Persist - 1 - Type - F32 - Value - 1750 - RenderWaterVoidCulling Comment diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 519fa62..b96f6c2 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -422,8 +422,6 @@ static void settings_to_globals() LLVOTree::sTreeFactor = gSavedSettings.getF32("RenderTreeLODFactor"); LLVOAvatar::sLODFactor = gSavedSettings.getF32("RenderAvatarLODFactor"); LLVOAvatar::sMaxVisible = gSavedSettings.getS32("RenderAvatarMaxVisible"); - LLVOVolume::sSculptSAThresh = gSavedSettings.getF32("RenderSculptSAThreshold"); - LLVOVolume::sSculptSAMax = gSavedSettings.getF32("RenderSculptSAMax"); LLVOAvatar::sVisibleInFirstPerson = gSavedSettings.getBOOL("FirstPersonAvatarVisible"); // clamp auto-open time to some minimum usable value LLFolderView::sAutoOpenTime = llmax(0.25f, gSavedSettings.getF32("FolderAutoOpenDelay")); diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp index 4c81e71..59d766f 100644 --- a/linden/indra/newview/llviewercontrol.cpp +++ b/linden/indra/newview/llviewercontrol.cpp @@ -530,18 +530,6 @@ bool handleSliderScrollWheelMultiplierChanged(const LLSD& newvalue) return true; } -bool handleRenderSculptSAThresholdChanged(const LLSD& newvalue) -{ - LLVOVolume::sSculptSAThresh = newvalue.asReal(); - return true; -} - -bool handleRenderSculptSAMaxChanged(const LLSD& newvalue) -{ - LLVOVolume::sSculptSAMax = newvalue.asReal(); - return true; -} - //////////////////////////////////////////////////////////////////////////// @@ -687,9 +675,7 @@ void settings_setup_listeners() gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); gSavedSettings.getControl("SliderScrollWheelMultiplier")->getSignal()->connect(boost::bind(&handleSliderScrollWheelMultiplierChanged, _1)); - gSavedSettings.getControl("TranslateChat")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _1)); - gSavedSettings.getControl("RenderSculptSAThreshold")->getSignal()->connect(boost::bind(&handleRenderSculptSAThresholdChanged, _1)); - gSavedSettings.getControl("RenderSculptSAMax")->getSignal()->connect(boost::bind(&handleRenderSculptSAMaxChanged, _1)); + gSavedSettings.getControl("TranslateChat")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _1)); } template <> eControlType get_control_type(const U32& in, LLSD& out) diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp index b422c51..d580d61 100644 --- a/linden/indra/newview/llvovolume.cpp +++ b/linden/indra/newview/llvovolume.cpp @@ -79,9 +79,6 @@ F32 LLVOVolume::sLODFactor = 1.f; F32 LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop F32 LLVOVolume::sDistanceFactor = 1.0f; S32 LLVOVolume::sNumLODChanges = 0; -F32 LLVOVolume::sSculptSAThresh = 1750.f; -F32 LLVOVolume::sSculptSAMax = 50000.f; - LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) : LLViewerObject(id, pcode, regionp), @@ -709,7 +706,7 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &volume_params, const S32 detail } else { - mSculptSurfaceArea = 0.0; + mSculptSurfaceArea = 0.f; } return TRUE; @@ -2322,20 +2319,6 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) LLVOVolume* vobj = drawablep->getVOVolume(); llassert_always(vobj); - - if (vobj->isSculpted() && vobj->mSculptSurfaceArea > LLVOVolume::sSculptSAThresh) - { - LLPipeline::sSculptSurfaceAreaFrame += vobj->mSculptSurfaceArea; - if (LLPipeline::sSculptSurfaceAreaFrame > LLVOVolume::sSculptSAMax) - { - LL_DEBUGS("Volume") << "Sculptie (" - << vobj->getID() << ") above RenderSculptSAMax (" - << LLVOVolume::sSculptSAMax - << ")! Turning invisible!" - << LL_ENDL; - continue; - } - } vobj->updateTextureVirtualSize(); vobj->preRebuild(); diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h index 2f53bea..d09a198 100644 --- a/linden/indra/newview/llvovolume.h +++ b/linden/indra/newview/llvovolume.h @@ -248,9 +248,6 @@ public: static F32 sLODSlopDistanceFactor;// Changing this to zero, effectively disables the LOD transition slop static F32 sLODFactor; // LOD scale factor static F32 sDistanceFactor; // LOD distance factor - static F32 sSculptSAThresh; // Surface area at which sculpts are considered for not being rendered - static F32 sSculptSAMax; // The maximum combined surface area of sculpts(per frame) that are above the - // threshold before they stop being rendered protected: static S32 sNumLODChanges; diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index ae0e605..cd9b3be 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp @@ -258,7 +258,6 @@ BOOL LLPipeline::sRenderAttachedLights = TRUE; BOOL LLPipeline::sRenderAttachedParticles = TRUE; BOOL LLPipeline::sRenderDeferred = FALSE; S32 LLPipeline::sVisibleLightCount = 0; -F32 LLPipeline::sSculptSurfaceAreaFrame = 0.0; static LLCullResult* sCull = NULL; @@ -2199,8 +2198,6 @@ void LLPipeline::postSort(LLCamera& camera) LLFastTimer ftm(LLFastTimer::FTM_STATESORT_POSTSORT); assertInitialized(); - - sSculptSurfaceAreaFrame = 0.0; //rebuild drawable geometry for (LLCullResult::sg_list_t::iterator i = sCull->beginDrawableGroups(); i != sCull->endDrawableGroups(); ++i) diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h index 2252fbd..c5ab7ab 100644 --- a/linden/indra/newview/pipeline.h +++ b/linden/indra/newview/pipeline.h @@ -579,7 +579,6 @@ protected: public: static BOOL sRenderBeacons; static BOOL sRenderHighlight; - static F32 sSculptSurfaceAreaFrame; }; -- cgit v1.1 From 32ac9636669a7644e64a6357a31918227e1b945d Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 20:52:20 -0700 Subject: Revert "Reverted ability to customize the Imprudence client tag color." This reverts commit 87219855c664447a39dd7c2d8866f0a630d1c843. --- linden/indra/newview/app_settings/settings.xml | 16 + linden/indra/newview/llprefscolors.cpp | 21 ++ linden/indra/newview/llprefscolors.h | 3 + linden/indra/newview/llvoavatar.cpp | 379 +++++++++++---------- .../default/xui/en-us/panel_preferences_colors.xml | 19 +- 5 files changed, 256 insertions(+), 182 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 74750a6..3279b6b 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -1775,6 +1775,22 @@ + ImprudenceTagColor + + Comment + Color of Imprudence tags (displayed only locally) + Persist + 1 + Type + Color4 + Value + + 0.79 + 0.44 + 0.88 + 1 + + ShowClientColor Comment diff --git a/linden/indra/newview/llprefscolors.cpp b/linden/indra/newview/llprefscolors.cpp index 7d69eaf..0b4caf5 100644 --- a/linden/indra/newview/llprefscolors.cpp +++ b/linden/indra/newview/llprefscolors.cpp @@ -82,6 +82,10 @@ BOOL LLPrefsColors::postBuild() getChild("effect_color_swatch")->set(gSavedSettings.getColor4("EffectColor")); + getChild("client_tag_color")->set(gSavedSettings.getColor4("ImprudenceTagColor")); + static BOOL* sShowClientColor = rebind_llcontrol("ShowClientColor", &gSavedSettings, true); + childSetValue("client_name_color_check", (*sShowClientColor)); + return TRUE; } @@ -99,6 +103,7 @@ void LLPrefsColors::refreshColors() mFriendsChatColor = gSavedSettings.getColor4("FriendsChatColor"); mOwnNameChatColor = gSavedSettings.getColor4("OwnNameChatColor"); mEffectColor = gSavedSettings.getColor4("EffectColor"); + mClientTagColor = gSavedSettings.getColor4("ImprudenceTagColor"); } // static @@ -130,6 +135,18 @@ void LLPrefsColors::updateFriendsCheck() getChild("FriendsChatColor")->setEnabled(childGetValue("HighlightFriendsChat")); } +// static +void LLPrefsColors::onCommitCheckClient(LLUICtrl* ctrl, void* userdata) +{ + LLPrefsColors* self = (LLPrefsColors*)userdata; + self->updateClientCheck(); +} + +void LLPrefsColors::updateClientCheck() +{ + getChild("client_tag_color")->setEnabled(childGetValue("client_name_color_checkt")); +} + void LLPrefsColors::cancel() { gSavedSettings.setColor4("SystemChatColor", mSystemChatColor); @@ -144,6 +161,7 @@ void LLPrefsColors::cancel() gSavedSettings.setColor4("FriendsChatColor", mFriendsChatColor); gSavedSettings.setColor4("OwnNameChatColor", mOwnNameChatColor); gSavedSettings.setColor4("EffectColor", mEffectColor); + gSavedSettings.setColor4("ImprudenceTagColor", mClientTagColor); } void LLPrefsColors::apply() @@ -180,5 +198,8 @@ void LLPrefsColors::apply() gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch")); + gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_name_color_check")); + gSavedSettings.setColor4("ImprudenceTagColor", getChild("client_tag_color")->get()); + refreshColors(); // member values become the official values and cancel becomes a no-op. } diff --git a/linden/indra/newview/llprefscolors.h b/linden/indra/newview/llprefscolors.h index 88ea371..d580add 100644 --- a/linden/indra/newview/llprefscolors.h +++ b/linden/indra/newview/llprefscolors.h @@ -47,9 +47,11 @@ public: private: static void onCommitCheckSelfName(LLUICtrl* ctrl, void* userdata); static void onCommitCheckFriends(LLUICtrl* ctrl, void* userdata); + static void onCommitCheckClient(LLUICtrl* ctrl, void* userdata); void refreshColors(); void updateFriendsCheck(); void updateSelfCheck(); + void updateClientCheck(); LLColor4 mSystemChatColor; LLColor4 mUserChatColor; @@ -63,6 +65,7 @@ private: LLColor4 mFriendsChatColor; LLColor4 mOwnNameChatColor; LLColor4 mEffectColor; + LLColor4 mClientTagColor; }; #endif //LLPREFSCOLORS_H diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 596e39c..11f4857 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp @@ -3267,8 +3267,18 @@ bool LLVOAvatar::loadClientTags() void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar) { LLUUID idx = avatar->getTE(0)->getID(); - if(LLVOAvatar::sClientResolutionList.has("isComplete") - && LLVOAvatar::sClientResolutionList.has(idx.asString())) + + // We start locally with Imprudence in case the user has a local color they prefer. + // This means clientside colors for Imp will always override any on the website. + // If you're going to add a new color, a new UUID needs to be added -- MC + if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf")) + { + // defaults to LLColor4(0.79f,0.44f,0.88f) + avatar_name_color = gSavedSettings.getColor4("ImprudenceTagColor"); //Imprudence + client = "Imprudence"; + } + else if (LLVOAvatar::sClientResolutionList.has("isComplete") && + LLVOAvatar::sClientResolutionList.has(idx.asString())) { LLSD cllsd = LLVOAvatar::sClientResolutionList[idx.asString()]; client = cllsd["name"].asString(); @@ -3277,186 +3287,193 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, avatar_name_color += colour; avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f); } - else - { - - if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf")) - { - avatar_name_color = LLColor4(0.79f,0.44f,0.88f);//Imprudence - client = "Imprudence"; - - }else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") || + else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") || idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4")) - { - avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat - avatar_name_color = avatar_name_color * (F32)0.333333333333; - client = "Meerkat"; - }else if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db")) - { - avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7 - client = "Meta7"; - }else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218")) - { - avatar_name_color += LLColor4::green;//emerald - avatar_name_color += LLColor4::green; - avatar_name_color = avatar_name_color * (F32)0.333333333333; - client = "Emerald"; - }else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe")) - { - avatar_name_color += LLColor4::red;//vlife jcool410 - avatar_name_color = avatar_name_color * 0.5; - client = "VLife"; - }else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32")) - { - avatar_name_color += LLColor4::pink;//tyk3n - avatar_name_color = avatar_name_color * 0.5; - client = "tyk3n"; - }else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") || - idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c")) - { - avatar_name_color += (LLColor4::purple);//psl - avatar_name_color = avatar_name_color * 0.5; - client = "PSL"; - }else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500")) - { - avatar_name_color += LLColor4::red;//lordgreg - avatar_name_color += LLColor4::red; - avatar_name_color = avatar_name_color * (F32)0.333333333333; - client = "LGG proxy"; - }else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c")) - { - avatar_name_color += LLColor4::blue;//day oh - avatar_name_color = avatar_name_color * 0.5; - client = "Day Oh proxy"; - }else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") || - idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") || - idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") || - idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea")) - { - avatar_name_color += LLColor4::cyan;//cryolife - avatar_name_color += LLColor4::cyan; - avatar_name_color = avatar_name_color * 0.5; - client = "CryoLife"; - }else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8")) - { - avatar_name_color += LLColor4::pink;//moy - avatar_name_color += LLColor4::pink;//moy - avatar_name_color = avatar_name_color * (F32)0.333333333333; - client = "MoyMix"; - }else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") || - idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58")) - { - avatar_name_color += LLColor4::yellow;//neil - avatar_name_color += LLColor4::yellow;//neil - avatar_name_color = avatar_name_color * (F32)0.333333333333; - client = "NeilLife"; - }else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6")) - { - avatar_name_color += LLColor4(0.0f,1.0f,1.0f); - avatar_name_color = avatar_name_color * 0.5;//phox - client = "PhoxSL"; - }else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014")) - { - avatar_name_color += LLColor4::white; - avatar_name_color += LLColor4::white; - avatar_name_color = avatar_name_color * (F32)0.333333333333; - client = "Kung Fu"; - }else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b")) - { - avatar_name_color += LLColor4::magenta; - avatar_name_color += LLColor4::magenta; - avatar_name_color = avatar_name_color * (F32)0.333333333333; - client = "BetaLife"; - }else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22")) - { - avatar_name_color += LLColor4::green;//SimFed Poland - avatar_name_color += LLColor4::blue;//SimFed Poland - avatar_name_color += LLColor4::blue;//SimFed Poland - avatar_name_color = avatar_name_color * 0.5; - client = "Copybotter"; - }else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat - idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat. - idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat. - idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat - idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.- - { - avatar_name_color += LLColor4(0.0f,0.5f,1.0f); - avatar_name_color = avatar_name_color * 0.5; - client = "VerticalLife"; - }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f")) - { - avatar_name_color += LLColor4::blue; //Sapphire - avatar_name_color += LLColor4::blue; //Sapphire - avatar_name_color = avatar_name_color * (F32)0.333333333333; - client = "Sapphire"; - }else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e")) - { - avatar_name_color += LLColor4::orange; //corgiVision - avatar_name_color = avatar_name_color * (F32)0.75; - client = "Corgi"; - }else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1")) - { - avatar_name_color += LLColor4::red; //Ruby - avatar_name_color += LLColor4::purple; //Ruby - avatar_name_color = avatar_name_color * (F32)0.333333333333; - client = "Ruby"; - }else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366")) - { - avatar_name_color += LLColor4::yellow9; - avatar_name_color += LLColor4::yellow9; - avatar_name_color *= (F32)0.333333333333; - client = "Gemini"; - } - else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702")) - { - avatar_name_color = LLColor4(1.0f,1.0f,1.0f); - client = "Operator"; - } - else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056")) - { - avatar_name_color = LLColor4(2.0f,2.0f,2.0f); - avatar_name_color *= 0.33f; - client = "iLife"; - } - else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5")) - { - avatar_name_color = LLColor4(1.0f,1.0f,1.0f); - client = "Gemini.Bot"; - } - else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1")) - { - avatar_name_color = LLColor4(1.0f,1.0f,1.0f); - client = "Infinity"; - } - else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37")) - { - avatar_name_color = LLColor4(0.0f,0.6f,0.0f); - avatar_name_color *= 0.33f; - client = "rivlife"; - } - else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee")) - { - avatar_name_color = LLColor4(0.69f,0.8f,1.6f); - avatar_name_color *= 0.5f; - client = "Anti-Life"; - } - else if(idx == LLUUID("f5feab57-bde5-2074-97af-517290213eaa") || - idx == LLUUID("e6f9c019-8783-dc3e-b265-41f1510333fc")) - { - avatar_name_color = LLColor4(0.4f,0.4f,0.4f); - client = "Onyx"; - } - else if(idx == LLUUID("c58fca06-33b3-827d-d81c-a886a631affc")) - { - avatar_name_color = LLColor4(1.0f,0.61176f,0.0f); - client = "Whale"; - } - else if(idx == LLUUID("9ba526b6-f43d-6b60-42de-ce62a25ee7fb")) - { - avatar_name_color = LLColor4(1.0f,1.0f,1.0f); - client = "nolife"; - } + { + avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat + avatar_name_color = avatar_name_color * (F32)0.333333333333; + client = "Meerkat"; + } + else if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db")) + { + avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7 + client = "Meta7"; + } + else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218")) + { + avatar_name_color += LLColor4::green;//emerald + avatar_name_color += LLColor4::green; + avatar_name_color = avatar_name_color * (F32)0.333333333333; + client = "Emerald"; } + else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe")) + { + avatar_name_color += LLColor4::red;//vlife jcool410 + avatar_name_color = avatar_name_color * 0.5; + client = "VLife"; + } + else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32")) + { + avatar_name_color += LLColor4::pink;//tyk3n + avatar_name_color = avatar_name_color * 0.5; + client = "tyk3n"; + } + else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") || + idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c")) + { + avatar_name_color += (LLColor4::purple);//psl + avatar_name_color = avatar_name_color * 0.5; + client = "PSL"; + } + else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500")) + { + avatar_name_color += LLColor4::red;//lordgreg + avatar_name_color += LLColor4::red; + avatar_name_color = avatar_name_color * (F32)0.333333333333; + client = "LGG proxy"; + } + else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c")) + { + avatar_name_color += LLColor4::blue;//day oh + avatar_name_color = avatar_name_color * 0.5; + client = "Day Oh proxy"; + } + else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") || + idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") || + idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") || + idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea")) + { + avatar_name_color += LLColor4::cyan;//cryolife + avatar_name_color += LLColor4::cyan; + avatar_name_color = avatar_name_color * 0.5; + client = "CryoLife"; + } + else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8")) + { + avatar_name_color += LLColor4::pink;//moy + avatar_name_color += LLColor4::pink;//moy + avatar_name_color = avatar_name_color * (F32)0.333333333333; + client = "MoyMix"; + } + else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") || + idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58")) + { + avatar_name_color += LLColor4::yellow;//neil + avatar_name_color += LLColor4::yellow;//neil + avatar_name_color = avatar_name_color * (F32)0.333333333333; + client = "NeilLife"; + } + else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6")) + { + avatar_name_color += LLColor4(0.0f,1.0f,1.0f); + avatar_name_color = avatar_name_color * 0.5;//phox + client = "PhoxSL"; + } + else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014")) + { + avatar_name_color += LLColor4::white; + avatar_name_color += LLColor4::white; + avatar_name_color = avatar_name_color * (F32)0.333333333333; + client = "Kung Fu"; + } + else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b")) + { + avatar_name_color += LLColor4::magenta; + avatar_name_color += LLColor4::magenta; + avatar_name_color = avatar_name_color * (F32)0.333333333333; + client = "BetaLife"; + } + else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22")) + { + avatar_name_color += LLColor4::green;//SimFed Poland + avatar_name_color += LLColor4::blue;//SimFed Poland + avatar_name_color += LLColor4::blue;//SimFed Poland + avatar_name_color = avatar_name_color * 0.5; + client = "Copybotter"; + } + else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat + idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat. + idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat. + idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat + idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.- + { + avatar_name_color += LLColor4(0.0f,0.5f,1.0f); + avatar_name_color = avatar_name_color * 0.5; + client = "VerticalLife"; + }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f")) + { + avatar_name_color += LLColor4::blue; //Sapphire + avatar_name_color += LLColor4::blue; //Sapphire + avatar_name_color = avatar_name_color * (F32)0.333333333333; + client = "Sapphire"; + }else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e")) + { + avatar_name_color += LLColor4::orange; //corgiVision + avatar_name_color = avatar_name_color * (F32)0.75; + client = "Corgi"; + }else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1")) + { + avatar_name_color += LLColor4::red; //Ruby + avatar_name_color += LLColor4::purple; //Ruby + avatar_name_color = avatar_name_color * (F32)0.333333333333; + client = "Ruby"; + }else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366")) + { + avatar_name_color += LLColor4::yellow9; + avatar_name_color += LLColor4::yellow9; + avatar_name_color *= (F32)0.333333333333; + client = "Gemini"; + } + else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702")) + { + avatar_name_color = LLColor4(1.0f,1.0f,1.0f); + client = "Operator"; + } + else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056")) + { + avatar_name_color = LLColor4(2.0f,2.0f,2.0f); + avatar_name_color *= 0.33f; + client = "iLife"; + } + else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5")) + { + avatar_name_color = LLColor4(1.0f,1.0f,1.0f); + client = "Gemini.Bot"; + } + else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1")) + { + avatar_name_color = LLColor4(1.0f,1.0f,1.0f); + client = "Infinity"; + } + else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37")) + { + avatar_name_color = LLColor4(0.0f,0.6f,0.0f); + avatar_name_color *= 0.33f; + client = "rivlife"; + } + else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee")) + { + avatar_name_color = LLColor4(0.69f,0.8f,1.6f); + avatar_name_color *= 0.5f; + client = "Anti-Life"; + } + else if(idx == LLUUID("f5feab57-bde5-2074-97af-517290213eaa") || + idx == LLUUID("e6f9c019-8783-dc3e-b265-41f1510333fc")) + { + avatar_name_color = LLColor4(0.4f,0.4f,0.4f); + client = "Onyx"; + } + else if(idx == LLUUID("c58fca06-33b3-827d-d81c-a886a631affc")) + { + avatar_name_color = LLColor4(1.0f,0.61176f,0.0f); + client = "Whale"; + } + else if(idx == LLUUID("9ba526b6-f43d-6b60-42de-ce62a25ee7fb")) + { + avatar_name_color = LLColor4(1.0f,1.0f,1.0f); + client = "nolife"; + } + if(client.empty()) { LLPointer image_point = gImageList.getImage(idx, MIPMAP_YES, IMMEDIATE_NO); @@ -3606,7 +3623,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) else { // Set your own name to the Imprudence color -- MC - client_color = LLColor4(0.79f,0.44f,0.88f); + client_color = gSavedSettings.getColor4("ImprudenceTagColor"); } static BOOL* sShowClientColor = rebind_llcontrol("ShowClientColor", &gSavedSettings, true); diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml index 04e71d4..9b55822 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml @@ -33,7 +33,24 @@ USE left="270" FOR TABBING OPTIONS tool_tip="Click to open Color Picker" width="65" /> - + Client Tag Color: + + + + + + -- cgit v1.1 From 701e76557ae6a6cd7f4b18ee275ee122b91495a8 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 8 Sep 2011 21:03:06 -0700 Subject: Don't run vstool.exe when using an express version of vc++, by CobraElDiablo from the Astra Viewer --- linden/indra/develop.py | 6 +++++- linden/indra/newview/CMakeLists.txt | 24 +++++++++++++----------- 2 files changed, 18 insertions(+), 12 deletions(-) (limited to 'linden') diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 6d2ce72..8b23b1d 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py @@ -80,6 +80,7 @@ class PlatformSetup(object): project_name = 'Imprudence' distcc = True cmake_opts = [] + using_express = False def __init__(self): self.script_dir = os.path.realpath( @@ -494,6 +495,7 @@ class WindowsSetup(PlatformSetup): for version in 'vc80 vc90 vc100 vc71'.split(): if self.find_visual_studio_express(version): self._generator = version + self.using_express = True print 'Building with ', self.gens[version]['gen'] , "Express edition" break else: @@ -570,6 +572,7 @@ class WindowsSetup(PlatformSetup): key = _winreg.OpenKey(reg, key_str) value = _winreg.QueryValueEx(key, value_str)[0]+"IDE" print 'Found: %s' % value + self.using_express = True return value except WindowsError, err: print >> sys.stderr, "Didn't find ", self.gens[gen]['gen'] @@ -618,7 +621,8 @@ class WindowsSetup(PlatformSetup): '''Override to add the vstool.exe call after running cmake.''' PlatformSetup.run_cmake(self, args) if self.unattended == 'OFF': - self.run_vstool() + if self.using_express == False: + self.run_vstool() def run_vstool(self): for build_dir in self.build_dirs(): diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 1b9f75a..54c1998 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -1323,17 +1323,19 @@ if (WINDOWS) # sets the 'working directory' for debugging from visual studio. if (NOT UNATTENDED) - add_custom_command( - TARGET ${VIEWER_BINARY_NAME} PRE_BUILD - COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe - ARGS - --solution - ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln - --workingdir - ${VIEWER_BINARY_NAME} - ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging." - ) + if (NOT self.using_express) + add_custom_command( + TARGET ${VIEWER_BINARY_NAME} PRE_BUILD + COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe + ARGS + --solution + ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln + --workingdir + ${VIEWER_BINARY_NAME} + ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging." + ) + endif (NOT self.using_express) endif (NOT UNATTENDED) add_custom_command( -- cgit v1.1 From ce65f098dff3f995759fb285c23e0e75abf0fbd8 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 13 Sep 2011 11:26:38 -0700 Subject: Ported external script editor patch from Phoenix, added some cleanup, and made it use menus (also added autosave and fixed the 'reset' button alignment being off while I was there) --- linden/indra/newview/app_settings/settings.xml | 11 + linden/indra/newview/llfilepicker.cpp | 24 ++ linden/indra/newview/llfilepicker.h | 1 + linden/indra/newview/llpreviewscript.cpp | 284 ++++++++++++++++++++- linden/indra/newview/llpreviewscript.h | 17 +- .../default/xui/en-us/floater_live_lsleditor.xml | 2 +- .../default/xui/en-us/floater_script_ed_panel.xml | 14 +- 7 files changed, 341 insertions(+), 12 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 3279b6b..439459c 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -795,6 +795,17 @@ Value 30 + LSLExternalEditor + + Comment + Controls the location of the External editor + Persist + 1 + Type + String + Value + + MapServerURL Comment diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp index ec4e294..a562b17 100644 --- a/linden/indra/newview/llfilepicker.cpp +++ b/linden/indra/newview/llfilepicker.cpp @@ -60,6 +60,12 @@ LLFilePicker LLFilePicker::sInstance; #define XML_FILTER L"XML files (*.xml)\0*.xml\0" #define SLOBJECT_FILTER L"Objects (*.slobject)\0*.slobject\0" #define RAW_FILTER L"RAW files (*.raw)\0*.raw\0" +#ifdef LL_WINDOWS + #define APP_FILTER L"Executable files (*.exe)\0*.exe\0" +#else + // If we can, add any mac/linux binary searching here -- MC + #define APP_FILTER L"Executable files (*.*)\0*.*\0" +#endif // LL_WINDOOWS #endif // @@ -192,6 +198,10 @@ BOOL LLFilePicker::setupFilter(ELoadFilter filter) mOFN.lpstrFilter = RAW_FILTER \ L"\0"; break; + case FFLOAD_APP: + mOFN.lpstrFilter = APP_FILTER \ + L"\0"; + break; default: res = FALSE; break; @@ -601,6 +611,17 @@ Boolean LLFilePicker::navOpenFilterProc(AEDesc *theItem, void *info, void *callB AEDisposeDesc(&desc); } } + else if(filter == FFLOAD_APP) + { + // App bundles are of type APPL; ???? is a folder, and 0 is something going wrong. + if((int)navInfo->fileAndFolder.folderInfo.folderType != FOUR_CHAR_CODE('APPL') && + (int)navInfo->fileAndFolder.folderInfo.folderType != FOUR_CHAR_CODE('\?\?\?\?') && + (int)navInfo->fileAndFolder.folderInfo.folderType != 0 + ) + { + result = false; + } + } } return result; } @@ -844,6 +865,9 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter) reset(); mNavOptions.optionFlags &= ~kNavAllowMultipleFiles; + if(filter == FFLOAD_APP) + mNavOptions.optionFlags |= kNavSupportPackages; + // Modal, so pause agent send_agent_pause(); { diff --git a/linden/indra/newview/llfilepicker.h b/linden/indra/newview/llfilepicker.h index fb20ed3..3925ae7 100644 --- a/linden/indra/newview/llfilepicker.h +++ b/linden/indra/newview/llfilepicker.h @@ -92,6 +92,7 @@ public: FFLOAD_SLOBJECT = 7, FFLOAD_RAW = 8, FFLOAD_TEXT = 9, + FFLOAD_APP = 10 }; enum ESaveFilter diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp index d2d9ed5..a1c05c7 100644 --- a/linden/indra/newview/llpreviewscript.cpp +++ b/linden/indra/newview/llpreviewscript.cpp @@ -178,7 +178,11 @@ LLScriptEdCore::LLScriptEdCore( mLastHelpToken(NULL), mLiveHelpHistorySize(0), mEnableSave(FALSE), - mHasScriptData(FALSE) + mEnableXEd(FALSE), + mHasScriptData(FALSE), + // We need to check for a new file every five seconds, or autosave every 60. + // There's probably a better solution to both of the above. + LLEventTimer((gSavedSettings.getString("LSLExternalEditor").length() < 3) ? 60 : 5) { setFollowsAll(); setBorderVisible(FALSE); @@ -209,11 +213,30 @@ LLScriptEdCore::LLScriptEdCore( tooltips.push_back(ll_safe_string(gScriptLibrary.mFunctions[i]->mDesc)); } } + + //gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"keywords.ini") + std::string keyword_path = gDirUtilp->getUserSkinDir() + gDirUtilp->getDirDelimiter() + "keywords.ini"; + if(!LLFile::isfile(keyword_path)) + { + llinfos << "nothing at " << keyword_path << llendl; + keyword_path = gDirUtilp->getSkinDir() + gDirUtilp->getDirDelimiter() + "keywords.ini"; + if(!LLFile::isfile(keyword_path)) + { + llinfos << "nothing at " << keyword_path << " ; will use default" << llendl; + keyword_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "keywords.ini"); + } + else + { + llinfos << "loaded skin-specific keywords from " << keyword_path << llendl; + } + } + else + { + llinfos << "loaded skin-specific keywords from " << keyword_path << llendl; + } LLColor3 color(0.5f, 0.0f, 0.15f); - - mEditor->loadKeywords(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"keywords.ini"), funcs, tooltips, color); + mEditor->loadKeywords(keyword_path, funcs, tooltips, color); - LLKeywordToken *token; LLKeywords::keyword_iterator_t token_it; for (token_it = mEditor->keywordsBegin(); token_it != mEditor->keywordsEnd(); ++token_it) @@ -233,7 +256,6 @@ LLScriptEdCore::LLScriptEdCore( childSetCommitCallback("lsl errors", &LLScriptEdCore::onErrorList, this); childSetAction("Save_btn", onBtnSave,this); - initMenu(); // Do the work that addTabPanel() normally does. @@ -250,6 +272,23 @@ LLScriptEdCore::~LLScriptEdCore() deleteBridges(); } +BOOL LLScriptEdCore::tick() +{ + //autoSave(); + if (gSavedSettings.getString("LSLExternalEditor").length() < 3) + { + if (hasChanged(this)) + { + autoSave(); + } + } + else + { + XedUpd(); + } + return FALSE; +} + void LLScriptEdCore::initMenu() { @@ -297,6 +336,14 @@ void LLScriptEdCore::initMenu() menuItem->setMenuCallback(onBtnHelp, this); menuItem->setEnabledCallback(NULL); + menuItem = getChild("Set External Editor..."); + menuItem->setMenuCallback(onSetExternalEditor, this); + menuItem->setEnabledCallback(NULL); + + menuItem = getChild("Open in External Editor"); + menuItem->setMenuCallback(onBtnXEd, this); + menuItem->setEnabledCallback(enableExternalEditor); + menuItem = getChild("Import Script..."); menuItem->setMenuCallback(onBtnLoadFromDisc, this); menuItem->setEnabledCallback(NULL); @@ -318,7 +365,9 @@ void LLScriptEdCore::setScriptText(const std::string& text, BOOL is_valid) { if (mEditor) { - mEditor->setText(text); + std::string new_text(text); + LLStringUtil::replaceTabsWithSpaces(new_text, 4); // fix tabs in text + mEditor->setText(new_text); mHasScriptData = is_valid; } } @@ -416,6 +465,175 @@ void LLScriptEdCore::updateDynamicHelp(BOOL immediate) setHelpPage(LLStringUtil::null); } } +//dim +void LLScriptEdCore::xedLaunch() +{ + //llinfos << "LLScriptEdCore::autoSave()" << llendl; + + std::string editor = gSavedSettings.getString("LSLExternalEditor"); + if (!gDirUtilp->fileExists(editor)) + { + llwarns << "External editor " + editor + " not found" << llendl; + + LLSD row; + row["columns"][0]["value"] = "Couldn't open external editor '" + editor + "'. File not found."; + row["columns"][0]["font"] = "SANSSERIF_SMALL"; + mErrorList->addElement(row); + return; + } + + //std::string filepath = gDirUtilp->getExpandedFilename(gDirUtilp->getTempDir(),asset_id.asString()); + if( mXfname.empty() ) + { + std::string asfilename = gDirUtilp->getTempFilename(); + asfilename.replace( asfilename.length()-4, 12, "_Xed.lsl" ); + mXfname = asfilename; + //mAutosaveFilename = llformat("%s.lsl", asfilename.c_str()); + } + + FILE* fp = LLFile::fopen(mXfname.c_str(), "wb"); + if(!fp) + { + llwarns << "Unable to write to " << mXfname << llendl; + + LLSD row; + row["columns"][0]["value"] = "Error writing to temp file. Is your hard drive full?"; + row["columns"][0]["font"] = "SANSSERIF_SMALL"; + mErrorList->addElement(row); + return; + } + mEditor->setEnabled(FALSE); + std::string utf8text = mEditor->getText(); + fputs(utf8text.c_str(), fp); + fclose(fp); + fp = NULL; + llinfos << "XEditor: " << mXfname << llendl; + //record the stat + stat(mXfname.c_str(), &mXstbuf); + //launch +#if LL_WINDOWS + //just to get rid of the pesky black window + std::string exe = gSavedSettings.getString("LSLExternalEditor"); + S32 spaces=0; + for(S32 i=0; i!=exe.size(); ++i) + { + spaces+=( exe.at(i)==' '); + } + if(spaces > 0) + { + exe = "\""+exe+"\""; + } + std::string theCMD("%COMSPEC% /c START \"External Editor\" " + exe + " " + mXfname + " & exit"); + llinfos << "FINAL COMMAND IS :"<< + theCMD.c_str() << llendl; + + std::system(theCMD.c_str()); +#elif LL_DARWIN + // Use Launch Services for this - launching another instance is fail (and incorrect on OS X) + CFStringRef strPath = CFStringCreateWithCString(kCFAllocatorDefault, mXfname.c_str(), kCFStringEncodingUTF8); + CFURLRef tempPath = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, strPath, kCFURLPOSIXPathStyle, false); + CFURLRef tempPathArray[1] = { tempPath }; + CFArrayRef arguments = CFArrayCreate(kCFAllocatorDefault, (const void **)tempPathArray, 1, NULL); + LSApplicationParameters appParams; + memset(&appParams, 0, sizeof(appParams)); + FSRef ref; + FSPathMakeRef((UInt8*)gSavedSettings.getString("LSLExternalEditor").c_str(), &ref, NULL); + appParams.application = &ref; + appParams.flags = kLSLaunchAsync | kLSLaunchStartClassic; + LSOpenURLsWithRole(arguments, kLSRolesAll, NULL, &appParams, NULL, 0); + CFRelease(arguments); + CFRelease(tempPath); + CFRelease(strPath); +#else + //std::system(std::string(gSavedSettings.getString("LSLExternalEditor") + " " + mXfname).c_str()); + + // Any approach involving std::system will fail because SL eats signals. + // This was stolen from floaterskinfinder.cpp. + std::string exe = gSavedSettings.getString("LSLExternalEditor"); + const char *zargv[] = {exe.c_str(), mXfname.c_str(), NULL}; + fflush(NULL); + pid_t id = vfork(); + if(id == 0) + { + execv(exe.c_str(), (char **)zargv); + _exit(0); // This shouldn't ever be reached. + } +#endif +} + +void LLScriptEdCore::XedUpd() +{ + struct stat stbuf; + stat(this->mXfname.c_str() , &stbuf); + if (this->mXstbuf.st_mtime != stbuf.st_mtime) + { + this->mErrorList->addCommentText(std::string("Change Detected... Updating")); + + this->mXstbuf = stbuf; + LLFILE* file = LLFile::fopen(this->mXfname, "rb"); /*Flawfinder: ignore*/ + if(file) + { + // read in the whole file + fseek(file, 0L, SEEK_END); + S64 file_length = ftell(file); + fseek(file, 0L, SEEK_SET); + char* buffer = new char[file_length+1]; + size_t nread = fread(buffer, 1, file_length, file); + if (nread < (size_t) file_length) + { + llwarns << "Short read" << llendl; + } + buffer[nread] = '\0'; + fclose(file); + std::string ttext = LLStringExplicit(buffer); + LLStringUtil::replaceTabsWithSpaces(ttext, 4); + mEditor->setText(ttext); + LLScriptEdCore::doSave( this, FALSE ); + //mEditor->makePristine(); + delete[] buffer; + buffer = NULL; + } + else + { + llwarns << "Error opening " << this->mXfname << llendl; + } + } +} +//end dim +void LLScriptEdCore::autoSave() +{ + //llinfos << "LLScriptEdCore::autoSave()" << llendl; + if(mEditor->isPristine()) + { + return; + } + //std::string filepath = gDirUtilp->getExpandedFilename(gDirUtilp->getTempDir(),asset_id.asString()); + if( mAutosaveFilename.empty() ) + { + std::string asfilename = gDirUtilp->getTempFilename(); + asfilename.replace( asfilename.length()-4, 12, "_autosave.lsl" ); + mAutosaveFilename = asfilename; + //mAutosaveFilename = llformat("%s.lsl", asfilename.c_str()); + } + + FILE* fp = LLFile::fopen(mAutosaveFilename.c_str(), "wb"); + if(!fp) + { + llwarns << "Unable to write to " << mAutosaveFilename << llendl; + + LLSD row; + row["columns"][0]["value"] = "Error writing to temp file. Is your hard drive full?"; + row["columns"][0]["font"] = "SANSSERIF_SMALL"; + mErrorList->addElement(row); + return; + } + + std::string utf8text = mEditor->getText(); + fputs(utf8text.c_str(), fp); + fclose(fp); + fp = NULL; + llinfos << "autosave: " << mAutosaveFilename << llendl; +} void LLScriptEdCore::setHelpPage(const std::string& help_string) { @@ -507,6 +725,11 @@ bool LLScriptEdCore::handleSaveChangesDialog(const LLSD& notification, const LLS break; case 1: // "No" + if( !mXfname.empty()) + { + llinfos << "remove autosave: " << mXfname << llendl; + LLFile::remove(mXfname.c_str()); + } mForceClose = TRUE; // This will close immediately because mForceClose is true, so we won't // infinite loop with these dialogs. JC @@ -724,6 +947,34 @@ void LLScriptEdCore::onBtnSave(void* data) } // static +void LLScriptEdCore::onSetExternalEditor(void* data) +{ + std::string cur_name(gSavedSettings.getString("LSLExternalEditor")); + + LLFilePicker& picker = LLFilePicker::instance(); + if (! picker.getOpenFile(LLFilePicker::FFLOAD_APP) ) + { + return; //Canceled! + } + std::string file_name = picker.getFirstFile(); + if (!file_name.empty() && file_name != cur_name) + { + gSavedSettings.setString("LSLExternalEditor", file_name); + } + else + { + gSavedSettings.setString("LSLExternalEditor", ""); + } +} + +//static +void LLScriptEdCore::onBtnXEd(void* data) +{ + LLScriptEdCore* self = (LLScriptEdCore*)data; + self->xedLaunch(); +} + +// static void LLScriptEdCore::onBtnUndoChanges( void* userdata ) { LLScriptEdCore* self = (LLScriptEdCore*) userdata; @@ -904,6 +1155,12 @@ BOOL LLScriptEdCore::enableDeselectMenu(void* userdata) } // static +BOOL LLScriptEdCore::enableExternalEditor(void* userdata) +{ + return (gSavedSettings.getString("LSLExternalEditor").length() > 3); +} + +// static void LLScriptEdCore::onErrorList(LLUICtrl*, void* user_data) { LLScriptEdCore* self = (LLScriptEdCore*)user_data; @@ -989,6 +1246,11 @@ BOOL LLScriptEdCore::handleKeyHere(KEY key, MASK mask) if(mSaveCallback) { // don't close after saving + if (!hasChanged(this)) + { + llinfos << "Save Not Needed" << llendl; + return TRUE; + } mSaveCallback(mUserdata, FALSE); } @@ -1181,6 +1443,11 @@ void LLPreviewLSL::closeIfNeeded() mPendingUploads--; if (mPendingUploads <= 0 && mCloseAfterSave) { + if( !mScriptEd->mXfname.empty()) + { + llinfos << "remove autosave: " << mScriptEd->mXfname << llendl; + LLFile::remove(mScriptEd->mXfname.c_str()); + } close(); } } @@ -2349,6 +2616,11 @@ void LLLiveLSLEditor::closeIfNeeded() mPendingUploads--; if (mPendingUploads <= 0 && mCloseAfterSave) { + if( !mScriptEd->mXfname.empty()) + { + llinfos << "remove autosave: " << mScriptEd->mXfname << llendl; + LLFile::remove(mScriptEd->mXfname.c_str()); + } close(); } } diff --git a/linden/indra/newview/llpreviewscript.h b/linden/indra/newview/llpreviewscript.h index 8e61435..4de886e 100644 --- a/linden/indra/newview/llpreviewscript.h +++ b/linden/indra/newview/llpreviewscript.h @@ -40,6 +40,7 @@ #include "llcombobox.h" #include "lliconctrl.h" #include "llframetimer.h" +#include "lltimer.h" class LLMessageSystem; @@ -53,7 +54,7 @@ class LLMenuBarGL; class LLKeywordToken; // Inner, implementation class. LLPreviewScript and LLLiveLSLEditor each own one of these. -class LLScriptEdCore : public LLPanel +class LLScriptEdCore : public LLPanel, public LLEventTimer { friend class LLPreviewScript; friend class LLPreviewLSL; @@ -96,6 +97,8 @@ public: static void onBtnInsertFunction(LLUICtrl*, void*); static void doSave( void* userdata, BOOL close_after_save ); static void onBtnSave(void*); + static void onSetExternalEditor(void* data); + static void onBtnXEd(void*); static void onBtnUndoChanges(void*); static void onBtnSaveToDisc(void*); static void onBtnLoadFromDisc(void*); @@ -117,13 +120,21 @@ public: static BOOL enablePasteMenu(void* userdata); static BOOL enableSelectAllMenu(void* userdata); static BOOL enableDeselectMenu(void* userdata); + static BOOL enableExternalEditor(void* userdata); static BOOL hasChanged(void* userdata); void selectFirstError(); + + void autoSave(); + //dim external ed + void XedUpd(); + void xedLaunch(); virtual BOOL handleKeyHere(KEY key, MASK mask); + virtual BOOL tick(); + void enableSave(BOOL b) {mEnableSave = b;} protected: @@ -137,6 +148,9 @@ protected: private: std::string mSampleText; + std::string mAutosaveFilename; + std::string mXfname; + struct stat mXstbuf; std::string mHelpURL; std::string mScriptTitle; LLTextEditor* mEditor; @@ -155,6 +169,7 @@ private: LLFrameTimer mLiveHelpTimer; S32 mLiveHelpHistorySize; BOOL mEnableSave; + BOOL mEnableXEd; BOOL mHasScriptData; }; diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml index 2e91a82..9dda4ec 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml @@ -4,7 +4,7 @@ min_height="271" min_width="290" mouse_opaque="true" name="script ed float" rect_control="FloaterOpenObjectRect" title="Script: New Script" width="500" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0">