From 6a87cef1d449e8cdf8ebac53994a9a032792cf92 Mon Sep 17 00:00:00 2001 From: David Seikel Date: Wed, 9 Feb 2011 01:57:04 +1000 Subject: Change imprudence -> meta-impy, though not the URLs. Probably some will need to be reverted later. Changed file names to. --- .gitignore | 2 +- linden/indra/CMakeLists.txt | 6 +- linden/indra/cmake/00-Common.cmake | 2 +- linden/indra/cmake/CopyWinLibs.cmake | 8 +- linden/indra/cmake/UnixInstall.cmake | 4 +- linden/indra/cmake/Variables.cmake | 4 +- linden/indra/copy_win_scripts/start-client.py | 2 +- linden/indra/develop.py | 6 +- linden/indra/lib/python/indra/util/llmanifest.py | 4 +- .../linux_crash_logger/llcrashloggerlinux.cpp | 6 +- linden/indra/llcommon/llversionviewer.h | 6 +- linden/indra/llcrashlogger/llcrashlogger.cpp | 12 +- linden/indra/llvfs/lldir.cpp | 2 +- linden/indra/llvfs/lldir_mac.cpp | 4 +- linden/indra/llwindow/llwindowsdl.cpp | 2 +- linden/indra/mac_updater/mac_updater.cpp | 10 +- .../gstreamer010/media_plugin_gstreamer010.cpp | 4 +- linden/indra/newview/CMakeLists.txt | 24 +-- .../indra/newview/English.lproj/InfoPlist.strings | 6 +- linden/indra/newview/Imprudence.exe.config | 20 --- linden/indra/newview/ImprudenceDebug.exe.config | 20 --- linden/indra/newview/Info-Imprudence.plist | 39 ----- linden/indra/newview/Info-meta-impy.plist | 39 +++++ linden/indra/newview/SecondLife.nib/objects.xib | 8 +- linden/indra/newview/ViewerInstall.cmake | 2 +- linden/indra/newview/app_settings/settings.xml | 2 +- linden/indra/newview/imprudence.url | 2 - .../imprudence installer script experimental.iss | 194 --------------------- .../windows/imprudence installer script.iss | 193 -------------------- .../windows/imprudence_installer_icon_left.bmp | Bin 154542 -> 0 bytes .../windows/imprudence_installer_icon_right.bmp | Bin 8534 -> 0 bytes .../installers/windows/installer_template.nsi | 52 +++--- .../indra/newview/installers/windows/lang_de.nsi | 30 ++-- .../newview/installers/windows/lang_en-us.nsi | 26 +-- .../meta-impy installer script experimental.iss | 194 +++++++++++++++++++++ .../windows/meta-impy installer script.iss | 193 ++++++++++++++++++++ .../windows/meta-impy_installer_icon_left.bmp | Bin 0 -> 154542 bytes .../windows/meta-impy_installer_icon_right.bmp | Bin 0 -> 8534 bytes .../linux_tools/handle_secondlifeprotocol.sh | 4 +- linden/indra/newview/linux_tools/wrapper.sh | 2 +- linden/indra/newview/llappviewer.cpp | 16 +- linden/indra/newview/llappviewerwin32.cpp | 2 +- linden/indra/newview/llhoverview.cpp | 2 +- linden/indra/newview/llstartup.cpp | 8 +- linden/indra/newview/llwindebug.cpp | 4 +- linden/indra/newview/meta-impy.exe.config | 20 +++ linden/indra/newview/meta-impy.url | 2 + linden/indra/newview/meta-impyDebug.exe.config | 20 +++ linden/indra/newview/res-sdl/imprudence_icon.BMP | Bin 4662 -> 0 bytes linden/indra/newview/res-sdl/meta-impy_icon.BMP | Bin 0 -> 4662 bytes linden/indra/newview/res/imprudence_icon.png | Bin 32529 -> 0 bytes linden/indra/newview/res/meta-impy_icon.png | Bin 0 -> 32529 bytes linden/indra/newview/res/viewerRes.rc | 12 +- .../html/en-us/loading/imprudence_loading.png | Bin 10714 -> 0 bytes .../html/en-us/loading/meta-impy_loading.png | Bin 0 -> 10714 bytes .../skins/default/xui/en-us/notifications.xml | 2 +- .../skins/default/xui/en-us/panel_login.xml | 2 +- .../xui/en-us/panel_preferences_graphics1.xml | 2 +- linden/indra/newview/viewer_manifest.py | 74 ++++---- linden/indra/newview/viewerversion.cpp | 2 +- linden/indra/win_updater/updater.cpp | 6 +- 61 files changed, 654 insertions(+), 654 deletions(-) delete mode 100644 linden/indra/newview/Imprudence.exe.config delete mode 100644 linden/indra/newview/ImprudenceDebug.exe.config delete mode 100644 linden/indra/newview/Info-Imprudence.plist create mode 100644 linden/indra/newview/Info-meta-impy.plist delete mode 100644 linden/indra/newview/imprudence.url delete mode 100644 linden/indra/newview/installers/windows/imprudence installer script experimental.iss delete mode 100644 linden/indra/newview/installers/windows/imprudence installer script.iss delete mode 100644 linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp delete mode 100644 linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp create mode 100644 linden/indra/newview/installers/windows/meta-impy installer script experimental.iss create mode 100644 linden/indra/newview/installers/windows/meta-impy installer script.iss create mode 100644 linden/indra/newview/installers/windows/meta-impy_installer_icon_left.bmp create mode 100644 linden/indra/newview/installers/windows/meta-impy_installer_icon_right.bmp create mode 100644 linden/indra/newview/meta-impy.exe.config create mode 100644 linden/indra/newview/meta-impy.url create mode 100644 linden/indra/newview/meta-impyDebug.exe.config delete mode 100644 linden/indra/newview/res-sdl/imprudence_icon.BMP create mode 100644 linden/indra/newview/res-sdl/meta-impy_icon.BMP delete mode 100644 linden/indra/newview/res/imprudence_icon.png create mode 100644 linden/indra/newview/res/meta-impy_icon.png delete mode 100644 linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png create mode 100644 linden/indra/newview/skins/default/html/en-us/loading/meta-impy_loading.png diff --git a/.gitignore b/.gitignore index 1d91b1c..0304d81 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ linden/indra/newview/lib/ linden/indra/newview/dbghelp.dll linden/indra/newview/linux_tools/client-readme-voice.txt linden/indra/newview/vivox-runtime/ -linden/indra/newview/*.lproj/ +# linden/indra/newview/*.lproj/ linden/indra/newview/mozilla-theme/ linden/indra/test_apps/ diff --git a/linden/indra/CMakeLists.txt b/linden/indra/CMakeLists.txt index 64e0079..5ef5d2c 100644 --- a/linden/indra/CMakeLists.txt +++ b/linden/indra/CMakeLists.txt @@ -12,8 +12,8 @@ if (COMMAND cmake_policy) cmake_policy(SET CMP0003 OLD) endif (COMMAND cmake_policy) -set(ROOT_PROJECT_NAME "Imprudence" CACHE STRING - "The root project/makefile/solution name. Defaults to Imprudence.") +set(ROOT_PROJECT_NAME "meta-impy" CACHE STRING + "The root project/makefile/solution name. Defaults to meta-impy.") project(${ROOT_PROJECT_NAME}) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") @@ -91,7 +91,7 @@ if (VIEWER) endif (LINUX) add_subdirectory(${VIEWER_PREFIX}newview) - add_dependencies(viewer imprudence-bin) + add_dependencies(viewer meta-impy-bin) endif (VIEWER) # Linux builds the viewer and server in 2 separate projects diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 7e85ce0..0528f2a 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake @@ -169,7 +169,7 @@ if (LINUX) endif (SERVER) if (VIEWER) - add_definitions(-DAPPID=imprudence) + add_definitions(-DAPPID=meta-impy) add_definitions(-fvisibility=hidden) # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway. add_definitions(-DLL_IGNORE_SIGCHLD) diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index f584689..b4becf7 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake @@ -1,7 +1,7 @@ # -*- cmake -*- # The copy_win_libs folder contains file lists and a script used to -# copy dlls, exes and such needed to run Imprudence from within +# copy dlls, exes and such needed to run meta-impy from within # VisualStudio. include(CMakeCopyIfDifferent) @@ -282,7 +282,7 @@ if(EXISTS ${debug_msvc8_redist_path}) ARGS ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest - ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config + ${CMAKE_CURRENT_SOURCE_DIR}/meta-impyDebug.exe.config ${debug_appconfig_file} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest COMMENT "Creating debug app config file" @@ -327,7 +327,7 @@ if(EXISTS ${release_msvc8_redist_path}) ARGS ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest - ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config + ${CMAKE_CURRENT_SOURCE_DIR}/meta-impy.exe.config ${release_appconfig_file} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest COMMENT "Creating release app config file" @@ -340,7 +340,7 @@ if(EXISTS ${release_msvc8_redist_path}) 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 + ${CMAKE_CURRENT_SOURCE_DIR}/meta-impy.exe.config ${relwithdebinfo_appconfig_file} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest COMMENT "Creating relwithdebinfo app config file" diff --git a/linden/indra/cmake/UnixInstall.cmake b/linden/indra/cmake/UnixInstall.cmake index 0234dee..73f6714 100644 --- a/linden/indra/cmake/UnixInstall.cmake +++ b/linden/indra/cmake/UnixInstall.cmake @@ -21,11 +21,11 @@ if (INSTALL) set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH "Installation directory for read-only shared files.") - set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/imprudence-${viewer_VERSION} + set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/meta-impy-${viewer_VERSION} CACHE PATH "Installation directory for binaries.") - set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/imprudence-${viewer_VERSION} + set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/meta-impy-${viewer_VERSION} CACHE PATH "Installation directory for read-only data files.") endif (INSTALL) diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake index eb9c004..37e77ae 100644 --- a/linden/indra/cmake/Variables.cmake +++ b/linden/indra/cmake/Variables.cmake @@ -74,10 +74,10 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(GRID agni CACHE STRING "Target Grid") set(VIEWER ON CACHE BOOL "Build Second Life viewer.") -set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name") +set(VIEWER_CHANNEL "meta-impy" CACHE STRING "Viewer Channel Name") set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") -set(STANDALONE OFF CACHE BOOL "Do not use Imprudence-supplied prebuilt libraries.") +set(STANDALONE OFF CACHE BOOL "Do not use meta-impy-supplied prebuilt libraries.") if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) set(SERVER ON CACHE BOOL "Build Second Life server software.") diff --git a/linden/indra/copy_win_scripts/start-client.py b/linden/indra/copy_win_scripts/start-client.py index ea2b67a..036468f 100755 --- a/linden/indra/copy_win_scripts/start-client.py +++ b/linden/indra/copy_win_scripts/start-client.py @@ -32,7 +32,7 @@ def start_client(grid, slurl, build_config, my_args): f = open("start-client.log", "w") print >>f, "Viewer startup arguments:" llstart.start("viewer", "../../newview", - "%s/newview/%s/imprudence-bin.exe" % (build_path, build_config), + "%s/newview/%s/meta-impy-bin.exe" % (build_path, build_config), viewer_args, f) f.close() diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 6fe565e..c909a1b 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py @@ -77,7 +77,7 @@ class PlatformSetup(object): standalone = 'OFF' unattended = 'OFF' universal = 'OFF' - project_name = 'Imprudence' + project_name = 'meta-impy' distcc = True cmake_opts = [] @@ -632,9 +632,9 @@ class WindowsSetup(PlatformSetup): continue vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') + ' --solution ' + - os.path.join(build_dir,'Imprudence.sln') + + os.path.join(build_dir,'meta-impy.sln') + ' --config ' + self.build_type + - ' --startup imprudence-bin') + ' --startup meta-impy-bin') print 'Running %r in %r' % (vstool_cmd, getcwd()) self.run(vstool_cmd) print >> open(stamp, 'w'), self.build_type diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py index fc777b2..f82394d 100644 --- a/linden/indra/lib/python/indra/util/llmanifest.py +++ b/linden/indra/lib/python/indra/util/llmanifest.py @@ -99,7 +99,7 @@ def get_channel(srctree): DEFAULT_SRCTREE = os.path.dirname(sys.argv[0]) -DEFAULT_CHANNEL = 'Imprudence' +DEFAULT_CHANNEL = 'meta-impy' ARGUMENTS=[ dict(name='actions', @@ -163,7 +163,7 @@ ARGUMENTS=[ for use by a .bat file.""", default=None), dict(name='version', - description="""This specifies the version of Imprudence that is + description="""This specifies the version of meta-impy that is being packaged up.""", default=get_default_version) ] diff --git a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp index a275ffc..7cd402d 100644 --- a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp +++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp @@ -54,13 +54,13 @@ // These need to be localized. static const char dialog_text[] = -"Imprudence appears to have crashed or frozen last time it ran.\n" -"This crash reporter collects information about your computer's hardware, operating system, and some Imprudence logs, all of which are used for debugging purposes only.\n" +"meta-impy appears to have crashed or frozen last time it ran.\n" +"This crash reporter collects information about your computer's hardware, operating system, and some meta-impy logs, all of which are used for debugging purposes only.\n" "\n" "Send crash report?"; static const char dialog_title[] = -"Imprudence Crash Logger"; +"meta-impy0 Crash Logger"; #if LL_GTK static void response_callback (GtkDialog *dialog, diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index ab74a3f..ad6a88a 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h @@ -44,11 +44,11 @@ const char * const LL_VIEWER_NAME = "Second Life"; // These aren't used anymore. // The channel is ViewerChannelName in settings.xml -// The Imprudence version is set in app_settings\viewerversion.xml -- MC +// The meta-impy version is set in app_settings\viewerversion.xml -- MC -/*const char * const LL_CHANNEL = "Imprudence"; +/*const char * const LL_CHANNEL = "meta-impy"; -const char * const IMP_VIEWER_NAME = "Imprudence"; +const char * const IMP_VIEWER_NAME = "meta-impy"; const S32 IMP_VERSION_MAJOR = 1; const S32 IMP_VERSION_MINOR = 3; diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp index d25be55..aac5592 100755 --- a/linden/indra/llcrashlogger/llcrashlogger.cpp +++ b/linden/indra/llcrashlogger/llcrashlogger.cpp @@ -203,7 +203,7 @@ void LLCrashLogger::gatherFiles() { // Figure out the filename of the second life log LLCurl::setCAFile(gDirUtilp->getCAFile()); - mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"Imprudence.log"); + mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"meta-impy.log"); mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml"); } @@ -335,7 +335,7 @@ bool LLCrashLogger::sendCrashLogs() updateApplication("Sending reports..."); std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, - "ImprudenceCrashReport"); + "meta-impyCrashReport"); std::string report_file = dump_path + ".log"; std::ofstream out_file(report_file.c_str()); @@ -369,10 +369,10 @@ void LLCrashLogger::updateApplication(const std::string& message) bool LLCrashLogger::init() { // We assume that all the logs we're looking for reside on the current drive - gDirUtilp->initAppDirs("Imprudence"); + gDirUtilp->initAppDirs("meta-impy"); - // Default to the product name "Imprudence" (this is overridden by the -name argument) - mProductName = "Imprudence"; + // Default to the product name "meta-impy" (this is overridden by the -name argument) + mProductName = "meta-impy"; mCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes " "(0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)"); @@ -394,7 +394,7 @@ bool LLCrashLogger::init() //If we've opened the crash logger, assume we can delete the marker file if it exists if( gDirUtilp ) { - std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"Imprudence.exec_marker"); + std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"meta-impy.exec_marker"); LLAPRFile::remove( marker_file ); } diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp index 0c93cbb..dbb057f 100644 --- a/linden/indra/llvfs/lldir.cpp +++ b/linden/indra/llvfs/lldir.cpp @@ -249,7 +249,7 @@ std::string LLDir::buildSLOSCacheDir() const } else { - res = getOSCacheDir() + mDirDelimiter + "ImprudenceExperimental"; + res = getOSCacheDir() + mDirDelimiter + "meta-impyExperimental"; } return res; } diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp index 6f0b037..7fb235b 100644 --- a/linden/indra/llvfs/lldir_mac.cpp +++ b/linden/indra/llvfs/lldir_mac.cpp @@ -122,7 +122,7 @@ LLDir_Mac::LLDir_Mac() CFStringRef stringRef = NULL; OSStatus error = noErr; FSRef fileRef; - CFStringRef secondLifeString = CFSTR("Imprudence"); + CFStringRef secondLifeString = CFSTR("meta-impy"); mainBundleRef = CFBundleGetMainBundle(); @@ -173,7 +173,7 @@ LLDir_Mac::LLDir_Mac() if (error == noErr) { FSRefToLLString(&cacheDirRef, mOSCacheDir); - (void)CFCreateDirectory(&cacheDirRef, CFSTR("ImprudenceExperimental"),NULL); + (void)CFCreateDirectory(&cacheDirRef, CFSTR("meta-impyExperimental"),NULL); } // mOSUserAppDir diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp index f7d7587..1933888 100644 --- a/linden/indra/llwindow/llwindowsdl.cpp +++ b/linden/indra/llwindow/llwindowsdl.cpp @@ -469,7 +469,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B // Set the application icon. SDL_Surface *bmpsurface; - bmpsurface = Load_BMP_Resource("imprudence_icon.BMP"); + bmpsurface = Load_BMP_Resource("meta-impy_icon.BMP"); if (bmpsurface) { // This attempts to give a black-keyed mask to the icon. diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp index cf9de4b..64afff8 100644 --- a/linden/indra/mac_updater/mac_updater.cpp +++ b/linden/indra/mac_updater/mac_updater.cpp @@ -379,7 +379,7 @@ int main(int argc, char **argv) } else { - gProductName = "Imprudence"; + gProductName = "meta-impy"; } } @@ -472,7 +472,7 @@ int main(int argc, char **argv) err = CreateStandardAlert( kAlertStopAlert, CFSTR("Error"), - CFSTR("An error occurred while updating Imprudence. Please download the latest version from http://imprudenceviewer.org/download/"), + CFSTR("An error occurred while updating meta-impy. Please download the latest version from http://imprudenceviewer.org/download/"), ¶ms, &alert); @@ -935,7 +935,7 @@ void *updatethreadproc(void*) #endif // 0 *HACK for DEV-11935 - strncat(temp, "/ImprudenceUpdate_XXXXXX", (sizeof(temp) - strlen(temp)) - 1); + strncat(temp, "/meta-impyUpdate_XXXXXX", (sizeof(temp) - strlen(temp)) - 1); if(mkdtemp(temp) == NULL) { throw 0; @@ -953,7 +953,7 @@ void *updatethreadproc(void*) chdir(tempDir); - snprintf(temp, sizeof(temp), "Imprudence.dmg"); + snprintf(temp, sizeof(temp), "meta-impy.dmg"); downloadFile = LLFile::fopen(temp, "wb"); /* Flawfinder: ignore */ if(downloadFile == NULL) @@ -1000,7 +1000,7 @@ void *updatethreadproc(void*) // NOTE: we could add -private at the end of this command line to keep the image from showing up in the Finder, // but if our cleanup fails, this makes it much harder for the user to unmount the image. std::string mountOutput; - FILE* mounter = popen("hdiutil attach Imprudence.dmg -mountpoint mnt", "r"); /* Flawfinder: ignore */ + FILE* mounter = popen("hdiutil attach meta-impy.dmg -mountpoint mnt", "r"); /* Flawfinder: ignore */ if(mounter == NULL) { diff --git a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp index ed6d920..3637f6b 100755 --- a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp +++ b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp @@ -945,7 +945,7 @@ void MediaPluginGStreamer010::set_gst_plugin_path() return; } - DEBUGMSG("Imprudence is installed at %s", imp_dir); + DEBUGMSG("meta-impy is installed at %s", imp_dir); // ":" on Mac and 'Nix, ";" on Windows std::string separator = G_SEARCHPATH_SEPARATOR_S; @@ -963,7 +963,7 @@ void MediaPluginGStreamer010::set_gst_plugin_path() } - // Search both Imprudence and Imprudence\lib\gstreamer-plugins. + // Search both meta-impy and meta-impy\lib\gstreamer-plugins. // But we also want to search the path the user has set, if any. std::string plugin_path = "GST_PLUGIN_PATH=" + diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index ed6ac78..c7d46c2 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -503,7 +503,7 @@ set(viewer_SOURCE_FILES wlsettingsmanager.cpp ) -set(VIEWER_BINARY_NAME "imprudence-bin" CACHE STRING +set(VIEWER_BINARY_NAME "meta-impy-bin" CACHE STRING "The name of the viewer executable to create.") if (LINUX) @@ -993,8 +993,8 @@ if (DARWIN) viewer.icns macview.r gpu_table.txt - Info-Imprudence.plist - Imprudence.nib/ + Info-meta-impy.plist + meta-impy.nib/ # CMake doesn't seem to support Xcode language variants well just yet English.lproj/InfoPlist.strings English.lproj/language.txt @@ -1060,7 +1060,7 @@ if (WINDOWS) res/arrowdrag.cur res/circleandline.cur res/imp_icon.ico - res/imprudence_icon.png + res/meta-impy_icon.png res/llarrow.cur res/llarrowdrag.cur res/llarrowdragmulti.cur @@ -1421,13 +1421,13 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH if (LINUX) add_custom_command( - OUTPUT imprudence-stripped + OUTPUT meta-impy-stripped COMMAND strip - ARGS --strip-debug -o imprudence-stripped ${VIEWER_BINARY_NAME} - DEPENDS imprudence-bin + ARGS --strip-debug -o meta-impy-stripped ${VIEWER_BINARY_NAME} + DEPENDS meta-impy-bin ) - set(product Imprudence-${ARCH}-${viewer_VERSION}) + set(product meta-impy-${ARCH}-${viewer_VERSION}) add_custom_command( OUTPUT ${product}.tar.bz2 @@ -1446,7 +1446,7 @@ if (LINUX) --build=${CMAKE_CURRENT_BINARY_DIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched - DEPENDS imprudence-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + DEPENDS meta-impy-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_gstreamer010 media_plugin_webkit) @@ -1458,16 +1458,16 @@ if (LINUX) endif (LINUX) if (DARWIN) - set(product "Imprudence") + set(product "meta-impy") set_target_properties( ${VIEWER_BINARY_NAME} PROPERTIES OUTPUT_NAME "${product}" MACOSX_BUNDLE_INFO_STRING "info string - localize me" MACOSX_BUNDLE_ICON_FILE "viewer.icns" - MACOSX_BUNDLE_GUI_IDENTIFIER "Imprudence" + MACOSX_BUNDLE_GUI_IDENTIFIER "meta-impy" MACOSX_BUNDLE_LONG_VERSION_STRING "ververver" - MACOSX_BUNDLE_BUNDLE_NAME "Imprudence" + MACOSX_BUNDLE_BUNDLE_NAME "meta-impy" MACOSX_BUNDLE_SHORT_VERSION_STRING "asdf" MACOSX_BUNDLE_BUNDLE_VERSION "asdf" MACOSX_BUNDLE_COPYRIGHT "copyright linden lab 2007 - localize me and run me through a legal wringer" diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings index 8f9c4f5..17a0b7c 100644 --- a/linden/indra/newview/English.lproj/InfoPlist.strings +++ b/linden/indra/newview/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ -CFBundleName = "Imprudence"; -CFBundleShortVersionString = "Imprudence Experimental 2010.09.04"; -CFBundleGetInfoString = "Imprudence Experimental 2010.09.04"; +CFBundleName = "meta-impy"; +CFBundleShortVersionString = "meta-impy Experimental 2010.09.04"; +CFBundleGetInfoString = "meta-impy Experimental 2010.09.04"; diff --git a/linden/indra/newview/Imprudence.exe.config b/linden/indra/newview/Imprudence.exe.config deleted file mode 100644 index 293a9ba..0000000 --- a/linden/indra/newview/Imprudence.exe.config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/linden/indra/newview/ImprudenceDebug.exe.config b/linden/indra/newview/ImprudenceDebug.exe.config deleted file mode 100644 index 04d0e00..0000000 --- a/linden/indra/newview/ImprudenceDebug.exe.config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist deleted file mode 100644 index e7dc82d..0000000 --- a/linden/indra/newview/Info-Imprudence.plist +++ /dev/null @@ -1,39 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - Imprudence - CFBundleIconFile - viewer.icns - CFBundleIdentifier - org.imprudenceviewer.viewer - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Imprudence - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleURLName - Second Life URL - CFBundleURLSchemes - - secondlife - - LSIsAppleDefaultForScheme - - - - CFBundleVersion - Experimental 2010.10.23 - CSResourcesFileMapped - - - diff --git a/linden/indra/newview/Info-meta-impy.plist b/linden/indra/newview/Info-meta-impy.plist new file mode 100644 index 0000000..c5b413e --- /dev/null +++ b/linden/indra/newview/Info-meta-impy.plist @@ -0,0 +1,39 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + meta-impy + CFBundleIconFile + viewer.icns + CFBundleIdentifier + org.imprudenceviewer.viewer + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + meta-impy + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleURLName + Second Life URL + CFBundleURLSchemes + + secondlife + + LSIsAppleDefaultForScheme + + + + CFBundleVersion + Experimental 2010.10.23 + CSResourcesFileMapped + + + diff --git a/linden/indra/newview/SecondLife.nib/objects.xib b/linden/indra/newview/SecondLife.nib/objects.xib index 553b6f3..7ef13e0 100644 --- a/linden/indra/newview/SecondLife.nib/objects.xib +++ b/linden/indra/newview/SecondLife.nib/objects.xib @@ -6,17 +6,17 @@ - Imprudence + meta-impy - Imprudence + meta-impy - Imprudence + meta-impy TRUE TRUE - About Imprudence + About meta-impy 0 abou diff --git a/linden/indra/newview/ViewerInstall.cmake b/linden/indra/newview/ViewerInstall.cmake index bc839c4..0959280 100644 --- a/linden/indra/newview/ViewerInstall.cmake +++ b/linden/indra/newview/ViewerInstall.cmake @@ -1,4 +1,4 @@ -install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/imprudence-bin +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/meta-impy-bin DESTINATION ${APP_BINARY_DIR} ) diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 1d3a44f..67df287 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -13422,7 +13422,7 @@ Type String Value - Imprudence + meta-impy VertexShaderEnable diff --git a/linden/indra/newview/imprudence.url b/linden/indra/newview/imprudence.url deleted file mode 100644 index 9cc3cc0..0000000 --- a/linden/indra/newview/imprudence.url +++ /dev/null @@ -1,2 +0,0 @@ -[InternetShortcut] -URL=http://imprudenceviewer.org/wiki/Features \ No newline at end of file diff --git a/linden/indra/newview/installers/windows/imprudence installer script experimental.iss b/linden/indra/newview/installers/windows/imprudence installer script experimental.iss deleted file mode 100644 index d62e210..0000000 --- a/linden/indra/newview/installers/windows/imprudence installer script experimental.iss +++ /dev/null @@ -1,194 +0,0 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -[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={{1B3E68BC-13EB-4277-9439-CB5FF9259460} -AppName=Imprudence Viewer Experimental Release -AppVerName=Imprudence Viewer 1.4.0 Experimental 2010.09.04 -DefaultDirName={pf}\ImprudenceExperimental -DefaultGroupName=Imprudence Viewer Experimental Release -VersionInfoProductName=Imprudence Viewer Experimental Release -OutputBaseFilename=Imprudence-1.4.0-experimental-2010.09.04-Setup -VersionInfoVersion=1.4.0 -VersionInfoTextVersion=1.4.0 -VersionInfoProductVersion=1.4.0 -VersionInfoCopyright=2010 -AppCopyright=2010 - -; These won't change -VersionInfoCompany=Imprudence -AppPublisher=The Imprudence Project -AppPublisherURL=http://www.imprudenceviewer.org -AppSupportURL=http://www.imprudenceviewer.org -AppUpdatesURL=http://www.imprudenceviewer.org -AllowNoIcons=true -InfoAfterFile=..\windows\README.txt -OutputDir=C:\ -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 - -[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: C:\imp_1.3\imprudence.exe; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs -Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs -Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs -Source: C:\imp_1.3\skins\*; DestDir: {app}\skins; Flags: ignoreversion recursesubdirs createallsubdirs -Source: C:\imp_1.3\doc\*; DestDir: {app}\doc; Flags: ignoreversion recursesubdirs createallsubdirs -Source: C:\imp_1.3\lib\*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs createallsubdirs -Source: C:\imp_1.3\alut.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\ChangeLog.txt; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\charset.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\dbghelp.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\featuretable.txt; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\freebl3.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\imprudence.exe.config; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\imprudence.url; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libfaad-2.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgcrypt-11.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgio-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgnutls-26.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgobject-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgpg-error-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstapp.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstaudio.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstaudio-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstbase-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstcdda.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstcontroller-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstdataprotocol-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstdshow.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstfft.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstinterfaces.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstnet-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstnetbuffer.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstpbutils.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstreamer-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstriff.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstrtp.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstrtsp.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstsdp.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgsttag.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstvideo.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgthread-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libhunspell.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libjpeg.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libmp3lame-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libneon-27.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libogg-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\liboil-0.3-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libopenjpeg-2.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libpng12-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libschroedinger-1.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libspeex-1.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libtheora-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libvorbisenc-2.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libxml2.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\llkdu.dll.2.config; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\Microsoft.VC80.CRT.manifest; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\msvcp80.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\msvcr80.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\nspr4.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\nss3.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\nssckbi.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\openal32.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\OpenJPEG.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\plc4.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\plds4.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\smime3.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\softokn3.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\ssl3.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\xpcom.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\xul.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\xvidcore.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\zlib1.dll; DestDir: {app}; Flags: ignoreversion - -; Voice files -Source: C:\imp_1.3\ortp.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\SLVoice.exe; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion - -; Old files we don't use anymore -; Source: C:\imp_1.3\dronesettings.xml; DestDir: {app}; Flags: ignoreversion -; Source: C:\imp_1.3\volume_settings.xml; DestDir: {app}; Flags: ignoreversion -; Source: C:\imp_1.3\srtp.dll; DestDir: {app}; Flags: ignoreversion -; Source: C:\imp_1.3\ssleay32.dll; DestDir: {app}; Flags: ignoreversion -; Source: C:\imp_1.3\tntk.dll; DestDir: {app}; Flags: ignoreversion -; Source: C:\imp_1.3\libeay32.dll; DestDir: {app}; Flags: ignoreversion -; Source: C:\imp_1.3\lsl_guide.html; DestDir: {app}; Flags: ignoreversion - -; NOTE: Don't use "Flags: ignoreversion" on any shared system files -;Source: C:\imp_1.3\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 Experimental}; Filename: {uninstallexe} -Name: {commondesktop}\Imprudence Experimental; Filename: {app}\imprudence.exe; Tasks: desktopicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app}; IconIndex: 0 -Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Imprudence Experimental; Filename: {app}\imprudence.exe; Tasks: quicklaunchicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app} -Name: {group}\Imprudence Experimental; 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 - -[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: -; Name: {app}\skins\silver\xui\*; 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: 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 6ea24c6..0000000 --- a/linden/indra/newview/installers/windows/imprudence installer script.iss +++ /dev/null @@ -1,193 +0,0 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -[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.3.0 RC2 (SSE2 optimized) -DefaultDirName={pf}\Imprudence -DefaultGroupName=Imprudence Viewer -VersionInfoProductName=Imprudence Viewer -OutputBaseFilename=Imprudence-1.3.0-RC2-(SSE2-optimized)-Setup -VersionInfoVersion=1.3.0 -VersionInfoTextVersion=1.3.0 -VersionInfoProductVersion=1.3.0 -VersionInfoCopyright=2010 -AppCopyright=2010 - -; These won't change -VersionInfoCompany=Imprudence -AppPublisher=The Imprudence Project -AppPublisherURL=http://www.imprudenceviewer.org -AppSupportURL=http://www.imprudenceviewer.org -AppUpdatesURL=http://www.imprudenceviewer.org -AllowNoIcons=true -InfoAfterFile=..\windows\README.txt -OutputDir=C:\ -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 - -[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: C:\imp_1.3\imprudence.exe; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs -Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs -Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs -Source: C:\imp_1.3\skins\*; DestDir: {app}\skins; Flags: ignoreversion recursesubdirs createallsubdirs -Source: C:\imp_1.3\doc\*; DestDir: {app}\doc; Flags: ignoreversion recursesubdirs createallsubdirs -Source: C:\imp_1.3\lib\*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs createallsubdirs -Source: C:\imp_1.3\alut.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\ChangeLog.txt; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\charset.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\dbghelp.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\featuretable.txt; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\freebl3.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\imprudence.exe.config; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\imprudence.url; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libfaad-2.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgcrypt-11.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgio-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgnutls-26.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgobject-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgpg-error-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstapp.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstaudio.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstaudio-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstbase-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstcdda.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstcontroller-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstdataprotocol-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstdshow.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstfft.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstinterfaces.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstnet-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstnetbuffer.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstpbutils.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstreamer-0.10.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstriff.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstrtp.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstrtsp.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstsdp.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgsttag.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgstvideo.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libgthread-2.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libjpeg.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libmp3lame-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libneon-27.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libogg-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\liboil-0.3-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libopenjpeg-2.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libpng12-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libschroedinger-1.0-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libspeex-1.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libtheora-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libvorbisenc-2.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\libxml2.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\llkdu.dll.2.config; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\Microsoft.VC80.CRT.manifest; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\msvcp80.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\msvcr80.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\nspr4.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\nss3.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\nssckbi.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\openal32.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\OpenJPEG.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\plc4.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\plds4.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\smime3.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\softokn3.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\ssl3.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\xpcom.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\xul.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\xvidcore.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\zlib1.dll; DestDir: {app}; Flags: ignoreversion - -; Voice files -Source: C:\imp_1.3\ortp.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\SLVoice.exe; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion -Source: C:\imp_1.3\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion - -; Old files we don't use anymore -; Source: C:\imp_1.3\dronesettings.xml; DestDir: {app}; Flags: ignoreversion -; Source: C:\imp_1.3\volume_settings.xml; DestDir: {app}; Flags: ignoreversion -; Source: C:\imp_1.3\srtp.dll; DestDir: {app}; Flags: ignoreversion -; Source: C:\imp_1.3\ssleay32.dll; DestDir: {app}; Flags: ignoreversion -; Source: C:\imp_1.3\tntk.dll; DestDir: {app}; Flags: ignoreversion -; Source: C:\imp_1.3\libeay32.dll; DestDir: {app}; Flags: ignoreversion -; Source: C:\imp_1.3\lsl_guide.html; DestDir: {app}; Flags: ignoreversion - -; NOTE: Don't use "Flags: ignoreversion" on any shared system files -;Source: C:\imp_1.3\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 - -[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: -; Name: {app}\skins\silver\xui\*; 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: diff --git a/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp b/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp deleted file mode 100644 index 79fd407..0000000 Binary files a/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp and /dev/null differ diff --git a/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp b/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp deleted file mode 100644 index 1c1d5dc..0000000 Binary files a/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp and /dev/null differ diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi index 8afde89..ee79954 100644 --- a/linden/indra/newview/installers/windows/installer_template.nsi +++ b/linden/indra/newview/installers/windows/installer_template.nsi @@ -287,7 +287,7 @@ FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Function CloseSecondLife Push $0 - FindWindow $0 "Imprudence" "" + FindWindow $0 "meta-impy" "" IntCmp $0 0 DONE MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL @@ -299,7 +299,7 @@ Function CloseSecondLife SendMessage $0 16 0 0 LOOP: - FindWindow $0 "Imprudence" "" + FindWindow $0 "meta-impy" "" IntCmp $0 0 DONE Sleep 500 Goto LOOP @@ -344,12 +344,12 @@ FunctionEnd ; FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Delete files in Documents and Settings\\Imprudence\cache -; Delete files in Documents and Settings\All Users\Imprudence\cache +; Delete files in Documents and Settings\\meta-impy\cache +; Delete files in Documents and Settings\All Users\meta-impy\cache ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;Function RemoveCacheFiles ; -;; Delete files in Documents and Settings\\Imprudence +;; Delete files in Documents and Settings\\meta-impy ;Push $0 ;Push $1 ;Push $2 @@ -368,7 +368,7 @@ FunctionEnd ; ExpandEnvStrings $2 $2 ; ; ; When explicitly uninstalling, everything goes away -; RMDir /r "$2\Application Data\Imprudence\cache" +; RMDir /r "$2\Application Data\meta-impy\cache" ; ; CONTINUE: ; IntOp $0 $0 + 1 @@ -378,17 +378,17 @@ FunctionEnd ;Pop $1 ;Pop $0 ; -;; Delete files in Documents and Settings\All Users\Imprudence +;; Delete files in Documents and Settings\All Users\meta-impy ;Push $0 ; ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData" ; StrCmp $0 "" +2 -; RMDir /r "$0\Imprudence\cache" +; RMDir /r "$0\meta-impy\cache" ;Pop $0 ; -;; Delete filse in C:\Windows\Application Data\Imprudence +;; Delete filse in C:\Windows\Application Data\meta-impy ;; If the user is running on a pre-NT system, Application Data lives here instead of ;; in Documents and Settings. -;RMDir /r "$WINDIR\Application Data\Imprudence\cache" +;RMDir /r "$WINDIR\Application Data\meta-impy\cache" ; ;FunctionEnd @@ -438,12 +438,12 @@ FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Delete files in Documents and Settings\\Imprudence -; Delete files in Documents and Settings\All Users\Imprudence +; Delete files in Documents and Settings\\meta-impy +; Delete files in Documents and Settings\All Users\meta-impy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Function un.DocumentsAndSettingsFolder -; Delete files in Documents and Settings\\Imprudence +; Delete files in Documents and Settings\\meta-impy Push $0 Push $1 Push $2 @@ -466,13 +466,13 @@ Push $2 ; Otherwise (preview/dmz etc) just remove cache StrCmp $INSTFLAGS "" RM_ALL RM_CACHE RM_ALL: - RMDir /r "$2\Application Data\Imprudence" + RMDir /r "$2\Application Data\meta-impy" RM_CACHE: # Local Settings directory is the cache, there is no "cache" subdir - RMDir /r "$2\Local Settings\Application Data\Imprudence" + RMDir /r "$2\Local Settings\Application Data\meta-impy" # Vista version of the same - RMDir /r "$2\AppData\Local\Imprudence" - Delete "$2\Application Data\Imprudence\user_settings\settings_windlight.xml" + RMDir /r "$2\AppData\Local\meta-impy" + Delete "$2\Application Data\meta-impy\user_settings\settings_windlight.xml" CONTINUE: IntOp $0 $0 + 1 @@ -483,17 +483,17 @@ Pop $2 Pop $1 Pop $0 -; Delete files in Documents and Settings\All Users\Imprudence +; Delete files in Documents and Settings\All Users\meta-impy Push $0 ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData" StrCmp $0 "" +2 - RMDir /r "$0\Imprudence" + RMDir /r "$0\meta-impy" Pop $0 -; Delete filse in C:\Windows\Application Data\Imprudence +; Delete filse in C:\Windows\Application Data\meta-impy ; If the user is running on a pre-NT system, Application Data lives here instead of ; in Documents and Settings. -RMDir /r "$WINDIR\Application Data\Imprudence" +RMDir /r "$WINDIR\Application Data\meta-impy" FunctionEnd @@ -503,7 +503,7 @@ FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Function un.CloseSecondLife Push $0 - FindWindow $0 "Imprudence" "" + FindWindow $0 "meta-impy" "" IntCmp $0 0 DONE MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL @@ -515,7 +515,7 @@ Function un.CloseSecondLife SendMessage $0 16 0 0 LOOP: - FindWindow $0 "Imprudence" "" + FindWindow $0 "meta-impy" "" IntCmp $0 0 DONE Sleep 500 Goto LOOP @@ -536,7 +536,7 @@ Function un.RemovePassword DetailPrint "Removing Second Life password" SetShellVarContext current -Delete "$APPDATA\Imprudence\user_settings\password.dat" +Delete "$APPDATA\meta-impy\user_settings\password.dat" SetShellVarContext all FunctionEnd @@ -758,11 +758,11 @@ SectionEnd ; end of uninstall section !macroend Function GetProgramName - !insertmacro GetParameterValue "/P=" "Imprudence" + !insertmacro GetParameterValue "/P=" "meta-impy" FunctionEnd Function un.GetProgramName - !insertmacro GetParameterValue "/P=" "Imprudence" + !insertmacro GetParameterValue "/P=" "meta-impy" FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/linden/indra/newview/installers/windows/lang_de.nsi b/linden/indra/newview/installers/windows/lang_de.nsi index e45b3b1..5e21cb3 100644 --- a/linden/indra/newview/installers/windows/lang_de.nsi +++ b/linden/indra/newview/installers/windows/lang_de.nsi @@ -6,52 +6,52 @@ LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update" LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup" ; description on license page -LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Imprudence mit Version ${VERSION_LONG}. ersetzen." -LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Imprudence auf Ihrem Computer installieren." +LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte meta-impy mit Version ${VERSION_LONG}. ersetzen." +LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird meta-impy auf Ihrem Computer installieren." LangString LicenseDescNext ${LANG_GERMAN} "Weiter" ; installation directory text LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner" -LangString DirectoryChooseUpdate ${LANG_GERMAN} "Wählen Sie den Imprudence Ordner für dieses Update:" -LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Imprudence installieren werden soll:" +LangString DirectoryChooseUpdate ${LANG_GERMAN} "Wählen Sie den meta-impy Ordner für dieses Update:" +LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem meta-impy installieren werden soll:" ; CheckStartupParams message box LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen." ; installation success dialog -LangString InstSuccesssQuestion ${LANG_GERMAN} "Imprudence starten?" +LangString InstSuccesssQuestion ${LANG_GERMAN} "meta-impy starten?" ; remove old NSIS version LangString RemoveOldNSISVersion ${LANG_GERMAN} "Überprüfe alte Version ..." ; check windows version LangString CheckWindowsVersionDP ${LANG_GERMAN} "Überprüfung der Windows Version ..." -LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Imprudence unterstützt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, könnte zu unvorhersehbaren Abstürzen und Datenverlust führen.$\n$\nTrotzdem installieren?' +LangString CheckWindowsVersionMB ${LANG_GERMAN} 'meta-impy unterstützt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, könnte zu unvorhersehbaren Abstürzen und Datenverlust führen.$\n$\nTrotzdem installieren?' ; checkifadministrator function (install) LangString CheckAdministratorInstDP ${LANG_GERMAN} "Überprüfung der Installations-Berechtigungen ..." -LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Imprudence installieren zu können.' +LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um meta-impy installieren zu können.' ; checkifadministrator function (uninstall) LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "Überprüfung der Entfernungs-Berechtigungen ..." -LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Imprudence entfernen zu können..' +LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um meta-impy entfernen zu können..' ; checkifalreadycurrent -LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Imprudence ${VERSION_LONG} bereits installiert.$\n$\nWürden Sie es gerne erneut installieren?" +LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist meta-impy ${VERSION_LONG} bereits installiert.$\n$\nWürden Sie es gerne erneut installieren?" ; closeimprudence function (install) -LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..." -LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Imprudence kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen." +LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von meta-impy ..." +LangString CloseSecondLifeInstMB ${LANG_GERMAN} "meta-impy kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um meta-impy zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen." ; closeimprudence function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..." -LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Imprudence kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um abzubrechen." +LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von meta-impy ..." +LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "meta-impy kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um meta-impy zu beenden.$\nKlicken Sie CANCEL, um abzubrechen." ; removecachefiles LangString RemoveCacheFilesDP ${LANG_GERMAN} "Löschung aller Cache Dateien in Dokumente und Einstellungen." ; delete program files -LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem Imprudence Programm Ordner.$\n$\nDies sind möglicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nMöchten Sie diese ebenfalls löschen?" +LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem meta-impy Programm Ordner.$\n$\nDies sind möglicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nMöchten Sie diese ebenfalls löschen?" ; uninstall text -LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Imprudence ${VERSION_LONG} von Ihrem System entfernen." +LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird meta-impy ${VERSION_LONG} von Ihrem System entfernen." diff --git a/linden/indra/newview/installers/windows/lang_en-us.nsi b/linden/indra/newview/installers/windows/lang_en-us.nsi index 0d28c3f..5612418 100644 --- a/linden/indra/newview/installers/windows/lang_en-us.nsi +++ b/linden/indra/newview/installers/windows/lang_en-us.nsi @@ -7,46 +7,46 @@ LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup" ; installation directory text LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory" -LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Imprudence directory to update to version ${VERSION_LONG}.(XXX):" -LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Imprudence in:" +LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the meta-impy directory to update to version ${VERSION_LONG}.(XXX):" +LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install meta-impy in:" ; CheckStartupParams message box LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed." ; installation success dialog -LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Imprudence now?" +LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start meta-impy now?" ; remove old NSIS version LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..." ; check windows version LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..." -LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'Imprudence only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?' +LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'meta-impy only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?' ; checkifadministrator function (install) LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..." -LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Imprudence.' +LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install meta-impy.' ; checkifadministrator function (uninstall) LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..." -LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Imprudence.' +LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall meta-impy.' ; checkifalreadycurrent -LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Imprudence ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?" +LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that meta-impy ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?" ; closeimprudence function (install) -LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..." -LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "Imprudence can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel installation." +LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for meta-impy to shut down..." +LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "meta-impy can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close meta-impy and continue.$\nSelect CANCEL to cancel installation." ; closeimprudence function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..." -LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "Imprudence can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel." +LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for meta-impy to shut down..." +LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "meta-impy can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close meta-impy and continue.$\nSelect CANCEL to cancel." ; removecachefiles LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder" ; delete program files -LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your Imprudence program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?" +LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your meta-impy program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?" ; uninstall text -LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall Imprudence ${VERSION_LONG} from your system." +LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall meta-impy ${VERSION_LONG} from your system." diff --git a/linden/indra/newview/installers/windows/meta-impy installer script experimental.iss b/linden/indra/newview/installers/windows/meta-impy installer script experimental.iss new file mode 100644 index 0000000..9480859 --- /dev/null +++ b/linden/indra/newview/installers/windows/meta-impy installer script experimental.iss @@ -0,0 +1,194 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +[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={{1B3E68BC-13EB-4277-9439-CB5FF9259460} +AppName=meta-impy Viewer Experimental Release +AppVerName=meta-impy Viewer 1.4.0 Experimental 2010.09.04 +DefaultDirName={pf}\meta-impyExperimental +DefaultGroupName=meta-impy Viewer Experimental Release +VersionInfoProductName=meta-impy Viewer Experimental Release +OutputBaseFilename=meta-impy-1.4.0-experimental-2010.09.04-Setup +VersionInfoVersion=1.4.0 +VersionInfoTextVersion=1.4.0 +VersionInfoProductVersion=1.4.0 +VersionInfoCopyright=2010 +AppCopyright=2010 + +; These won't change +VersionInfoCompany=meta-impy +AppPublisher=The Imprudence Project +AppPublisherURL=http://www.imprudenceviewer.org +AppSupportURL=http://www.imprudenceviewer.org +AppUpdatesURL=http://www.imprudenceviewer.org +AllowNoIcons=true +InfoAfterFile=..\windows\README.txt +OutputDir=C:\ +SetupIconFile=..\windows\imp_icon.ico +Compression=lzma2/ultra64 +InternalCompressLevel=ultra64 +SolidCompression=true +PrivilegesRequired=poweruser +AllowRootDirectory=true +WizardImageFile=..\windows\meta-impy_installer_icon_left.bmp +WizardSmallImageFile=..\windows\meta-impy_installer_icon_right.bmp +SetupLogging=true + +[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 meta-impy 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: C:\imp_1.3\meta-impy.exe; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\skins\*; DestDir: {app}\skins; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\doc\*; DestDir: {app}\doc; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\lib\*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\alut.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\ChangeLog.txt; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\charset.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\dbghelp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\featuretable.txt; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\freebl3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\meta-impy.exe.config; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\meta-impy.url; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libfaad-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgcrypt-11.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgio-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgnutls-26.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgobject-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgpg-error-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstapp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstaudio.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstaudio-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstbase-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstcdda.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstcontroller-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstdataprotocol-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstdshow.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstfft.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstinterfaces.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstnet-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstnetbuffer.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstpbutils.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstreamer-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstriff.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstrtp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstrtsp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstsdp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgsttag.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstvideo.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgthread-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libhunspell.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libjpeg.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libmp3lame-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libneon-27.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libogg-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\liboil-0.3-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libopenjpeg-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libpng12-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libschroedinger-1.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libspeex-1.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libtheora-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libvorbisenc-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libxml2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\llkdu.dll.2.config; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\Microsoft.VC80.CRT.manifest; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\msvcp80.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\msvcr80.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\nspr4.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\nss3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\nssckbi.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\openal32.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\OpenJPEG.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\plc4.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\plds4.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\smime3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\softokn3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\ssl3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\xpcom.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\xul.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\xvidcore.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\zlib1.dll; DestDir: {app}; Flags: ignoreversion + +; Voice files +Source: C:\imp_1.3\ortp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\SLVoice.exe; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion + +; Old files we don't use anymore +; Source: C:\imp_1.3\dronesettings.xml; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\volume_settings.xml; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\srtp.dll; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\ssleay32.dll; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\tntk.dll; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\libeay32.dll; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\lsl_guide.html; DestDir: {app}; Flags: ignoreversion + +; NOTE: Don't use "Flags: ignoreversion" on any shared system files +;Source: C:\imp_1.3\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}\meta-impy.exe +Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\meta-impy.exe --settings settings_meta-impy.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,meta-impy Experimental}; Filename: {uninstallexe} +Name: {commondesktop}\meta-impy Experimental; Filename: {app}\meta-impy.exe; Tasks: desktopicon; Parameters: --settings settings_meta-impy.xml; WorkingDir: {app}; IconIndex: 0 +Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\meta-impy Experimental; Filename: {app}\meta-impy.exe; Tasks: quicklaunchicon; Parameters: --settings settings_meta-impy.xml; WorkingDir: {app} +Name: {group}\meta-impy Experimental; Filename: {app}\meta-impy.exe; WorkingDir: {app}; Comment: meta-impy; IconIndex: 0; Parameters: --settings settings_meta-impy.xml + +[Run] +Filename: {app}\meta-impy.exe; WorkingDir: {app}; Flags: nowait postinstall +Filename: {app}\meta-impy.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different + +[UninstallDelete] +Name: {userappdata}\meta-impy\user_settings\password.dat; Type: files; Languages: +Name: {userappdata}\meta-impy\user_settings\settings.xml; Type: files; Languages: +Name: {userappdata}\meta-impy\user_settings\settings_meta-impy.xml; Type: files; Languages: +; 1.2 and lower cache location: +Name: {userappdata}\meta-impy\cache; Type: filesandordirs +; 1.3 and higher cache location: +Name: {localappdata}\meta-impy\cache; Type: filesandordirs +Name: {userappdata}\meta-impy\logs; Type: filesandordirs +Name: {userappdata}\meta-impy\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: +; Name: {app}\skins\silver\xui\*; 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: diff --git a/linden/indra/newview/installers/windows/meta-impy installer script.iss b/linden/indra/newview/installers/windows/meta-impy installer script.iss new file mode 100644 index 0000000..d203f78 --- /dev/null +++ b/linden/indra/newview/installers/windows/meta-impy installer script.iss @@ -0,0 +1,193 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +[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=meta-impy +AppVerName=meta-impy Viewer 1.3.0 RC2 (SSE2 optimized) +DefaultDirName={pf}\meta-impy +DefaultGroupName=meta-impy Viewer +VersionInfoProductName=meta-impy Viewer +OutputBaseFilename=meta-impy-1.3.0-RC2-(SSE2-optimized)-Setup +VersionInfoVersion=1.3.0 +VersionInfoTextVersion=1.3.0 +VersionInfoProductVersion=1.3.0 +VersionInfoCopyright=2010 +AppCopyright=2010 + +; These won't change +VersionInfoCompany=meta-impy +AppPublisher=The Imprudence Project +AppPublisherURL=http://www.imprudenceviewer.org +AppSupportURL=http://www.imprudenceviewer.org +AppUpdatesURL=http://www.imprudenceviewer.org +AllowNoIcons=true +InfoAfterFile=..\windows\README.txt +OutputDir=C:\ +SetupIconFile=..\windows\imp_icon.ico +Compression=lzma2/ultra64 +InternalCompressLevel=ultra64 +SolidCompression=true +PrivilegesRequired=poweruser +AllowRootDirectory=true +WizardImageFile=..\windows\meta-impy_installer_icon_left.bmp +WizardSmallImageFile=..\windows\meta-impy_installer_icon_right.bmp +SetupLogging=true + +[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 meta-impy 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: C:\imp_1.3\meta-impy.exe; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\skins\*; DestDir: {app}\skins; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\doc\*; DestDir: {app}\doc; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\lib\*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\alut.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\ChangeLog.txt; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\charset.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\dbghelp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\featuretable.txt; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\freebl3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\meta-impy.exe.config; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\meta-impy.url; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libfaad-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgcrypt-11.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgio-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgnutls-26.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgobject-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgpg-error-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstapp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstaudio.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstaudio-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstbase-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstcdda.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstcontroller-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstdataprotocol-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstdshow.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstfft.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstinterfaces.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstnet-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstnetbuffer.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstpbutils.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstreamer-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstriff.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstrtp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstrtsp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstsdp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgsttag.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstvideo.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgthread-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libjpeg.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libmp3lame-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libneon-27.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libogg-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\liboil-0.3-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libopenjpeg-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libpng12-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libschroedinger-1.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libspeex-1.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libtheora-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libvorbisenc-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libxml2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\llkdu.dll.2.config; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\Microsoft.VC80.CRT.manifest; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\msvcp80.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\msvcr80.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\nspr4.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\nss3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\nssckbi.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\openal32.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\OpenJPEG.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\plc4.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\plds4.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\smime3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\softokn3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\ssl3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\xpcom.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\xul.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\xvidcore.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\zlib1.dll; DestDir: {app}; Flags: ignoreversion + +; Voice files +Source: C:\imp_1.3\ortp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\SLVoice.exe; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion + +; Old files we don't use anymore +; Source: C:\imp_1.3\dronesettings.xml; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\volume_settings.xml; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\srtp.dll; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\ssleay32.dll; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\tntk.dll; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\libeay32.dll; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\lsl_guide.html; DestDir: {app}; Flags: ignoreversion + +; NOTE: Don't use "Flags: ignoreversion" on any shared system files +;Source: C:\imp_1.3\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}\meta-impy.exe +Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\meta-impy.exe --settings settings_meta-impy.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,meta-impy}; Filename: {uninstallexe} +Name: {commondesktop}\meta-impy; Filename: {app}\meta-impy.exe; Tasks: desktopicon; Parameters: --settings settings_meta-impy.xml; WorkingDir: {app}; IconIndex: 0 +Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\meta-impy; Filename: {app}\meta-impy.exe; Tasks: quicklaunchicon; Parameters: --settings settings_meta-impy.xml; WorkingDir: {app} +Name: {group}\meta-impy; Filename: {app}\meta-impy.exe; WorkingDir: {app}; Comment: meta-impy; IconIndex: 0; Parameters: --settings settings_meta-impy.xml + +[Run] +Filename: {app}\meta-impy.exe; WorkingDir: {app}; Flags: nowait postinstall +Filename: {app}\meta-impy.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different + +[UninstallDelete] +Name: {userappdata}\meta-impy\user_settings\password.dat; Type: files; Languages: +Name: {userappdata}\meta-impy\user_settings\settings.xml; Type: files; Languages: +Name: {userappdata}\meta-impy\user_settings\settings_meta-impy.xml; Type: files; Languages: +; 1.2 and lower cache location: +Name: {userappdata}\meta-impy\cache; Type: filesandordirs +; 1.3 and higher cache location: +Name: {localappdata}\meta-impy\cache; Type: filesandordirs +Name: {userappdata}\meta-impy\logs; Type: filesandordirs +Name: {userappdata}\meta-impy\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: +; Name: {app}\skins\silver\xui\*; 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: diff --git a/linden/indra/newview/installers/windows/meta-impy_installer_icon_left.bmp b/linden/indra/newview/installers/windows/meta-impy_installer_icon_left.bmp new file mode 100644 index 0000000..79fd407 Binary files /dev/null and b/linden/indra/newview/installers/windows/meta-impy_installer_icon_left.bmp differ diff --git a/linden/indra/newview/installers/windows/meta-impy_installer_icon_right.bmp b/linden/indra/newview/installers/windows/meta-impy_installer_icon_right.bmp new file mode 100644 index 0000000..1c1d5dc Binary files /dev/null and b/linden/indra/newview/installers/windows/meta-impy_installer_icon_right.bmp differ diff --git a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh index 2702d71..6b0433a 100755 --- a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh +++ b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh @@ -13,9 +13,9 @@ fi RUN_PATH=`dirname "$0" || echo .` cd "${RUN_PATH}" -if [ `pidof do-not-directly-run-imprudence-bin` ]; then +if [ `pidof do-not-directly-run-meta-impy-bin` ]; then exec dbus-send --type=method_call --dest=com.secondlife.ViewerAppAPIService /com/secondlife/ViewerAppAPI com.secondlife.ViewerAppAPI.GoSLURL string:"$1" else - exec ./imprudence -url \'"${URL}"\' + exec ./meta-impy -url \'"${URL}"\' fi diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh index a43ebd5..657ccbb 100755 --- a/linden/indra/newview/linux_tools/wrapper.sh +++ b/linden/indra/newview/linux_tools/wrapper.sh @@ -107,7 +107,7 @@ if [ -n "$LL_TCMALLOC" ]; then fi fi -export VIEWER_BINARY='do-not-directly-run-imprudence-bin' +export VIEWER_BINARY='do-not-directly-run-meta-impy-bin' BINARY_TYPE=$(expr match "$(file -b bin/$VIEWER_BINARY)" '\(.*executable\)') if [ "${BINARY_TYPE}" == "ELF 64-bit LSB executable" ]; then export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"${LD_LIBRARY_PATH}"' diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 8aea221..7555c87 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -309,15 +309,15 @@ BOOL gLogoutInProgress = FALSE; // Internal globals... that should be removed. static std::string gArgs; -const std::string MARKER_FILE_NAME("Imprudence.exec_marker"); -const std::string ERROR_MARKER_FILE_NAME("Imprudence.error_marker"); -const std::string LLERROR_MARKER_FILE_NAME("Imprudence.llerror_marker"); -const std::string LOGOUT_MARKER_FILE_NAME("Imprudence.logout_marker"); +const std::string MARKER_FILE_NAME("meta-impy.exec_marker"); +const std::string ERROR_MARKER_FILE_NAME("meta-impy.error_marker"); +const std::string LLERROR_MARKER_FILE_NAME("meta-impy.llerror_marker"); +const std::string LOGOUT_MARKER_FILE_NAME("meta-impy.logout_marker"); static BOOL gDoDisconnect = FALSE; static std::string gLaunchFileOnQuit; // Used on Win32 for other apps to identify our window (eg, win_setup) -const char* const VIEWER_WINDOW_CLASSNAME = "Imprudence"; +const char* const VIEWER_WINDOW_CLASSNAME = "meta-impy"; //---------------------------------------------------------------------------- // File scope definitons @@ -1645,12 +1645,12 @@ bool LLAppViewer::initLogging() // Remove the last ".old" log file. std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, - "Imprudence.old"); + "meta-impy.old"); LLFile::remove(old_log_file); // Rename current log file to ".old" std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, - "Imprudence.log"); + "meta-impy.log"); LLFile::rename(log_file, old_log_file); // Set the log file to Imprudence.log @@ -1817,7 +1817,7 @@ bool LLAppViewer::initConfiguration() // - set procedural settings gSavedSettings.setString("ClientSettingsFile", // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global"))); - gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence_experimental.xml")); + gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_meta-impy_experimental.xml")); gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName()); diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp index 0d5b884..343c1f1 100644 --- a/linden/indra/newview/llappviewerwin32.cpp +++ b/linden/indra/newview/llappviewerwin32.cpp @@ -103,7 +103,7 @@ extern "C" { #endif #endif -const std::string LLAppViewerWin32::sWindowClass = "Imprudence"; +const std::string LLAppViewerWin32::sWindowClass = "meta-impy"; LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop) { diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp index 10d27cd..5397f89 100644 --- a/linden/indra/newview/llhoverview.cpp +++ b/linden/indra/newview/llhoverview.cpp @@ -286,7 +286,7 @@ void LLHoverView::updateText() LLVOAvatar* avatar = (LLVOAvatar*)hit_object; if (avatar->isSelf()) { - client="Client: Imprudence"; + client="Client: meta-impy"; } else { diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index b744961..31647e9 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp @@ -2989,7 +2989,7 @@ std::string LLStartUp::loadPasswordFromDisk() #if LL_DARWIN UInt32 passwordLength; char *passwordData; - OSStatus stat = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, &passwordLength, (void**)&passwordData, NULL); + OSStatus stat = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, &passwordLength, (void**)&passwordData, NULL); if (stat == noErr) { if (passwordLength == HASHED_LENGTH) @@ -3037,7 +3037,7 @@ void LLStartUp::savePasswordToDisk(const std::string& hashed_password) { #if LL_DARWIN SecKeychainItemRef keychainItem; - OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, NULL, NULL, &keychainItem); + OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, NULL, NULL, &keychainItem); if (status == noErr) { SecKeychainItemModifyAttributesAndData(keychainItem, NULL, hashed_password.length(), hashed_password.c_str()); @@ -3045,7 +3045,7 @@ void LLStartUp::savePasswordToDisk(const std::string& hashed_password) } else { - SecKeychainAddGenericPassword(NULL, 10, "Imprudence", 0, NULL, hashed_password.length(), hashed_password.c_str(), NULL); + SecKeychainAddGenericPassword(NULL, 10, "meta-impy", 0, NULL, hashed_password.length(), hashed_password.c_str(), NULL); } #else std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, @@ -3080,7 +3080,7 @@ void LLStartUp::deletePasswordFromDisk() { #if LL_DARWIN SecKeychainItemRef keychainItem; - OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, NULL, NULL, &keychainItem); + OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, NULL, NULL, &keychainItem); if (status == noErr) { SecKeychainItemDelete(keychainItem); diff --git a/linden/indra/newview/llwindebug.cpp b/linden/indra/newview/llwindebug.cpp index 62aeda4..026a7d5 100644 --- a/linden/indra/newview/llwindebug.cpp +++ b/linden/indra/newview/llwindebug.cpp @@ -870,8 +870,8 @@ void LLWinDebug::generateCrashStacks(struct _EXCEPTION_POINTERS *exception_infop ExInfo.ExceptionPointers = exception_infop; ExInfo.ClientPointers = NULL; - writeDumpToFile(MiniDumpNormal, &ExInfo, "Imprudence.dmp"); - writeDumpToFile((MINIDUMP_TYPE)(MiniDumpWithDataSegs | MiniDumpWithIndirectlyReferencedMemory), &ExInfo, "ImprudencePlus.dmp"); + writeDumpToFile(MiniDumpNormal, &ExInfo, "meta-impy.dmp"); + writeDumpToFile((MINIDUMP_TYPE)(MiniDumpWithDataSegs | MiniDumpWithIndirectlyReferencedMemory), &ExInfo, "meta-impyPlus.dmp"); } info = Get_Exception_Info(exception_infop); diff --git a/linden/indra/newview/meta-impy.exe.config b/linden/indra/newview/meta-impy.exe.config new file mode 100644 index 0000000..293a9ba --- /dev/null +++ b/linden/indra/newview/meta-impy.exe.config @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/linden/indra/newview/meta-impy.url b/linden/indra/newview/meta-impy.url new file mode 100644 index 0000000..9cc3cc0 --- /dev/null +++ b/linden/indra/newview/meta-impy.url @@ -0,0 +1,2 @@ +[InternetShortcut] +URL=http://imprudenceviewer.org/wiki/Features \ No newline at end of file diff --git a/linden/indra/newview/meta-impyDebug.exe.config b/linden/indra/newview/meta-impyDebug.exe.config new file mode 100644 index 0000000..04d0e00 --- /dev/null +++ b/linden/indra/newview/meta-impyDebug.exe.config @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/linden/indra/newview/res-sdl/imprudence_icon.BMP b/linden/indra/newview/res-sdl/imprudence_icon.BMP deleted file mode 100644 index c3f4887..0000000 Binary files a/linden/indra/newview/res-sdl/imprudence_icon.BMP and /dev/null differ diff --git a/linden/indra/newview/res-sdl/meta-impy_icon.BMP b/linden/indra/newview/res-sdl/meta-impy_icon.BMP new file mode 100644 index 0000000..c3f4887 Binary files /dev/null and b/linden/indra/newview/res-sdl/meta-impy_icon.BMP differ diff --git a/linden/indra/newview/res/imprudence_icon.png b/linden/indra/newview/res/imprudence_icon.png deleted file mode 100644 index 8795fa7..0000000 Binary files a/linden/indra/newview/res/imprudence_icon.png and /dev/null differ diff --git a/linden/indra/newview/res/meta-impy_icon.png b/linden/indra/newview/res/meta-impy_icon.png new file mode 100644 index 0000000..8795fa7 Binary files /dev/null and b/linden/indra/newview/res/meta-impy_icon.png differ diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc index 45e50c9..afe6988 100644 --- a/linden/indra/newview/res/viewerRes.rc +++ b/linden/indra/newview/res/viewerRes.rc @@ -74,7 +74,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Sans Serif" BEGIN ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20 - LTEXT "Loading Imprudence...",666,36,13,91,8 + LTEXT "Loading meta-impy...",666,36,13,91,8 END @@ -154,12 +154,12 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Imprudence Viewer Project" - VALUE "FileDescription", "Imprudence Experimental" + VALUE "CompanyName", "meta-impy Viewer Project" + VALUE "FileDescription", "meta-impy Experimental" VALUE "FileVersion", "2010.09.04" - VALUE "InternalName", "Imprudence Experimental" - VALUE "OriginalFilename", "Imprudence.exe" - VALUE "ProductName", "Imprudence Weekly" + VALUE "InternalName", "meta-impy Experimental" + VALUE "OriginalFilename", "meta-impy.exe" + VALUE "ProductName", "meta-impy Weekly" VALUE "ProductVersion", "2010.09.04" END END diff --git a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png deleted file mode 100644 index f9ea7a2..0000000 Binary files a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png and /dev/null differ diff --git a/linden/indra/newview/skins/default/html/en-us/loading/meta-impy_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/meta-impy_loading.png new file mode 100644 index 0000000..f9ea7a2 Binary files /dev/null and b/linden/indra/newview/skins/default/html/en-us/loading/meta-impy_loading.png differ diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml index b8f3fcb..36a8f93 100644 --- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml @@ -1,6 +1,6 @@ -Imprudence +meta-impy imprudenceviewer.org Second Life secondlife.com diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml index 048005d..75c635e 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml @@ -14,7 +14,7 @@ %3Ctable width=%22100%%22 height=%22100%%22 border=%220%22%3E %3Ctr%3E %3Ctd align=%22center%22 valign=%22middle%22 style=%22font-size:0.8em;%22%3E - %3Cimg src=%22imprudence_loading.png%22 align=%22absmiddle%22%3E + %3Cimg src=%22meta-impy_loading.png%22 align=%22absmiddle%22%3E %3Cbr/%3E %3CH1%3Eloading...%3C/H1%3E %3C/td%3E diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml index 2ed0869..fe19929 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml @@ -6,7 +6,7 @@ left="470" name="GraphicsPreferencesHelpButton" width="22" /> /Contents/MacOS/ if (not self.standalone()) and self.prefix(src="../../libraries/universal-darwin/lib_release", dst="MacOS/"): @@ -802,16 +802,16 @@ class DarwinManifest(ViewerManifest): def package_finish(self): - channel_standin = 'Imprudence' # hah, our default channel is not usable on its own + channel_standin = 'meta-impy' # hah, our default channel is not usable on its own if not self.default_channel(): channel_standin = self.channel() - imagename="Imprudence_" + '_'.join(self.args['version']) + imagename="meta-impy_" + '_'.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. - volname="Imprudence Installer" # DO NOT CHANGE without understanding comment above + volname="meta-impy Installer" # DO NOT CHANGE without understanding comment above if self.default_channel(): if not self.default_grid(): @@ -838,7 +838,7 @@ class DarwinManifest(ViewerManifest): # Copy everything in to the mounted .dmg if self.default_channel() and not self.default_grid(): - app_name = "Imprudence " + self.args['grid'] + app_name = "meta-impy " + self.args['grid'] else: app_name = channel_standin.strip() @@ -891,12 +891,12 @@ class LinuxManifest(ViewerManifest): def construct(self): super(LinuxManifest, self).construct() - self.path("res/imprudence_icon.png","imprudence_icon.png") + self.path("res/meta-impy_icon.png","meta-impy_icon.png") if self.prefix("linux_tools", dst=""): #self.path("client-readme.txt","README-linux.txt") self.path("client-readme-voice.txt","README-linux-voice.txt") #self.path("client-readme-joystick.txt","README-linux-joystick.txt") - self.path("wrapper.sh","imprudence") + self.path("wrapper.sh","meta-impy") self.path("handle_secondlifeprotocol.sh") self.path("register_secondlifeprotocol.sh") self.end_prefix("linux_tools") @@ -933,7 +933,7 @@ class LinuxManifest(ViewerManifest): if 'installer_name' in self.args: installer_name = self.args['installer_name'] else: - installer_name_components = ['Imprudence_', self.args.get('arch')] + installer_name_components = ['meta-impy_', self.args.get('arch')] installer_name_components.extend(self.args['version']) installer_name = "_".join(installer_name_components) if self.default_channel(): @@ -980,9 +980,9 @@ class Linux_i686Manifest(LinuxManifest): def construct(self): super(Linux_i686Manifest, self).construct() if self.debug(): - self.path("imprudence-bin","bin/do-not-directly-run-imprudence-bin") + self.path("meta-impy-bin","bin/do-not-directly-run-meta-impy-bin") else: - self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin") + self.path("meta-impy-stripped","bin/do-not-directly-run-meta-impy-bin") self.path("../llcommon/libllcommon.so", "lib/libllcommon.so") @@ -1101,9 +1101,9 @@ class Linux_x86_64Manifest(LinuxManifest): def construct(self): super(Linux_x86_64Manifest, self).construct() if self.debug(): - self.path("imprudence-bin","bin/do-not-directly-run-imprudence-bin") + self.path("meta-impy-bin","bin/do-not-directly-run-meta-impy-bin") else: - self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin") + self.path("meta-impy-stripped","bin/do-not-directly-run-meta-impy-bin") # self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin") self.path("../llcommon/libllcommon.so", "lib64/libllcommon.so") diff --git a/linden/indra/newview/viewerversion.cpp b/linden/indra/newview/viewerversion.cpp index 95c8f76..3678cb4 100644 --- a/linden/indra/newview/viewerversion.cpp +++ b/linden/indra/newview/viewerversion.cpp @@ -40,7 +40,7 @@ S32 ViewerVersion::sVersionMinor = 0; S32 ViewerVersion::sVersionPatch = 0; std::string ViewerVersion::sVersionTest = ""; -const std::string ViewerVersion::sViewerName = "Imprudence"; +const std::string ViewerVersion::sViewerName = "meta-impy"; ViewerVersion::ViewerVersion() { diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp index 5031270..2e78296 100644 --- a/linden/indra/win_updater/updater.cpp +++ b/linden/indra/win_updater/updater.cpp @@ -454,11 +454,11 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho if (gTotalBytesRead < (1024 * 1024) && ! cancelled) { MessageBox(gWindow, - L"The Imprudence auto-update has failed.\n" + L"The meta-impy auto-update has failed.\n" L"The problem may be caused by other software installed \n" L"on your computer, such as a firewall.\n" L"Please visit http://imprudenceviewer.org/download/ \n" - L"to download the latest version of Imprudence.\n", + L"to download the latest version of meta-impy.\n", NULL, MB_OK); return 1; } @@ -472,7 +472,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho if (!success) { MessageBox(gWindow, - L"Imprudence download failed.\n" + L"meta-impy download failed.\n" L"Please try again later.", NULL, MB_OK); return 1; -- cgit v1.1