From 6ed8d75324849ecb36b0b911de0143348755f8bb Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Tue, 14 Oct 2008 20:25:17 -0500 Subject: Rebranded platform-independent/shared installer/support files. Replaced instances of "Second Life" with "Imprudence", etc. --- ChangeLog.txt | 21 +++++++++++ linden/indra/CMakeLists.txt | 4 +-- linden/indra/cmake/00-Common.cmake | 2 +- linden/indra/develop.py | 8 ++--- linden/indra/llcrashlogger/llcrashlogger.cpp | 6 ++-- linden/indra/newview/CMakeLists.txt | 54 ++++++++++++++-------------- linden/indra/newview/ViewerInstall.cmake | 2 +- linden/indra/newview/llappviewer.cpp | 20 +++++------ linden/indra/newview/viewer_manifest.py | 52 +++++++++++++-------------- 9 files changed, 95 insertions(+), 74 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 8c3a030..8cf8b07 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,24 @@ +2008-10-14 Jacek Antonelli + + * linden/indra/CMakeLists.txt: + Rebranded platform-independent/shared installer/support files. + Replaced instances of "Second Life" with "Imprudence", etc. + * linden/indra/cmake/00-Common.cmake: + Ditto. + * linden/indra/develop.py: + Ditto. + * linden/indra/llcrashlogger/llcrashlogger.cpp: + Ditto. + * linden/indra/newview/CMakeLists.txt: + Ditto. + * linden/indra/newview/ViewerInstall.cmake: + Ditto. + * linden/indra/newview/llappviewer.cpp: + Ditto. + * linden/indra/newview/viewer_manifest.py: + Ditto. + + 2008-10-01 Jacek Antonelli * linden/indra/llcommon/llversionviewer.h: diff --git a/linden/indra/CMakeLists.txt b/linden/indra/CMakeLists.txt index fac2afa..eb06191 100644 --- a/linden/indra/CMakeLists.txt +++ b/linden/indra/CMakeLists.txt @@ -13,7 +13,7 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 OLD) endif(COMMAND cmake_policy) -project(SecondLife) +project(Imprudence) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") @@ -77,7 +77,7 @@ if (VIEWER) endif (LINUX) add_subdirectory(${VIEWER_PREFIX}newview) - add_dependencies(viewer secondlife-bin) + add_dependencies(viewer imprudence-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 240853a..977e588 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake @@ -146,7 +146,7 @@ if (LINUX) endif (SERVER) if (VIEWER) - add_definitions(-DAPPID=secondlife) + add_definitions(-DAPPID=imprudence) add_definitions(-fvisibility=hidden) if (NOT STANDALONE) # this stops us requiring a really recent glibc at runtime diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 8edfccc..a0b11c6 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py @@ -503,10 +503,10 @@ class WindowsSetup(PlatformSetup): if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]: config = '\"%s|Win32\"' % config - return "buildconsole Secondlife.sln /build %s" % config + return "buildconsole Imprudence.sln /build %s" % config # devenv.com is CLI friendly, devenv.exe... not so much. - return ('"%sdevenv.com" Secondlife.sln /build %s' % + return ('"%sdevenv.com" Imprudence.sln /build %s' % (self.find_visual_studio(), self.build_type)) # this override of run exists because the PlatformSetup version @@ -527,9 +527,9 @@ class WindowsSetup(PlatformSetup): for build_dir in self.build_dirs(): vstool_cmd = os.path.join('tools','vstool','VSTool.exe') \ + ' --solution ' \ - + os.path.join(build_dir,'SecondLife.sln') \ + + os.path.join(build_dir,'Imprudence.sln') \ + ' --config RelWithDebInfo' \ - + ' --startup secondlife-bin' + + ' --startup imprudence-bin' print 'Running %r in %r' % (vstool_cmd, os.getcwd()) self.run(vstool_cmd) diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp index 57fa33b..4c8859a 100755 --- a/linden/indra/llcrashlogger/llcrashlogger.cpp +++ b/linden/indra/llcrashlogger/llcrashlogger.cpp @@ -172,7 +172,7 @@ void LLCrashLogger::gatherFiles() { // Figure out the filename of the second life log LLCurl::setCAFile(gDirUtilp->getCAFile()); - mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.log"); + mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"Imprudence.log"); mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml"); } @@ -293,7 +293,7 @@ bool LLCrashLogger::sendCrashLogs() updateApplication("Sending reports..."); std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, - "SecondLifeCrashReport"); + "ImprudenceCrashReport"); std::string report_file = dump_path + ".log"; std::ofstream out_file(report_file.c_str()); @@ -330,7 +330,7 @@ bool LLCrashLogger::init() gDirUtilp->initAppDirs("SecondLife"); // Default to the product name "Second Life" (this is overridden by the -name argument) - mProductName = "Second Life"; + mProductName = "Imprudence"; 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)"); diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index ae0feb6..af7812c 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -1265,15 +1265,15 @@ list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES}) set_source_files_properties(${viewer_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) -add_executable(secondlife-bin +add_executable(imprudence-bin WIN32 MACOSX_BUNDLE ${viewer_SOURCE_FILES} ) -check_message_template(secondlife-bin) +check_message_template(imprudence-bin) if (LLKDU_LIBRARY) - add_dependencies(secondlife-bin ${LLKDU_LIBRARY}) + add_dependencies(imprudence-bin ${LLKDU_LIBRARY}) endif (LLKDU_LIBRARY) set(PACKAGE OFF CACHE BOOL @@ -1281,12 +1281,12 @@ set(PACKAGE OFF CACHE BOOL if (WINDOWS) if(MSVC71) - set(release_flags "/MAP:Release/secondlife-bin.map /MAPINFO:LINES") + set(release_flags "/MAP:Release/imprudence-bin.map /MAPINFO:LINES") else(MSVC71) - set(release_flags "/MAP:Release/secondlife-bin.map") + set(release_flags "/MAP:Release/imprudence-bin.map") endif(MSVC71) - set_target_properties(secondlife-bin + set_target_properties(imprudence-bin PROPERTIES LINK_FLAGS "/debug /NODEFAULTLIB:MSVCRT /SUBSYSTEM:WINDOWS" LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:MSVCRTD" @@ -1296,20 +1296,20 @@ if (WINDOWS) # sets the 'working directory' for debugging from visual studio. if (NOT UNATTENDED) add_custom_command( - TARGET secondlife-bin PRE_BUILD + TARGET imprudence-bin PRE_BUILD COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe ARGS --solution ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln --workingdir - secondlife-bin + imprudence-bin ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT "Setting the secondlife-bin working directory for debugging." + COMMENT "Setting the imprudence-bin working directory for debugging." ) endif (NOT UNATTENDED) add_custom_command( - TARGET secondlife-bin PRE_BUILD + TARGET imprudence-bin PRE_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E @@ -1320,7 +1320,7 @@ if (WINDOWS) ) add_custom_command( - TARGET secondlife-bin PRE_BUILD + TARGET imprudence-bin PRE_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E @@ -1330,10 +1330,10 @@ if (WINDOWS) COMMENT "Copying message.xml to the runtime folder." ) - add_dependencies(secondlife-bin copy_win_libs) + add_dependencies(imprudence-bin copy_win_libs) if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts) - add_dependencies(secondlife-bin copy_win_scripts) + add_dependencies(imprudence-bin copy_win_scripts) endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts) add_custom_command( @@ -1350,7 +1350,7 @@ if (WINDOWS) --build=${CMAKE_CURRENT_BINARY_DIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat - DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + DEPENDS imprudence-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) if (PACKAGE) add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat) @@ -1358,7 +1358,7 @@ if (WINDOWS) endif (PACKAGE) endif (WINDOWS) -target_link_libraries(secondlife-bin +target_link_libraries(imprudence-bin ${LLAUDIO_LIBRARIES} ${LLCHARACTER_LIBRARIES} ${LLIMAGE_LIBRARIES} @@ -1403,13 +1403,13 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH if (LINUX) add_custom_command( - OUTPUT secondlife-stripped + OUTPUT imprudence-stripped COMMAND strip - ARGS --strip-debug -o secondlife-stripped secondlife-bin - DEPENDS secondlife-bin + ARGS --strip-debug -o imprudence-stripped imprudence-bin + DEPENDS imprudence-bin ) - set(product SecondLife-${ARCH}-${viewer_VERSION}) + set(product Imprudence-${ARCH}-${viewer_VERSION}) add_custom_command( OUTPUT ${product}.tar.bz2 @@ -1426,7 +1426,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 secondlife-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + DEPENDS imprudence-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) if (NOT INSTALL) @@ -1436,23 +1436,23 @@ if (LINUX) endif (LINUX) if (DARWIN) - set(product "Second Life") + set(product "Imprudence") set_target_properties( - secondlife-bin + imprudence-bin PROPERTIES OUTPUT_NAME "${product}" MACOSX_BUNDLE_INFO_STRING "info string - localize me" MACOSX_BUNDLE_ICON_FILE "secondlife.icns" - MACOSX_BUNDLE_GUI_IDENTIFIER "Second Life" + MACOSX_BUNDLE_GUI_IDENTIFIER "Imprudence" MACOSX_BUNDLE_LONG_VERSION_STRING "ververver" - MACOSX_BUNDLE_BUNDLE_NAME "Second Life" + MACOSX_BUNDLE_BUNDLE_NAME "Imprudence" 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" ) add_custom_command( - TARGET secondlife-bin POST_BUILD + TARGET imprudence-bin POST_BUILD COMMAND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py @@ -1463,7 +1463,7 @@ if (DARWIN) --artwork=${ARTWORK_DIR} --build=${CMAKE_CURRENT_BINARY_DIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app - DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + DEPENDS imprudence-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) if (PACKAGE) @@ -1481,7 +1481,7 @@ if (DARWIN) --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched DEPENDS - secondlife-bin + imprudence-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) add_dependencies(package mac-updater mac-crash-logger) diff --git a/linden/indra/newview/ViewerInstall.cmake b/linden/indra/newview/ViewerInstall.cmake index 55069ad..bc839c4 100644 --- a/linden/indra/newview/ViewerInstall.cmake +++ b/linden/indra/newview/ViewerInstall.cmake @@ -1,4 +1,4 @@ -install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/secondlife-bin +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/imprudence-bin DESTINATION ${APP_BINARY_DIR} ) diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 3ef3894..5b3e38d 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -293,10 +293,10 @@ BOOL gLogoutInProgress = FALSE; // Internal globals... that should be removed. static std::string gArgs; -const std::string MARKER_FILE_NAME("SecondLife.exec_marker"); -const std::string ERROR_MARKER_FILE_NAME("SecondLife.error_marker"); -const std::string LLERROR_MARKER_FILE_NAME("SecondLife.llerror_marker"); -const std::string LOGOUT_MARKER_FILE_NAME("SecondLife.logout_marker"); +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"); static BOOL gDoDisconnect = FALSE; static std::string gLaunchFileOnQuit; @@ -1468,15 +1468,15 @@ bool LLAppViewer::initLogging() // Remove the last ".old" log file. std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, - "SecondLife.old"); + "Imprudence.old"); LLFile::remove(old_log_file); // Rename current log file to ".old" std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, - "SecondLife.log"); + "Imprudence.log"); LLFile::rename(log_file, old_log_file); - // Set the log file to SecondLife.log + // Set the log file to Imprudence.log LLError::logToFile(log_file); @@ -1658,7 +1658,7 @@ bool LLAppViewer::initConfiguration() llinfos << "Command line usage:\n" << clp << llendl; std::ostringstream msg; - msg << "Second Life found an error parsing the command line. \n" + msg << gSecondLife << " found an error parsing the command line. \n" << "Please see: http://wiki.secondlife.com/wiki/Client_parameters \n" << "Error: " << clp.getErrorMessage(); @@ -2654,7 +2654,7 @@ bool LLAppViewer::initCache() std::string cache_dir = gDirUtilp->getOSUserAppDir(); std::string new_cache_dir = gDirUtilp->getOSCacheDir(); cache_dir = cache_dir + "/cache"; - new_cache_dir = new_cache_dir + "/" + gSecondLife; + new_cache_dir = new_cache_dir + "/" + "SecondLife"; if (gDirUtilp->fileExists(cache_dir)) { gDirUtilp->setCacheDir(cache_dir); @@ -2947,7 +2947,7 @@ void LLAppViewer::badNetworkHandler() message << "The viewer has detected mangled network data indicative\n" "of a bad upstream network connection or an incomplete\n" - "local installation of " << LLAppViewer::instance()->getSecondLifeTitle() << ". \n" + "local installation of " << gSecondLife << ". \n" " \n" "Try uninstalling and reinstalling to see if this resolves \n" "the issue. \n" diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index fe894a7..2533e6a 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -139,9 +139,9 @@ class WindowsManifest(ViewerManifest): def final_exe(self): if self.default_channel(): if self.default_grid(): - return "SecondLife.exe" + return "Imprudence.exe" else: - return "SecondLifePreview.exe" + return "ImprudencePreview.exe" else: return ''.join(self.channel().split()) + '.exe' @@ -150,7 +150,7 @@ class WindowsManifest(ViewerManifest): super(WindowsManifest, self).construct() # the final exe is complicated because we're not sure where it's coming from, # nor do we have a fixed name for the executable - self.path(self.find_existing_file('debug/secondlife-bin.exe', 'release/secondlife-bin.exe', 'relwithdebinfo/secondlife-bin.exe'), dst=self.final_exe()) + self.path(self.find_existing_file('debug/imprudence-bin.exe', 'release/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe()) # need to get the kdu dll from any of the build directories as well self.path(self.find_existing_file( # *FIX:Mani we need to add support for packaging specific targets. @@ -299,36 +299,36 @@ class WindowsManifest(ViewerManifest): if self.default_channel(): if self.default_grid(): # release viewer - installer_file = "Second_Life_%(version_dashes)s_Setup.exe" + installer_file = "Imprudence_%(version_dashes)s_Setup.exe" grid_vars_template = """ OutFile "%(installer_file)s" !define INSTFLAGS "%(flags)s" - !define INSTNAME "SecondLife" - !define SHORTCUT "Second Life" - !define URLNAME "secondlife" - Caption "Second Life ${VERSION}" + !define INSTNAME "Imprudence" + !define SHORTCUT "Imprudence" + !define URLNAME "imprudence" + Caption "Imprudence ${VERSION}" """ else: # beta grid viewer - installer_file = "Second_Life_%(version_dashes)s_(%(grid_caps)s)_Setup.exe" + installer_file = "Imprudence_%(version_dashes)s_(%(grid_caps)s)_Setup.exe" grid_vars_template = """ OutFile "%(installer_file)s" !define INSTFLAGS "%(flags)s" - !define INSTNAME "SecondLife%(grid_caps)s" - !define SHORTCUT "Second Life (%(grid_caps)s)" - !define URLNAME "secondlife%(grid)s" + !define INSTNAME "Imprudence%(grid_caps)s" + !define SHORTCUT "Imprudence (%(grid_caps)s)" + !define URLNAME "imprudence%(grid)s" !define UNINSTALL_SETTINGS 1 - Caption "Second Life %(grid)s ${VERSION}" + Caption "Imprudence %(grid)s ${VERSION}" """ else: # some other channel on some grid - installer_file = "Second_Life_%(version_dashes)s_%(channel_oneword)s_Setup.exe" + installer_file = "Imprudence_%(version_dashes)s_%(channel_oneword)s_Setup.exe" grid_vars_template = """ OutFile "%(installer_file)s" !define INSTFLAGS "%(flags)s" - !define INSTNAME "SecondLife%(channel_oneword)s" + !define INSTNAME "Imprudence%(channel_oneword)s" !define SHORTCUT "%(channel)s" - !define URLNAME "secondlife" + !define URLNAME "imprudence" !define UNINSTALL_SETTINGS 1 Caption "%(channel)s ${VERSION}" """ @@ -338,7 +338,7 @@ class WindowsManifest(ViewerManifest): installer_file = installer_file % substitution_strings substitution_strings['installer_file'] = installer_file - tempfile = "secondlife_setup_tmp.nsi" + tempfile = "imprudence_setup_tmp.nsi" # the following replaces strings in the nsi template # it also does python-style % substitution self.replace_in("installers/windows/installer_template.nsi", tempfile, { @@ -358,7 +358,7 @@ class WindowsManifest(ViewerManifest): class DarwinManifest(ViewerManifest): def construct(self): # copy over the build result (this is a no-op if run within the xcode script) - self.path(self.args['configuration'] + "/Second Life.app", dst="") + self.path(self.args['configuration'] + "/Imprudence.app", dst="") if self.prefix(src="", dst="Contents"): # everything goes in Contents # Expand the tar file containing the assorted mozilla bits into @@ -437,16 +437,16 @@ class DarwinManifest(ViewerManifest): def package_finish(self): - channel_standin = 'Second Life' # hah, our default channel is not usable on its own + channel_standin = 'Imprudence' # hah, our default channel is not usable on its own if not self.default_channel(): channel_standin = self.channel() - imagename="SecondLife_" + '_'.join(self.args['version']) + imagename="Imprudence_" + '_'.join(self.args['version']) # MBW -- If the mounted volume name changes, it breaks the .DS_Store's background image and icon positioning. # If we really need differently named volumes, we'll need to create multiple DS_Store file images, or use some other trick. - volname="Second Life Installer" # DO NOT CHANGE without understanding comment above + volname="Imprudence Installer" # DO NOT CHANGE without understanding comment above if self.default_channel(): if not self.default_grid(): @@ -473,7 +473,7 @@ class DarwinManifest(ViewerManifest): # Copy everything in to the mounted .dmg if self.default_channel() and not self.default_grid(): - app_name = "Second Life " + self.args['grid'] + app_name = "Imprudence " + self.args['grid'] else: app_name = channel_standin.strip() @@ -533,7 +533,7 @@ class LinuxManifest(ViewerManifest): 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("wrapper.sh","secondlife") + self.path("wrapper.sh","imprudence") self.path("handle_secondlifeprotocol.sh") self.path("register_secondlifeprotocol.sh") self.end_prefix("linux_tools") @@ -553,7 +553,7 @@ class LinuxManifest(ViewerManifest): if 'installer_name' in self.args: installer_name = self.args['installer_name'] else: - installer_name_components = ['SecondLife_', self.args.get('arch')] + installer_name_components = ['Imprudence_', self.args.get('arch')] installer_name_components.extend(self.args['version']) installer_name = "_".join(installer_name_components) if self.default_channel(): @@ -598,7 +598,7 @@ class LinuxManifest(ViewerManifest): class Linux_i686Manifest(LinuxManifest): def construct(self): super(Linux_i686Manifest, self).construct() - self.path("secondlife-stripped","bin/do-not-directly-run-secondlife-bin") + self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin") # self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin") self.path("linux_tools/launch_url.sh","launch_url.sh") if self.prefix("res-sdl"): @@ -643,7 +643,7 @@ class Linux_i686Manifest(LinuxManifest): class Linux_x86_64Manifest(LinuxManifest): def construct(self): super(Linux_x86_64Manifest, self).construct() - self.path("secondlife-stripped","bin/do-not-directly-run-secondlife-bin") + self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin") # self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin") self.path("linux_tools/launch_url.sh","launch_url.sh") if self.prefix("res-sdl"): -- cgit v1.1