From cf1db62ab804c289ee08f123d7600024a68cec8e Mon Sep 17 00:00:00 2001 From: root Date: Sun, 25 Mar 2018 12:04:43 +0200 Subject: [PATCH] =?UTF-8?q?correction=20pour=20la=20compilation=20sous=20w?= =?UTF-8?q?indows=20=C3=A0=20cause=20des=20merges=20RC=20mal=20fait?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/CMakeLists.txt | 1 + code/nel/src/3d/driver/direct3d/resources.rc | 74 +-- code/nel/src/3d/driver/opengl/resources.rc | 74 +-- code/nel/src/3d/driver/opengles/resources.rc | 74 +-- code/nel/src/sound/driver/dsound/resources.rc | 74 +-- code/nel/src/sound/driver/fmod/resources.rc | 74 +-- code/nel/src/sound/driver/openal/resources.rc | 74 +-- .../nel/src/sound/driver/xaudio2/resources.rc | 74 +-- code/ryzom/client/src/client.rc | 444 +++++++++--------- code/ryzom/client/windows/upgd_nl.bat | 78 +-- code/ryzom/client/windows/upgd_nl_msvc10.bat | 78 +-- code/ryzom/client/windows/upgd_nl_msvc12.bat | 78 +-- .../admin_install/bin/admin.screen.rc | 38 +- code/ryzom/server/shard.screen.rc | 154 +++--- code/ryzom/server/shard_start.bat | 198 ++++---- code/ryzom/server/shard_start_cmake.bat | 210 ++++----- code/ryzom/server/shard_stop.bat | 102 ++-- code/ryzom/server/shard_stop_cmake.bat | 108 ++--- 18 files changed, 1004 insertions(+), 1003 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 3824e7640..43054b63e 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -62,6 +62,7 @@ SET(AUTHOR "Winch Gate and The Ryzom Core Community") SET(RYZOM_VERSION_MAJOR 3) SET(RYZOM_VERSION_MINOR 2) SET(RYZOM_VERSION_PATCH 1) +SET(REVISION 0) #----------------------------------------------------------------------------- # Redirect output files diff --git a/code/nel/src/3d/driver/direct3d/resources.rc b/code/nel/src/3d/driver/direct3d/resources.rc index d5cdf5f7d..4211b6c32 100644 --- a/code/nel/src/3d/driver/direct3d/resources.rc +++ b/code/nel/src/3d/driver/direct3d/resources.rc @@ -1,37 +1,37 @@ -#include -#include "config.h" - -VS_VERSION_INFO VERSIONINFO -FILEVERSION NL_VERSION_RC -PRODUCTVERSION NL_VERSION_RC -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "NeL Direct3D driver" - VALUE "FileVersion", NL_VERSION - VALUE "LegalCopyright", COPYRIGHT -#ifdef _DEBUG - VALUE "OriginalFilename", "nel_drv_direct3d_win_d.dll" -#else - VALUE "OriginalFilename", "nel_drv_direct3d_win_r.dll" -#endif - VALUE "ProductName", "Ryzom Core" - VALUE "ProductVersion", NL_VERSION - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END +#include +#include "config.h" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION NL_VERSION_RC +PRODUCTVERSION NL_VERSION_RC +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "NeL Direct3D driver" + VALUE "FileVersion", NL_VERSION + VALUE "LegalCopyright", COPYRIGHT +#ifdef _DEBUG + VALUE "OriginalFilename", "nel_drv_direct3d_win_d.dll" +#else + VALUE "OriginalFilename", "nel_drv_direct3d_win_r.dll" +#endif + VALUE "ProductName", "Ryzom Core" + VALUE "ProductVersion", NL_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END diff --git a/code/nel/src/3d/driver/opengl/resources.rc b/code/nel/src/3d/driver/opengl/resources.rc index ed7e5963c..3934c4e19 100644 --- a/code/nel/src/3d/driver/opengl/resources.rc +++ b/code/nel/src/3d/driver/opengl/resources.rc @@ -1,37 +1,37 @@ -#include -#include "config.h" - -VS_VERSION_INFO VERSIONINFO -FILEVERSION NL_VERSION_RC -PRODUCTVERSION NL_VERSION_RC -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "NeL OpenGL driver" - VALUE "FileVersion", NL_VERSION - VALUE "LegalCopyright", COPYRIGHT -#ifdef _DEBUG - VALUE "OriginalFilename", "nel_drv_opengl_win_d.dll" -#else - VALUE "OriginalFilename", "nel_drv_opengl_win_r.dll" -#endif - VALUE "ProductName", "Ryzom Core" - VALUE "ProductVersion", NL_VERSION - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END +#include +#include "config.h" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION NL_VERSION_RC +PRODUCTVERSION NL_VERSION_RC +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "NeL OpenGL driver" + VALUE "FileVersion", NL_VERSION + VALUE "LegalCopyright", COPYRIGHT +#ifdef _DEBUG + VALUE "OriginalFilename", "nel_drv_opengl_win_d.dll" +#else + VALUE "OriginalFilename", "nel_drv_opengl_win_r.dll" +#endif + VALUE "ProductName", "Ryzom Core" + VALUE "ProductVersion", NL_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END diff --git a/code/nel/src/3d/driver/opengles/resources.rc b/code/nel/src/3d/driver/opengles/resources.rc index 5a6102ea5..aa7d66398 100644 --- a/code/nel/src/3d/driver/opengles/resources.rc +++ b/code/nel/src/3d/driver/opengles/resources.rc @@ -1,37 +1,37 @@ -#include -#include "config.h" - -VS_VERSION_INFO VERSIONINFO -FILEVERSION NL_VERSION_RC -PRODUCTVERSION NL_VERSION_RC -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "NeL OpenGL ES 1.1 driver" - VALUE "FileVersion", NL_VERSION - VALUE "LegalCopyright", COPYRIGHT -#ifdef _DEBUG - VALUE "OriginalFilename", "nel_drv_opengles_win_d.dll" -#else - VALUE "OriginalFilename", "nel_drv_opengles_win_r.dll" -#endif - VALUE "ProductName", "Ryzom Core" - VALUE "ProductVersion", NL_VERSION - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END +#include +#include "config.h" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION NL_VERSION_RC +PRODUCTVERSION NL_VERSION_RC +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "NeL OpenGL ES 1.1 driver" + VALUE "FileVersion", NL_VERSION + VALUE "LegalCopyright", COPYRIGHT +#ifdef _DEBUG + VALUE "OriginalFilename", "nel_drv_opengles_win_d.dll" +#else + VALUE "OriginalFilename", "nel_drv_opengles_win_r.dll" +#endif + VALUE "ProductName", "Ryzom Core" + VALUE "ProductVersion", NL_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END diff --git a/code/nel/src/sound/driver/dsound/resources.rc b/code/nel/src/sound/driver/dsound/resources.rc index ef6d5ae40..31bf52aed 100644 --- a/code/nel/src/sound/driver/dsound/resources.rc +++ b/code/nel/src/sound/driver/dsound/resources.rc @@ -1,37 +1,37 @@ -#include -#include "config.h" - -VS_VERSION_INFO VERSIONINFO -FILEVERSION NL_VERSION_RC -PRODUCTVERSION NL_VERSION_RC -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "NeL DirectSound driver" - VALUE "FileVersion", NL_VERSION - VALUE "LegalCopyright", COPYRIGHT -#ifdef _DEBUG - VALUE "OriginalFilename", "nel_drv_dsound_win_d.dll" -#else - VALUE "OriginalFilename", "nel_drv_dsound_win_r.dll" -#endif - VALUE "ProductName", "Ryzom Core" - VALUE "ProductVersion", NL_VERSION - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END +#include +#include "config.h" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION NL_VERSION_RC +PRODUCTVERSION NL_VERSION_RC +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "NeL DirectSound driver" + VALUE "FileVersion", NL_VERSION + VALUE "LegalCopyright", COPYRIGHT +#ifdef _DEBUG + VALUE "OriginalFilename", "nel_drv_dsound_win_d.dll" +#else + VALUE "OriginalFilename", "nel_drv_dsound_win_r.dll" +#endif + VALUE "ProductName", "Ryzom Core" + VALUE "ProductVersion", NL_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END diff --git a/code/nel/src/sound/driver/fmod/resources.rc b/code/nel/src/sound/driver/fmod/resources.rc index 6d024e07d..8946e3483 100644 --- a/code/nel/src/sound/driver/fmod/resources.rc +++ b/code/nel/src/sound/driver/fmod/resources.rc @@ -1,37 +1,37 @@ -#include -#include "config.h" - -VS_VERSION_INFO VERSIONINFO -FILEVERSION NL_VERSION_RC -PRODUCTVERSION NL_VERSION_RC -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "NeL FMod driver" - VALUE "FileVersion", NL_VERSION - VALUE "LegalCopyright", COPYRIGHT -#ifdef _DEBUG - VALUE "OriginalFilename", "nel_drv_fmod_win_d.dll" -#else - VALUE "OriginalFilename", "nel_drv_fmod_win_r.dll" -#endif - VALUE "ProductName", "Ryzom Core" - VALUE "ProductVersion", NL_VERSION - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END +#include +#include "config.h" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION NL_VERSION_RC +PRODUCTVERSION NL_VERSION_RC +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "NeL FMod driver" + VALUE "FileVersion", NL_VERSION + VALUE "LegalCopyright", COPYRIGHT +#ifdef _DEBUG + VALUE "OriginalFilename", "nel_drv_fmod_win_d.dll" +#else + VALUE "OriginalFilename", "nel_drv_fmod_win_r.dll" +#endif + VALUE "ProductName", "Ryzom Core" + VALUE "ProductVersion", NL_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END diff --git a/code/nel/src/sound/driver/openal/resources.rc b/code/nel/src/sound/driver/openal/resources.rc index 0d907f198..97fdc87e9 100644 --- a/code/nel/src/sound/driver/openal/resources.rc +++ b/code/nel/src/sound/driver/openal/resources.rc @@ -1,37 +1,37 @@ -#include -#include "config.h" - -VS_VERSION_INFO VERSIONINFO -FILEVERSION NL_VERSION_RC -PRODUCTVERSION NL_VERSION_RC -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "NeL OpenAL driver" - VALUE "FileVersion", NL_VERSION - VALUE "LegalCopyright", COPYRIGHT -#ifdef _DEBUG - VALUE "OriginalFilename", "nel_drv_openal_win_d.dll" -#else - VALUE "OriginalFilename", "nel_drv_openal_win_r.dll" -#endif - VALUE "ProductName", "Ryzom Core" - VALUE "ProductVersion", NL_VERSION - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END +#include +#include "config.h" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION NL_VERSION_RC +PRODUCTVERSION NL_VERSION_RC +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "NeL OpenAL driver" + VALUE "FileVersion", NL_VERSION + VALUE "LegalCopyright", COPYRIGHT +#ifdef _DEBUG + VALUE "OriginalFilename", "nel_drv_openal_win_d.dll" +#else + VALUE "OriginalFilename", "nel_drv_openal_win_r.dll" +#endif + VALUE "ProductName", "Ryzom Core" + VALUE "ProductVersion", NL_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END diff --git a/code/nel/src/sound/driver/xaudio2/resources.rc b/code/nel/src/sound/driver/xaudio2/resources.rc index f2af9954b..ef7165456 100644 --- a/code/nel/src/sound/driver/xaudio2/resources.rc +++ b/code/nel/src/sound/driver/xaudio2/resources.rc @@ -1,37 +1,37 @@ -#include -#include "config.h" - -VS_VERSION_INFO VERSIONINFO -FILEVERSION NL_VERSION_RC -PRODUCTVERSION NL_VERSION_RC -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "NeL XAudio2 driver" - VALUE "FileVersion", NL_VERSION - VALUE "LegalCopyright", COPYRIGHT -#ifdef _DEBUG - VALUE "OriginalFilename", "nel_drv_xaudio2_win_d.dll" -#else - VALUE "OriginalFilename", "nel_drv_xaudio2_win_r.dll" -#endif - VALUE "ProductName", "Ryzom Core" - VALUE "ProductVersion", NL_VERSION - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END +#include +#include "config.h" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION NL_VERSION_RC +PRODUCTVERSION NL_VERSION_RC +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "NeL XAudio2 driver" + VALUE "FileVersion", NL_VERSION + VALUE "LegalCopyright", COPYRIGHT +#ifdef _DEBUG + VALUE "OriginalFilename", "nel_drv_xaudio2_win_d.dll" +#else + VALUE "OriginalFilename", "nel_drv_xaudio2_win_r.dll" +#endif + VALUE "ProductName", "Ryzom Core" + VALUE "ProductVersion", NL_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END diff --git a/code/ryzom/client/src/client.rc b/code/ryzom/client/src/client.rc index 20871391a..b6b149fca 100644 --- a/code/ryzom/client/src/client.rc +++ b/code/ryzom/client/src/client.rc @@ -1,222 +1,222 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include -#include "config.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_MAIN_ICON ICON DISCARDABLE "khanat.ico" -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// French (France) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) -#ifdef _WIN32 -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH -#pragma code_page(1252) -#endif //_WIN32 - -#define IDC_STATIC -1 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_SLASH_SCREEN DIALOGEX 0, 0, 333, 231 -STYLE WS_POPUP -EXSTYLE WS_EX_TOOLWINDOW -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - CONTROL 117,IDC_STATIC,"Static",SS_BITMAP,0,0,333,231 -END - -IDD_CRASH_INFORMATION DIALOG DISCARDABLE 0, 0, 186, 301 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "Khanat information" -FONT 8, "MS Sans Serif" -BEGIN - LTEXT "Khanat has detected that the last game session has not quit properly. You have experienced :", - IDC_STATIC,7,7,172,27 - PUSHBUTTON "A computer freeze.",FROZEN,7,38,172,29 - PUSHBUTTON "A computer self reboot.",REBOOTED,7,70,172,29 - PUSHBUTTON "A game crash with a NeL report window.",WINDOWED,7,102, - 172,29,BS_MULTILINE - PUSHBUTTON "A game crash without NeL report window.",NO_WINDOW,7, - 134,172,29,BS_MULTILINE - PUSHBUTTON "You killed the game process using the task manager.", - KILLED,7,166,172,29,BS_MULTILINE - PUSHBUTTON "Nothing wrong. The game quit normally.",NOT_CRASHED,7, - 198,172,29 - PUSHBUTTON "You don't remember what's happened",CRASHED,7,231,172, - 29 - LTEXT "If you experience lot of crash, please try to do a data check. Press the ""Check Data"" button at Login Screen.", - IDC_STATIC,5,270,175,25 -END - -IDD_ERROR_HELP_MESSAGE_BOX DIALOGEX 0, 0, 373, 81 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Ryzom" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "Exit",IDOK,85,57,89,21 - PUSHBUTTON "Help",IDC_RYZOM_ERROR_HELP,178,57,92,21 - LTEXT "Static",IDC_ERROR_MSG_TEXT,143,7,228,47,0, - WS_EX_CLIENTEDGE - CONTROL 128,IDC_STATIC,"Static",SS_BITMAP,7,7,70,63 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_SLASH_SCREEN, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 326 - TOPMARGIN, 7 - BOTTOMMARGIN, 224 - END - - IDD_CRASH_INFORMATION, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 294 - END - - IDD_ERROR_HELP_MESSAGE_BOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 366 - TOPMARGIN, 7 - BOTTOMMARGIN, 74 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_SLASH_SCREEN BITMAP DISCARDABLE "splash_screen.bmp" -IDB_ERROR_LOGO BITMAP DISCARDABLE "error_logo.bmp" -#endif // French (France) resources -///////////////////////////////////////////////////////////////////////////// - -VS_VERSION_INFO VERSIONINFO -FILEVERSION RYZOM_VERSION_RC -PRODUCTVERSION NL_VERSION_RC -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS__WINDOWS32 -FILETYPE VFT_APP -FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "Khanat client" - VALUE "FileVersion", RYZOM_VERSION - VALUE "LegalCopyright", COPYRIGHT -#if defined(FINAL_VERSION) && (FINAL_VERSION == 1) -#ifdef _DEBUG - VALUE "OriginalFilename", "khanat_client_d.exe" -#else - VALUE "OriginalFilename", "khanat_client_r.exe" -#endif -#else -#ifdef _DEBUG - VALUE "OriginalFilename", "khanat_client_dev_d.exe" -#else - VALUE "OriginalFilename", "khanat_client_dev_r.exe" -#endif -#endif - VALUE "ProductName", "Ryzom Core" - VALUE "ProductVersion", NL_VERSION - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include "config.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_MAIN_ICON ICON DISCARDABLE "khanat.ico" +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// French (France) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) +#ifdef _WIN32 +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +#pragma code_page(1252) +#endif //_WIN32 + +#define IDC_STATIC -1 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_SLASH_SCREEN DIALOGEX 0, 0, 333, 231 +STYLE WS_POPUP +EXSTYLE WS_EX_TOOLWINDOW +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL 117,IDC_STATIC,"Static",SS_BITMAP,0,0,333,231 +END + +IDD_CRASH_INFORMATION DIALOG DISCARDABLE 0, 0, 186, 301 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "Khanat information" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Khanat has detected that the last game session has not quit properly. You have experienced :", + IDC_STATIC,7,7,172,27 + PUSHBUTTON "A computer freeze.",FROZEN,7,38,172,29 + PUSHBUTTON "A computer self reboot.",REBOOTED,7,70,172,29 + PUSHBUTTON "A game crash with a NeL report window.",WINDOWED,7,102, + 172,29,BS_MULTILINE + PUSHBUTTON "A game crash without NeL report window.",NO_WINDOW,7, + 134,172,29,BS_MULTILINE + PUSHBUTTON "You killed the game process using the task manager.", + KILLED,7,166,172,29,BS_MULTILINE + PUSHBUTTON "Nothing wrong. The game quit normally.",NOT_CRASHED,7, + 198,172,29 + PUSHBUTTON "You don't remember what's happened",CRASHED,7,231,172, + 29 + LTEXT "If you experience lot of crash, please try to do a data check. Press the ""Check Data"" button at Login Screen.", + IDC_STATIC,5,270,175,25 +END + +IDD_ERROR_HELP_MESSAGE_BOX DIALOGEX 0, 0, 373, 81 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ryzom" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "Exit",IDOK,85,57,89,21 + PUSHBUTTON "Help",IDC_RYZOM_ERROR_HELP,178,57,92,21 + LTEXT "Static",IDC_ERROR_MSG_TEXT,143,7,228,47,0, + WS_EX_CLIENTEDGE + CONTROL 128,IDC_STATIC,"Static",SS_BITMAP,7,7,70,63 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_SLASH_SCREEN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 326 + TOPMARGIN, 7 + BOTTOMMARGIN, 224 + END + + IDD_CRASH_INFORMATION, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 179 + TOPMARGIN, 7 + BOTTOMMARGIN, 294 + END + + IDD_ERROR_HELP_MESSAGE_BOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 366 + TOPMARGIN, 7 + BOTTOMMARGIN, 74 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_SLASH_SCREEN BITMAP DISCARDABLE "splash_screen.bmp" +IDB_ERROR_LOGO BITMAP DISCARDABLE "error_logo.bmp" +#endif // French (France) resources +///////////////////////////////////////////////////////////////////////////// + +VS_VERSION_INFO VERSIONINFO +FILEVERSION RYZOM_VERSION_RC +PRODUCTVERSION NL_VERSION_RC +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS__WINDOWS32 +FILETYPE VFT_APP +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "Khanat client" + VALUE "FileVersion", RYZOM_VERSION + VALUE "LegalCopyright", COPYRIGHT +#if defined(FINAL_VERSION) && (FINAL_VERSION == 1) +#ifdef _DEBUG + VALUE "OriginalFilename", "khanat_client_d.exe" +#else + VALUE "OriginalFilename", "khanat_client_r.exe" +#endif +#else +#ifdef _DEBUG + VALUE "OriginalFilename", "khanat_client_dev_d.exe" +#else + VALUE "OriginalFilename", "khanat_client_dev_r.exe" +#endif +#endif + VALUE "ProductName", "Ryzom Core" + VALUE "ProductVersion", NL_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/code/ryzom/client/windows/upgd_nl.bat b/code/ryzom/client/windows/upgd_nl.bat index ad19c2497..294994bba 100644 --- a/code/ryzom/client/windows/upgd_nl.bat +++ b/code/ryzom/client/windows/upgd_nl.bat @@ -1,39 +1,39 @@ -@echo off - -if "x%ROOTPATH%x" == "xx" ( - echo upgd_nl.bat can only be launched from updt_nl.bat - goto end -) - -rem We used this hack because to client 2.1 to 3.0 patch, -rem MSVC10 DLLs are using the same name and are deleted during patch -if exist %ROOTPATH%\msvcp100_win32.dll ( - if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll - copy /Y %ROOTPATH%\msvcp100_win32.dll %ROOTPATH%\msvcp100.dll -) - -if exist %ROOTPATH%\msvcr100_win32.dll ( - if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll - copy /Y %ROOTPATH%\msvcr100_win32.dll %ROOTPATH%\msvcr100.dll -) - -if exist %ROOTPATH%\msvcp100_win64.dll ( - if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll - copy /Y %ROOTPATH%\msvcp100_win64.dll %ROOTPATH%\msvcp100.dll -) - -if exist %ROOTPATH%\msvcr100_win64.dll ( - if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll - copy /Y %ROOTPATH%\msvcr100_win64.dll %ROOTPATH%\msvcr100.dll -) - -if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe ( - if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %ROOTPATH%\..\ryzom_installer_qt_r.exe - copy /Y %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\.. - if exist %ROOTPATH%\..\msvcp100.dll del %ROOTPATH%\..\msvcp100.dll - copy /Y %ROOTPATH%\msvcp100.dll %ROOTPATH%\.. - if exist %ROOTPATH%\..\msvcr100.dll del %ROOTPATH%\..\msvcr100.dll - copy /Y %ROOTPATH%\msvcr100.dll %ROOTPATH%\.. -) - -:end +@echo off + +if "x%ROOTPATH%x" == "xx" ( + echo upgd_nl.bat can only be launched from updt_nl.bat + goto end +) + +rem We used this hack because to client 2.1 to 3.0 patch, +rem MSVC10 DLLs are using the same name and are deleted during patch +if exist %ROOTPATH%\msvcp100_win32.dll ( + if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll + copy /Y %ROOTPATH%\msvcp100_win32.dll %ROOTPATH%\msvcp100.dll +) + +if exist %ROOTPATH%\msvcr100_win32.dll ( + if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll + copy /Y %ROOTPATH%\msvcr100_win32.dll %ROOTPATH%\msvcr100.dll +) + +if exist %ROOTPATH%\msvcp100_win64.dll ( + if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll + copy /Y %ROOTPATH%\msvcp100_win64.dll %ROOTPATH%\msvcp100.dll +) + +if exist %ROOTPATH%\msvcr100_win64.dll ( + if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll + copy /Y %ROOTPATH%\msvcr100_win64.dll %ROOTPATH%\msvcr100.dll +) + +if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe ( + if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %ROOTPATH%\..\ryzom_installer_qt_r.exe + copy /Y %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\.. + if exist %ROOTPATH%\..\msvcp100.dll del %ROOTPATH%\..\msvcp100.dll + copy /Y %ROOTPATH%\msvcp100.dll %ROOTPATH%\.. + if exist %ROOTPATH%\..\msvcr100.dll del %ROOTPATH%\..\msvcr100.dll + copy /Y %ROOTPATH%\msvcr100.dll %ROOTPATH%\.. +) + +:end diff --git a/code/ryzom/client/windows/upgd_nl_msvc10.bat b/code/ryzom/client/windows/upgd_nl_msvc10.bat index 5dcb42592..68a876456 100644 --- a/code/ryzom/client/windows/upgd_nl_msvc10.bat +++ b/code/ryzom/client/windows/upgd_nl_msvc10.bat @@ -1,39 +1,39 @@ -@echo off - -if "x%ROOTPATH%x" == "xx" ( - echo upgd_nl.bat can only be launched from updt_nl.bat - goto end -) - -rem We used this hack because to client 2.1 to 3.0 patch, -rem VC++ 2010 DLLs are using the same name and are deleted during patch -if exist %ROOTPATH%\msvcp100_win32.dll ( - if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll - copy /Y %ROOTPATH%\msvcp100_win32.dll %ROOTPATH%\msvcp100.dll -) - -if exist %ROOTPATH%\msvcr100_win32.dll ( - if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll - copy /Y %ROOTPATH%\msvcr100_win32.dll %ROOTPATH%\msvcr100.dll -) - -if exist %ROOTPATH%\msvcp100_win64.dll ( - if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll - copy /Y %ROOTPATH%\msvcp100_win64.dll %ROOTPATH%\msvcp100.dll -) - -if exist %ROOTPATH%\msvcr100_win64.dll ( - if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll - copy /Y %ROOTPATH%\msvcr100_win64.dll %ROOTPATH%\msvcr100.dll -) - -if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe ( - if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %ROOTPATH%\..\ryzom_installer_qt_r.exe - copy /Y %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\.. - if exist %ROOTPATH%\..\msvcp100.dll del %ROOTPATH%\..\msvcp100.dll - copy /Y %ROOTPATH%\msvcp100.dll %ROOTPATH%\.. - if exist %ROOTPATH%\..\msvcr100.dll del %ROOTPATH%\..\msvcr100.dll - copy /Y %ROOTPATH%\msvcr100.dll %ROOTPATH%\.. -) - -:end +@echo off + +if "x%ROOTPATH%x" == "xx" ( + echo upgd_nl.bat can only be launched from updt_nl.bat + goto end +) + +rem We used this hack because to client 2.1 to 3.0 patch, +rem VC++ 2010 DLLs are using the same name and are deleted during patch +if exist %ROOTPATH%\msvcp100_win32.dll ( + if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll + copy /Y %ROOTPATH%\msvcp100_win32.dll %ROOTPATH%\msvcp100.dll +) + +if exist %ROOTPATH%\msvcr100_win32.dll ( + if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll + copy /Y %ROOTPATH%\msvcr100_win32.dll %ROOTPATH%\msvcr100.dll +) + +if exist %ROOTPATH%\msvcp100_win64.dll ( + if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll + copy /Y %ROOTPATH%\msvcp100_win64.dll %ROOTPATH%\msvcp100.dll +) + +if exist %ROOTPATH%\msvcr100_win64.dll ( + if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll + copy /Y %ROOTPATH%\msvcr100_win64.dll %ROOTPATH%\msvcr100.dll +) + +if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe ( + if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %ROOTPATH%\..\ryzom_installer_qt_r.exe + copy /Y %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\.. + if exist %ROOTPATH%\..\msvcp100.dll del %ROOTPATH%\..\msvcp100.dll + copy /Y %ROOTPATH%\msvcp100.dll %ROOTPATH%\.. + if exist %ROOTPATH%\..\msvcr100.dll del %ROOTPATH%\..\msvcr100.dll + copy /Y %ROOTPATH%\msvcr100.dll %ROOTPATH%\.. +) + +:end diff --git a/code/ryzom/client/windows/upgd_nl_msvc12.bat b/code/ryzom/client/windows/upgd_nl_msvc12.bat index abff3fe66..d9ae7bba0 100644 --- a/code/ryzom/client/windows/upgd_nl_msvc12.bat +++ b/code/ryzom/client/windows/upgd_nl_msvc12.bat @@ -1,39 +1,39 @@ -@echo off - -if "x%ROOTPATH%x" == "xx" ( - echo upgd_nl.bat can only be launched from updt_nl.bat - goto end -) - -rem We used this hack because to client 2.1 to 3.0 patch, -rem VC++ 2013 DLLs are using the same name and are deleted during patch -if exist %ROOTPATH%\msvcp120_win32.dll ( - if exist %ROOTPATH%\msvcp120.dll del %ROOTPATH%\msvcp120.dll - copy /Y %ROOTPATH%\msvcp120_win32.dll %ROOTPATH%\msvcp120.dll -) - -if exist %ROOTPATH%\msvcr120_win32.dll ( - if exist %ROOTPATH%\msvcr120.dll del %ROOTPATH%\msvcr120.dll - copy /Y %ROOTPATH%\msvcr120_win32.dll %ROOTPATH%\msvcr120.dll -) - -if exist %ROOTPATH%\msvcp120_win64.dll ( - if exist %ROOTPATH%\msvcp120.dll del %ROOTPATH%\msvcp120.dll - copy /Y %ROOTPATH%\msvcp120_win64.dll %ROOTPATH%\msvcp120.dll -) - -if exist %ROOTPATH%\msvcr120_win64.dll ( - if exist %ROOTPATH%\msvcr120.dll del %ROOTPATH%\msvcr120.dll - copy /Y %ROOTPATH%\msvcr120_win64.dll %ROOTPATH%\msvcr120.dll -) - -if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe ( - if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %ROOTPATH%\..\ryzom_installer_qt_r.exe - copy /Y %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\.. - if exist %ROOTPATH%\..\msvcp120.dll del %ROOTPATH%\..\msvcp120.dll - copy /Y %ROOTPATH%\msvcp120.dll %ROOTPATH%\.. - if exist %ROOTPATH%\..\msvcr120.dll del %ROOTPATH%\..\msvcr120.dll - copy /Y %ROOTPATH%\msvcr120.dll %ROOTPATH%\.. -) - -:end +@echo off + +if "x%ROOTPATH%x" == "xx" ( + echo upgd_nl.bat can only be launched from updt_nl.bat + goto end +) + +rem We used this hack because to client 2.1 to 3.0 patch, +rem VC++ 2013 DLLs are using the same name and are deleted during patch +if exist %ROOTPATH%\msvcp120_win32.dll ( + if exist %ROOTPATH%\msvcp120.dll del %ROOTPATH%\msvcp120.dll + copy /Y %ROOTPATH%\msvcp120_win32.dll %ROOTPATH%\msvcp120.dll +) + +if exist %ROOTPATH%\msvcr120_win32.dll ( + if exist %ROOTPATH%\msvcr120.dll del %ROOTPATH%\msvcr120.dll + copy /Y %ROOTPATH%\msvcr120_win32.dll %ROOTPATH%\msvcr120.dll +) + +if exist %ROOTPATH%\msvcp120_win64.dll ( + if exist %ROOTPATH%\msvcp120.dll del %ROOTPATH%\msvcp120.dll + copy /Y %ROOTPATH%\msvcp120_win64.dll %ROOTPATH%\msvcp120.dll +) + +if exist %ROOTPATH%\msvcr120_win64.dll ( + if exist %ROOTPATH%\msvcr120.dll del %ROOTPATH%\msvcr120.dll + copy /Y %ROOTPATH%\msvcr120_win64.dll %ROOTPATH%\msvcr120.dll +) + +if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe ( + if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %ROOTPATH%\..\ryzom_installer_qt_r.exe + copy /Y %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\.. + if exist %ROOTPATH%\..\msvcp120.dll del %ROOTPATH%\..\msvcp120.dll + copy /Y %ROOTPATH%\msvcp120.dll %ROOTPATH%\.. + if exist %ROOTPATH%\..\msvcr120.dll del %ROOTPATH%\..\msvcr120.dll + copy /Y %ROOTPATH%\msvcr120.dll %ROOTPATH%\.. +) + +:end diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/admin.screen.rc b/code/ryzom/server/patchman_cfg/admin_install/bin/admin.screen.rc index 9438c1fde..e6c5a03a4 100644 --- a/code/ryzom/server/patchman_cfg/admin_install/bin/admin.screen.rc +++ b/code/ryzom/server/patchman_cfg/admin_install/bin/admin.screen.rc @@ -1,19 +1,19 @@ - -# ------------------------------------------------------------------------------ -# SCREEN KEYBINDINGS -# ------------------------------------------------------------------------------ - -# Remove some stupid / dangerous key bindings -bind ^k -#bind L -bind ^\ -# Make them better -bind \\ quit -bind K kill -bind I login on -bind O login off - -# patchman -chdir "/srv/core/patchman/" -screen -t patchman /bin/sh ./loop_patchman.sh - + +# ------------------------------------------------------------------------------ +# SCREEN KEYBINDINGS +# ------------------------------------------------------------------------------ + +# Remove some stupid / dangerous key bindings +bind ^k +#bind L +bind ^\ +# Make them better +bind \\ quit +bind K kill +bind I login on +bind O login off + +# patchman +chdir "/srv/core/patchman/" +screen -t patchman /bin/sh ./loop_patchman.sh + diff --git a/code/ryzom/server/shard.screen.rc b/code/ryzom/server/shard.screen.rc index f58dd1371..bf0b4199c 100644 --- a/code/ryzom/server/shard.screen.rc +++ b/code/ryzom/server/shard.screen.rc @@ -1,77 +1,77 @@ -# ------------------------------------------------------------------------------ -# SCREEN KEYBINDINGS -# ------------------------------------------------------------------------------ - -# Remove some stupid / dangerous key bindings -bind ^k -#bind L -bind ^\ -# Make them better -bind \\ quit -bind K kill -bind I login on -bind O login off - -hardstatus alwayslastline "%w" - -chdir $RYZOM_PATH/server - -screen -t aes /bin/sh ../tools/scripts/linux/service_launcher.sh aes $RYZOM_PATH/../build/bin/ryzom_admin_service -A. -C. -L. --nobreak --fulladminname=admin_executor_service --shortadminname=AES - -# bms_master -screen -t bms_master /bin/sh ../tools/scripts/linux/service_launcher.sh bms_master $RYZOM_PATH/../build/bin/ryzom_backup_service -C. -L. --nobreak --writepid -P49990 - -# bms_pd_master -#screen -t bms_pd_master /bin/sh ../tools/scripts/linux/service_launcher.sh bms_pd_master $RYZOM_PATH/../build/bin/ryzom_backup_service -C. -L. --nobreak --writepid -P49992 - -# egs -screen -t egs /bin/sh ../tools/scripts/linux/service_launcher.sh egs $RYZOM_PATH/../build/bin/ryzom_entities_game_service -C. -L. --nobreak --writepid - -# gpms -screen -t gpms /bin/sh ../tools/scripts/linux/service_launcher.sh gpms $RYZOM_PATH/../build/bin/ryzom_gpm_service -C. -L. --nobreak --writepid - -# ios -screen -t ios /bin/sh ../tools/scripts/linux/service_launcher.sh ios $RYZOM_PATH/../build/bin/ryzom_ios_service -C. -L. --nobreak --writepid - -# rns -screen -t rns /bin/sh ../tools/scripts/linux/service_launcher.sh rns $RYZOM_PATH/../build/bin/ryzom_naming_service -C. -L. --nobreak --writepid - -# rws -screen -t rws /bin/sh ../tools/scripts/linux/service_launcher.sh rws $RYZOM_PATH/../build/bin/ryzom_welcome_service -C. -L. --nobreak --writepid - -# ts -screen -t ts /bin/sh ../tools/scripts/linux/service_launcher.sh ts $RYZOM_PATH/../build/bin/ryzom_tick_service -C. -L. --nobreak --writepid - -# ms -screen -t ms /bin/sh ../tools/scripts/linux/service_launcher.sh ms $RYZOM_PATH/../build/bin/ryzom_mirror_service -C. -L. --nobreak --writepid - -# ais_newbyland -screen -t ais_newbyland /bin/sh ../tools/scripts/linux/service_launcher.sh ais_newbyland $RYZOM_PATH/../build/bin/ryzom_ai_service -C. -L. --nobreak --writepid -mCommon:Newbieland:Post - -# mfs -screen -t mfs /bin/sh ../tools/scripts/linux/service_launcher.sh mfs $RYZOM_PATH/../build/bin/ryzom_mail_forum_service -C. -L. --nobreak --writepid - -# su -screen -t su /bin/sh ../tools/scripts/linux/service_launcher.sh su $RYZOM_PATH/../build/bin/ryzom_shard_unifier_service -C. -L. --nobreak --writepid - -# fes -screen -t fes /bin/sh ../tools/scripts/linux/service_launcher.sh fes $RYZOM_PATH/../build/bin/ryzom_frontend_service -C. -L. --nobreak --writepid - -# sbs -screen -t sbs /bin/sh ../tools/scripts/linux/service_launcher.sh sbs $RYZOM_PATH/../build/bin/ryzom_session_browser_service -C. -L. --nobreak --writepid - -# lgs -screen -t lgs /bin/sh ../tools/scripts/linux/service_launcher.sh lgs $RYZOM_PATH/../build/bin/ryzom_logger_service -C. -L. --nobreak --writepid - -# mos -#screen -t mos /bin/sh ../tools/scripts/linux/service_launcher.sh mos $RYZOM_PATH/../build/bin/ryzom_monitor_service -C. -L. --nobreak --writepid - -# pdss -#screen -t pdss /bin/sh ../tools/scripts/linux/service_launcher.sh pdss $RYZOM_PATH/../build/bin/ryzom_pd_support_service -C. -L. --nobreak --writepid - -# ras -screen -t ras /bin/sh ../tools/scripts/linux/service_launcher.sh ras $RYZOM_PATH/../build/bin/ryzom_admin_service --fulladminname=admin_service --shortadminname=AS -C. -L. --nobreak --writepid - -# switch back to AES screen -select 0 - +# ------------------------------------------------------------------------------ +# SCREEN KEYBINDINGS +# ------------------------------------------------------------------------------ + +# Remove some stupid / dangerous key bindings +bind ^k +#bind L +bind ^\ +# Make them better +bind \\ quit +bind K kill +bind I login on +bind O login off + +hardstatus alwayslastline "%w" + +chdir $RYZOM_PATH/server + +screen -t aes /bin/sh ../tools/scripts/linux/service_launcher.sh aes $RYZOM_PATH/../build/bin/ryzom_admin_service -A. -C. -L. --nobreak --fulladminname=admin_executor_service --shortadminname=AES + +# bms_master +screen -t bms_master /bin/sh ../tools/scripts/linux/service_launcher.sh bms_master $RYZOM_PATH/../build/bin/ryzom_backup_service -C. -L. --nobreak --writepid -P49990 + +# bms_pd_master +#screen -t bms_pd_master /bin/sh ../tools/scripts/linux/service_launcher.sh bms_pd_master $RYZOM_PATH/../build/bin/ryzom_backup_service -C. -L. --nobreak --writepid -P49992 + +# egs +screen -t egs /bin/sh ../tools/scripts/linux/service_launcher.sh egs $RYZOM_PATH/../build/bin/ryzom_entities_game_service -C. -L. --nobreak --writepid + +# gpms +screen -t gpms /bin/sh ../tools/scripts/linux/service_launcher.sh gpms $RYZOM_PATH/../build/bin/ryzom_gpm_service -C. -L. --nobreak --writepid + +# ios +screen -t ios /bin/sh ../tools/scripts/linux/service_launcher.sh ios $RYZOM_PATH/../build/bin/ryzom_ios_service -C. -L. --nobreak --writepid + +# rns +screen -t rns /bin/sh ../tools/scripts/linux/service_launcher.sh rns $RYZOM_PATH/../build/bin/ryzom_naming_service -C. -L. --nobreak --writepid + +# rws +screen -t rws /bin/sh ../tools/scripts/linux/service_launcher.sh rws $RYZOM_PATH/../build/bin/ryzom_welcome_service -C. -L. --nobreak --writepid + +# ts +screen -t ts /bin/sh ../tools/scripts/linux/service_launcher.sh ts $RYZOM_PATH/../build/bin/ryzom_tick_service -C. -L. --nobreak --writepid + +# ms +screen -t ms /bin/sh ../tools/scripts/linux/service_launcher.sh ms $RYZOM_PATH/../build/bin/ryzom_mirror_service -C. -L. --nobreak --writepid + +# ais_newbyland +screen -t ais_newbyland /bin/sh ../tools/scripts/linux/service_launcher.sh ais_newbyland $RYZOM_PATH/../build/bin/ryzom_ai_service -C. -L. --nobreak --writepid -mCommon:Newbieland:Post + +# mfs +screen -t mfs /bin/sh ../tools/scripts/linux/service_launcher.sh mfs $RYZOM_PATH/../build/bin/ryzom_mail_forum_service -C. -L. --nobreak --writepid + +# su +screen -t su /bin/sh ../tools/scripts/linux/service_launcher.sh su $RYZOM_PATH/../build/bin/ryzom_shard_unifier_service -C. -L. --nobreak --writepid + +# fes +screen -t fes /bin/sh ../tools/scripts/linux/service_launcher.sh fes $RYZOM_PATH/../build/bin/ryzom_frontend_service -C. -L. --nobreak --writepid + +# sbs +screen -t sbs /bin/sh ../tools/scripts/linux/service_launcher.sh sbs $RYZOM_PATH/../build/bin/ryzom_session_browser_service -C. -L. --nobreak --writepid + +# lgs +screen -t lgs /bin/sh ../tools/scripts/linux/service_launcher.sh lgs $RYZOM_PATH/../build/bin/ryzom_logger_service -C. -L. --nobreak --writepid + +# mos +#screen -t mos /bin/sh ../tools/scripts/linux/service_launcher.sh mos $RYZOM_PATH/../build/bin/ryzom_monitor_service -C. -L. --nobreak --writepid + +# pdss +#screen -t pdss /bin/sh ../tools/scripts/linux/service_launcher.sh pdss $RYZOM_PATH/../build/bin/ryzom_pd_support_service -C. -L. --nobreak --writepid + +# ras +screen -t ras /bin/sh ../tools/scripts/linux/service_launcher.sh ras $RYZOM_PATH/../build/bin/ryzom_admin_service --fulladminname=admin_service --shortadminname=AS -C. -L. --nobreak --writepid + +# switch back to AES screen +select 0 + diff --git a/code/ryzom/server/shard_start.bat b/code/ryzom/server/shard_start.bat index 196c1c7d3..907c11d3a 100644 --- a/code/ryzom/server/shard_start.bat +++ b/code/ryzom/server/shard_start.bat @@ -1,99 +1,99 @@ -@echo off - -REM This script will start all the services with good parameters - -REM set MODE=Debug -set MODE=Release - -rem AS -start %MODE%\ryzom_admin_service.exe --fulladminname=admin_executor_service --shortadminname=AES - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem bms_master -start %MODE%\backup_service --writepid -P49990 - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem egs -start %MODE%\entities_game_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem gpms -start %MODE%\gpm_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ios -start %MODE%\input_output_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem rns -start %MODE%\ryzom_naming_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem rws -start %MODE%\ryzom_welcome_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ts -start %MODE%\tick_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ms -start %MODE%\mirror_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ais_newbyland -start %MODE%\ai_service --writepid -mCommon:Newbieland:Post - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem mfs -start %MODE%\mail_forum_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem su -start %MODE%\shard_unifier_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem fes -start %MODE%\frontend_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem sbs -start %MODE%\session_browser_server --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem lgs -start %MODE%\logger_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ras -start %MODE%\ryzom_admin_service --fulladminname=admin_service --shortadminname=AS --writepid +@echo off + +REM This script will start all the services with good parameters + +REM set MODE=Debug +set MODE=Release + +rem AS +start %MODE%\ryzom_admin_service.exe --fulladminname=admin_executor_service --shortadminname=AES + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem bms_master +start %MODE%\backup_service --writepid -P49990 + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem egs +start %MODE%\entities_game_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem gpms +start %MODE%\gpm_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem ios +start %MODE%\input_output_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem rns +start %MODE%\ryzom_naming_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem rws +start %MODE%\ryzom_welcome_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem ts +start %MODE%\tick_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem ms +start %MODE%\mirror_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem ais_newbyland +start %MODE%\ai_service --writepid -mCommon:Newbieland:Post + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem mfs +start %MODE%\mail_forum_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem su +start %MODE%\shard_unifier_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem fes +start %MODE%\frontend_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem sbs +start %MODE%\session_browser_server --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem lgs +start %MODE%\logger_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem ras +start %MODE%\ryzom_admin_service --fulladminname=admin_service --shortadminname=AS --writepid diff --git a/code/ryzom/server/shard_start_cmake.bat b/code/ryzom/server/shard_start_cmake.bat index 943a0b5f3..dbf608a95 100644 --- a/code/ryzom/server/shard_start_cmake.bat +++ b/code/ryzom/server/shard_start_cmake.bat @@ -1,105 +1,105 @@ -@echo off - -REM This script will start all the services with good parameters - -REM set MODE=Debug -set MODE=..\..\build\bin\Release - -rem AS -start %MODE%\ryzom_admin_service.exe --fulladminname=admin_executor_service --shortadminname=AES - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem bms_master -start %MODE%\ryzom_backup_service --writepid -P49990 - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem egs -start %MODE%\ryzom_entities_game_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem gpms -start %MODE%\ryzom_gpm_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ios -start %MODE%\ryzom_ios_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem rns -start %MODE%\ryzom_naming_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem rws -start %MODE%\ryzom_welcome_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ts -start %MODE%\ryzom_tick_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ms -start %MODE%\ryzom_mirror_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ais_newbyland -start %MODE%\ryzom_ai_service --writepid -mCommon:Newbieland:Post - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem mfs -start %MODE%\ryzom_mail_forum_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem su -start %MODE%\ryzom_shard_unifier_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem fes -start %MODE%\ryzom_frontend_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem sbs -start %MODE%\ryzom_session_browser_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem lgs -start %MODE%\ryzom_logger_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem lgs -start %MODE%\ryzom_dynamic_scenario_service --writepid - -rem wait 2s (yes, i didn't find a better way to wait N seconds) -ping -n 2 127.0.0.1 > NUL 2>&1 - -rem ras -start %MODE%\ryzom_admin_service --fulladminname=admin_service --shortadminname=AS --writepid +@echo off + +REM This script will start all the services with good parameters + +REM set MODE=Debug +set MODE=..\..\build\bin\Release + +rem AS +start %MODE%\ryzom_admin_service.exe --fulladminname=admin_executor_service --shortadminname=AES + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem bms_master +start %MODE%\ryzom_backup_service --writepid -P49990 + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem egs +start %MODE%\ryzom_entities_game_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem gpms +start %MODE%\ryzom_gpm_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem ios +start %MODE%\ryzom_ios_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem rns +start %MODE%\ryzom_naming_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem rws +start %MODE%\ryzom_welcome_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem ts +start %MODE%\ryzom_tick_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem ms +start %MODE%\ryzom_mirror_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem ais_newbyland +start %MODE%\ryzom_ai_service --writepid -mCommon:Newbieland:Post + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem mfs +start %MODE%\ryzom_mail_forum_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem su +start %MODE%\ryzom_shard_unifier_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem fes +start %MODE%\ryzom_frontend_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem sbs +start %MODE%\ryzom_session_browser_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem lgs +start %MODE%\ryzom_logger_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem lgs +start %MODE%\ryzom_dynamic_scenario_service --writepid + +rem wait 2s (yes, i didn't find a better way to wait N seconds) +ping -n 2 127.0.0.1 > NUL 2>&1 + +rem ras +start %MODE%\ryzom_admin_service --fulladminname=admin_service --shortadminname=AS --writepid diff --git a/code/ryzom/server/shard_stop.bat b/code/ryzom/server/shard_stop.bat index 9429d23fb..02dd7bd51 100644 --- a/code/ryzom/server/shard_stop.bat +++ b/code/ryzom/server/shard_stop.bat @@ -1,51 +1,51 @@ -@echo off - -REM This script will kill all the services launched by shard_start.bat - -rem AS -taskkill /IM ryzom_admin_service.exe - -rem bms_master -taskkill /IM backup_service.exe - -rem egs -taskkill /IM entities_game_service.exe - -rem gpms -taskkill /IM gpm_service.exe - -rem ios -taskkill /IM input_output_service.exe - -rem rns -taskkill /IM ryzom_naming_service.exe - -rem rws -taskkill /IM ryzom_welcome_service.exe - -rem ts -taskkill /IM tick_service.exe - -rem ms -taskkill /IM mirror_service.exe - -rem ais_newbyland -taskkill /IM ai_service.exe - -rem mfs -taskkill /IM mail_forum_service.exe - -rem su -taskkill /IM shard_unifier_service.exe - -rem fes -taskkill /IM frontend_service.exe - -rem sbs -taskkill /IM session_browser_server.exe - -rem lgs -taskkill /IM logger_service.exe - -rem ras -taskkill /IM ryzom_admin_service.exe +@echo off + +REM This script will kill all the services launched by shard_start.bat + +rem AS +taskkill /IM ryzom_admin_service.exe + +rem bms_master +taskkill /IM backup_service.exe + +rem egs +taskkill /IM entities_game_service.exe + +rem gpms +taskkill /IM gpm_service.exe + +rem ios +taskkill /IM input_output_service.exe + +rem rns +taskkill /IM ryzom_naming_service.exe + +rem rws +taskkill /IM ryzom_welcome_service.exe + +rem ts +taskkill /IM tick_service.exe + +rem ms +taskkill /IM mirror_service.exe + +rem ais_newbyland +taskkill /IM ai_service.exe + +rem mfs +taskkill /IM mail_forum_service.exe + +rem su +taskkill /IM shard_unifier_service.exe + +rem fes +taskkill /IM frontend_service.exe + +rem sbs +taskkill /IM session_browser_server.exe + +rem lgs +taskkill /IM logger_service.exe + +rem ras +taskkill /IM ryzom_admin_service.exe diff --git a/code/ryzom/server/shard_stop_cmake.bat b/code/ryzom/server/shard_stop_cmake.bat index d28e35e64..492d004af 100644 --- a/code/ryzom/server/shard_stop_cmake.bat +++ b/code/ryzom/server/shard_stop_cmake.bat @@ -1,54 +1,54 @@ -@echo off - -REM This script will kill all the services launched by shard_start.bat - -rem AS -taskkill /IM ryzom_admin_service.exe - -rem bms_master -taskkill /IM ryzom_backup_service.exe - -rem egs -taskkill /IM ryzom_entities_game_service.exe - -rem gpms -taskkill /IM ryzom_gpm_service.exe - -rem ios -taskkill /IM ryzom_ios_service.exe - -rem rns -taskkill /IM ryzom_naming_service.exe - -rem rws -taskkill /IM ryzom_welcome_service.exe - -rem ts -taskkill /IM ryzom_tick_service.exe - -rem ms -taskkill /IM ryzom_mirror_service.exe - -rem ais_newbyland -taskkill /IM ryzom_ai_service.exe - -rem mfs -taskkill /IM ryzom_mail_forum_service.exe - -rem su -taskkill /IM ryzom_shard_unifier_service.exe - -rem fes -taskkill /IM ryzom_frontend_service.exe - -rem sbs -taskkill /IM ryzom_session_browser_server.exe - -rem lgs -taskkill /IM ryzom_logger_service.exe - -rem dss -taskkill /IM ryzom_dynamic_scenario_service.exe - -rem ras -taskkill /IM ryzom_admin_service.exe +@echo off + +REM This script will kill all the services launched by shard_start.bat + +rem AS +taskkill /IM ryzom_admin_service.exe + +rem bms_master +taskkill /IM ryzom_backup_service.exe + +rem egs +taskkill /IM ryzom_entities_game_service.exe + +rem gpms +taskkill /IM ryzom_gpm_service.exe + +rem ios +taskkill /IM ryzom_ios_service.exe + +rem rns +taskkill /IM ryzom_naming_service.exe + +rem rws +taskkill /IM ryzom_welcome_service.exe + +rem ts +taskkill /IM ryzom_tick_service.exe + +rem ms +taskkill /IM ryzom_mirror_service.exe + +rem ais_newbyland +taskkill /IM ryzom_ai_service.exe + +rem mfs +taskkill /IM ryzom_mail_forum_service.exe + +rem su +taskkill /IM ryzom_shard_unifier_service.exe + +rem fes +taskkill /IM ryzom_frontend_service.exe + +rem sbs +taskkill /IM ryzom_session_browser_server.exe + +rem lgs +taskkill /IM ryzom_logger_service.exe + +rem dss +taskkill /IM ryzom_dynamic_scenario_service.exe + +rem ras +taskkill /IM ryzom_admin_service.exe