Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

correction pour la compilation sous windows à cause des merges RC mal fait

Browse source
This commit is contained in:
root 2018-03-25 12:04:43 +02:00
parent 1c898ea0b2
commit cf1db62ab8
18 changed files with 1004 additions and 1003 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/CMakeLists.txt
View file

@ -62,6 +62,7 @@ SET(AUTHOR "Winch Gate and The Ryzom Core Community")
SET(RYZOM_VERSION_MAJOR 3) SET(RYZOM_VERSION_MAJOR 3)
SET(RYZOM_VERSION_MINOR 2) SET(RYZOM_VERSION_MINOR 2)
SET(RYZOM_VERSION_PATCH 1) SET(RYZOM_VERSION_PATCH 1)
SET(REVISION 0)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Redirect output files # Redirect output files

74
code/nel/src/3d/driver/direct3d/resources.rc
View file

@ -1,37 +1,37 @@
#include <windows.h> #include <windows.h>
#include "config.h" #include "config.h"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
#else #else
FILEFLAGS 0x0L FILEFLAGS 0x0L
#endif #endif
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL FILETYPE VFT_DLL
FILESUBTYPE 0x0L FILESUBTYPE 0x0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "NeL Direct3D driver" VALUE "FileDescription", "NeL Direct3D driver"
VALUE "FileVersion", NL_VERSION VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG #ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_direct3d_win_d.dll" VALUE "OriginalFilename", "nel_drv_direct3d_win_d.dll"
#else #else
VALUE "OriginalFilename", "nel_drv_direct3d_win_r.dll" VALUE "OriginalFilename", "nel_drv_direct3d_win_r.dll"
#endif #endif
VALUE "ProductName", "Ryzom Core" VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION VALUE "ProductVersion", NL_VERSION
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x409, 1252 VALUE "Translation", 0x409, 1252
END END
END END

74
code/nel/src/3d/driver/opengl/resources.rc
View file

@ -1,37 +1,37 @@
#include <windows.h> #include <windows.h>
#include "config.h" #include "config.h"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
#else #else
FILEFLAGS 0x0L FILEFLAGS 0x0L
#endif #endif
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL FILETYPE VFT_DLL
FILESUBTYPE 0x0L FILESUBTYPE 0x0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "NeL OpenGL driver" VALUE "FileDescription", "NeL OpenGL driver"
VALUE "FileVersion", NL_VERSION VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG #ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_opengl_win_d.dll" VALUE "OriginalFilename", "nel_drv_opengl_win_d.dll"
#else #else
VALUE "OriginalFilename", "nel_drv_opengl_win_r.dll" VALUE "OriginalFilename", "nel_drv_opengl_win_r.dll"
#endif #endif
VALUE "ProductName", "Ryzom Core" VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION VALUE "ProductVersion", NL_VERSION
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x409, 1252 VALUE "Translation", 0x409, 1252
END END
END END

74
code/nel/src/3d/driver/opengles/resources.rc
View file

@ -1,37 +1,37 @@
#include <windows.h> #include <windows.h>
#include "config.h" #include "config.h"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
#else #else
FILEFLAGS 0x0L FILEFLAGS 0x0L
#endif #endif
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL FILETYPE VFT_DLL
FILESUBTYPE 0x0L FILESUBTYPE 0x0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "NeL OpenGL ES 1.1 driver" VALUE "FileDescription", "NeL OpenGL ES 1.1 driver"
VALUE "FileVersion", NL_VERSION VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG #ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_opengles_win_d.dll" VALUE "OriginalFilename", "nel_drv_opengles_win_d.dll"
#else #else
VALUE "OriginalFilename", "nel_drv_opengles_win_r.dll" VALUE "OriginalFilename", "nel_drv_opengles_win_r.dll"
#endif #endif
VALUE "ProductName", "Ryzom Core" VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION VALUE "ProductVersion", NL_VERSION
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x409, 1252 VALUE "Translation", 0x409, 1252
END END
END END

74
code/nel/src/sound/driver/dsound/resources.rc
View file

@ -1,37 +1,37 @@
#include <windows.h> #include <windows.h>
#include "config.h" #include "config.h"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
#else #else
FILEFLAGS 0x0L FILEFLAGS 0x0L
#endif #endif
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL FILETYPE VFT_DLL
FILESUBTYPE 0x0L FILESUBTYPE 0x0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "NeL DirectSound driver" VALUE "FileDescription", "NeL DirectSound driver"
VALUE "FileVersion", NL_VERSION VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG #ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_dsound_win_d.dll" VALUE "OriginalFilename", "nel_drv_dsound_win_d.dll"
#else #else
VALUE "OriginalFilename", "nel_drv_dsound_win_r.dll" VALUE "OriginalFilename", "nel_drv_dsound_win_r.dll"
#endif #endif
VALUE "ProductName", "Ryzom Core" VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION VALUE "ProductVersion", NL_VERSION
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x409, 1252 VALUE "Translation", 0x409, 1252
END END
END END

74
code/nel/src/sound/driver/fmod/resources.rc
View file

@ -1,37 +1,37 @@
#include <windows.h> #include <windows.h>
#include "config.h" #include "config.h"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
#else #else
FILEFLAGS 0x0L FILEFLAGS 0x0L
#endif #endif
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL FILETYPE VFT_DLL
FILESUBTYPE 0x0L FILESUBTYPE 0x0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "NeL FMod driver" VALUE "FileDescription", "NeL FMod driver"
VALUE "FileVersion", NL_VERSION VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG #ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_fmod_win_d.dll" VALUE "OriginalFilename", "nel_drv_fmod_win_d.dll"
#else #else
VALUE "OriginalFilename", "nel_drv_fmod_win_r.dll" VALUE "OriginalFilename", "nel_drv_fmod_win_r.dll"
#endif #endif
VALUE "ProductName", "Ryzom Core" VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION VALUE "ProductVersion", NL_VERSION
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x409, 1252 VALUE "Translation", 0x409, 1252
END END
END END

74
code/nel/src/sound/driver/openal/resources.rc
View file

@ -1,37 +1,37 @@
#include <windows.h> #include <windows.h>
#include "config.h" #include "config.h"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
#else #else
FILEFLAGS 0x0L FILEFLAGS 0x0L
#endif #endif
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL FILETYPE VFT_DLL
FILESUBTYPE 0x0L FILESUBTYPE 0x0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "NeL OpenAL driver" VALUE "FileDescription", "NeL OpenAL driver"
VALUE "FileVersion", NL_VERSION VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG #ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_openal_win_d.dll" VALUE "OriginalFilename", "nel_drv_openal_win_d.dll"
#else #else
VALUE "OriginalFilename", "nel_drv_openal_win_r.dll" VALUE "OriginalFilename", "nel_drv_openal_win_r.dll"
#endif #endif
VALUE "ProductName", "Ryzom Core" VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION VALUE "ProductVersion", NL_VERSION
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x409, 1252 VALUE "Translation", 0x409, 1252
END END
END END

74
code/nel/src/sound/driver/xaudio2/resources.rc
View file

@ -1,37 +1,37 @@
#include <windows.h> #include <windows.h>
#include "config.h" #include "config.h"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION NL_VERSION_RC FILEVERSION NL_VERSION_RC
PRODUCTVERSION NL_VERSION_RC PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
#else #else
FILEFLAGS 0x0L FILEFLAGS 0x0L
#endif #endif
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL FILETYPE VFT_DLL
FILESUBTYPE 0x0L FILESUBTYPE 0x0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "NeL XAudio2 driver" VALUE "FileDescription", "NeL XAudio2 driver"
VALUE "FileVersion", NL_VERSION VALUE "FileVersion", NL_VERSION
VALUE "LegalCopyright", COPYRIGHT VALUE "LegalCopyright", COPYRIGHT
#ifdef _DEBUG #ifdef _DEBUG
VALUE "OriginalFilename", "nel_drv_xaudio2_win_d.dll" VALUE "OriginalFilename", "nel_drv_xaudio2_win_d.dll"
#else #else
VALUE "OriginalFilename", "nel_drv_xaudio2_win_r.dll" VALUE "OriginalFilename", "nel_drv_xaudio2_win_r.dll"
#endif #endif
VALUE "ProductName", "Ryzom Core" VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION VALUE "ProductVersion", NL_VERSION
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x409, 1252 VALUE "Translation", 0x409, 1252
END END
END END

444
code/ryzom/client/src/client.rc
View file

@ -1,222 +1,222 @@
//Microsoft Developer Studio generated resource script. //Microsoft Developer Studio generated resource script.
// //
#include "resource.h" #include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS #define APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include <windows.h> #include <windows.h>
#include "config.h" #include "config.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources // English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32 #ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252) #pragma code_page(1252)
#endif //_WIN32 #endif //_WIN32
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// TEXTINCLUDE // TEXTINCLUDE
// //
1 TEXTINCLUDE DISCARDABLE 1 TEXTINCLUDE DISCARDABLE
BEGIN BEGIN
"resource.h\0" "resource.h\0"
END END
2 TEXTINCLUDE DISCARDABLE 2 TEXTINCLUDE DISCARDABLE
BEGIN BEGIN
"#include ""afxres.h""\r\n" "#include ""afxres.h""\r\n"
"\0" "\0"
END END
3 TEXTINCLUDE DISCARDABLE 3 TEXTINCLUDE DISCARDABLE
BEGIN BEGIN
"\r\n" "\r\n"
"\0" "\0"
END END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Icon // Icon
// //
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
IDI_MAIN_ICON ICON DISCARDABLE "khanat.ico" IDI_MAIN_ICON ICON DISCARDABLE "khanat.ico"
#endif // English (U.S.) resources #endif // English (U.S.) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// French (France) resources // French (France) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
#ifdef _WIN32 #ifdef _WIN32
LANGUAGE LANG_FRENCH, SUBLANG_FRENCH LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
#pragma code_page(1252) #pragma code_page(1252)
#endif //_WIN32 #endif //_WIN32
#define IDC_STATIC -1 #define IDC_STATIC -1
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Dialog // Dialog
// //
IDD_SLASH_SCREEN DIALOGEX 0, 0, 333, 231 IDD_SLASH_SCREEN DIALOGEX 0, 0, 333, 231
STYLE WS_POPUP STYLE WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Sans Serif", 0, 0, 0x1 FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN BEGIN
CONTROL 117,IDC_STATIC,"Static",SS_BITMAP,0,0,333,231 CONTROL 117,IDC_STATIC,"Static",SS_BITMAP,0,0,333,231
END END
IDD_CRASH_INFORMATION DIALOG DISCARDABLE 0, 0, 186, 301 IDD_CRASH_INFORMATION DIALOG DISCARDABLE 0, 0, 186, 301
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Khanat information" CAPTION "Khanat information"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
LTEXT "Khanat has detected that the last game session has not quit properly. You have experienced :", LTEXT "Khanat has detected that the last game session has not quit properly. You have experienced :",
IDC_STATIC,7,7,172,27 IDC_STATIC,7,7,172,27
PUSHBUTTON "A computer freeze.",FROZEN,7,38,172,29 PUSHBUTTON "A computer freeze.",FROZEN,7,38,172,29
PUSHBUTTON "A computer self reboot.",REBOOTED,7,70,172,29 PUSHBUTTON "A computer self reboot.",REBOOTED,7,70,172,29
PUSHBUTTON "A game crash with a NeL report window.",WINDOWED,7,102, PUSHBUTTON "A game crash with a NeL report window.",WINDOWED,7,102,
172,29,BS_MULTILINE 172,29,BS_MULTILINE
PUSHBUTTON "A game crash without NeL report window.",NO_WINDOW,7, PUSHBUTTON "A game crash without NeL report window.",NO_WINDOW,7,
134,172,29,BS_MULTILINE 134,172,29,BS_MULTILINE
PUSHBUTTON "You killed the game process using the task manager.", PUSHBUTTON "You killed the game process using the task manager.",
KILLED,7,166,172,29,BS_MULTILINE KILLED,7,166,172,29,BS_MULTILINE
PUSHBUTTON "Nothing wrong. The game quit normally.",NOT_CRASHED,7, PUSHBUTTON "Nothing wrong. The game quit normally.",NOT_CRASHED,7,
198,172,29 198,172,29
PUSHBUTTON "You don't remember what's happened",CRASHED,7,231,172, PUSHBUTTON "You don't remember what's happened",CRASHED,7,231,172,
29 29
LTEXT "If you experience lot of crash, please try to do a data check. Press the ""Check Data"" button at Login Screen.", 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 IDC_STATIC,5,270,175,25
END END
IDD_ERROR_HELP_MESSAGE_BOX DIALOGEX 0, 0, 373, 81 IDD_ERROR_HELP_MESSAGE_BOX DIALOGEX 0, 0, 373, 81
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Ryzom" CAPTION "Ryzom"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
DEFPUSHBUTTON "Exit",IDOK,85,57,89,21 DEFPUSHBUTTON "Exit",IDOK,85,57,89,21
PUSHBUTTON "Help",IDC_RYZOM_ERROR_HELP,178,57,92,21 PUSHBUTTON "Help",IDC_RYZOM_ERROR_HELP,178,57,92,21
LTEXT "Static",IDC_ERROR_MSG_TEXT,143,7,228,47,0, LTEXT "Static",IDC_ERROR_MSG_TEXT,143,7,228,47,0,
WS_EX_CLIENTEDGE WS_EX_CLIENTEDGE
CONTROL 128,IDC_STATIC,"Static",SS_BITMAP,7,7,70,63 CONTROL 128,IDC_STATIC,"Static",SS_BITMAP,7,7,70,63
END END
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// DESIGNINFO // DESIGNINFO
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE GUIDELINES DESIGNINFO DISCARDABLE
BEGIN BEGIN
IDD_SLASH_SCREEN, DIALOG IDD_SLASH_SCREEN, DIALOG
BEGIN BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 326 RIGHTMARGIN, 326
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 224 BOTTOMMARGIN, 224
END END
IDD_CRASH_INFORMATION, DIALOG IDD_CRASH_INFORMATION, DIALOG
BEGIN BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 179 RIGHTMARGIN, 179
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 294 BOTTOMMARGIN, 294
END END
IDD_ERROR_HELP_MESSAGE_BOX, DIALOG IDD_ERROR_HELP_MESSAGE_BOX, DIALOG
BEGIN BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 366 RIGHTMARGIN, 366
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 74 BOTTOMMARGIN, 74
END END
END END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Bitmap // Bitmap
// //
IDB_SLASH_SCREEN BITMAP DISCARDABLE "splash_screen.bmp" IDB_SLASH_SCREEN BITMAP DISCARDABLE "splash_screen.bmp"
IDB_ERROR_LOGO BITMAP DISCARDABLE "error_logo.bmp" IDB_ERROR_LOGO BITMAP DISCARDABLE "error_logo.bmp"
#endif // French (France) resources #endif // French (France) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION RYZOM_VERSION_RC FILEVERSION RYZOM_VERSION_RC
PRODUCTVERSION NL_VERSION_RC PRODUCTVERSION NL_VERSION_RC
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
#else #else
FILEFLAGS 0x0L FILEFLAGS 0x0L
#endif #endif
FILEOS VOS__WINDOWS32 FILEOS VOS__WINDOWS32
FILETYPE VFT_APP FILETYPE VFT_APP
FILESUBTYPE 0x0L FILESUBTYPE 0x0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "Khanat client" VALUE "FileDescription", "Khanat client"
VALUE "FileVersion", RYZOM_VERSION VALUE "FileVersion", RYZOM_VERSION
VALUE "LegalCopyright", COPYRIGHT VALUE "LegalCopyright", COPYRIGHT
#if defined(FINAL_VERSION) && (FINAL_VERSION == 1) #if defined(FINAL_VERSION) && (FINAL_VERSION == 1)
#ifdef _DEBUG #ifdef _DEBUG
VALUE "OriginalFilename", "khanat_client_d.exe" VALUE "OriginalFilename", "khanat_client_d.exe"
#else #else
VALUE "OriginalFilename", "khanat_client_r.exe" VALUE "OriginalFilename", "khanat_client_r.exe"
#endif #endif
#else #else
#ifdef _DEBUG #ifdef _DEBUG
VALUE "OriginalFilename", "khanat_client_dev_d.exe" VALUE "OriginalFilename", "khanat_client_dev_d.exe"
#else #else
VALUE "OriginalFilename", "khanat_client_dev_r.exe" VALUE "OriginalFilename", "khanat_client_dev_r.exe"
#endif #endif
#endif #endif
VALUE "ProductName", "Ryzom Core" VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION VALUE "ProductVersion", NL_VERSION
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x409, 1252 VALUE "Translation", 0x409, 1252
END END
END END
#ifndef APSTUDIO_INVOKED #ifndef APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Generated from the TEXTINCLUDE 3 resource. // Generated from the TEXTINCLUDE 3 resource.
// //
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED #endif // not APSTUDIO_INVOKED

78
code/ryzom/client/windows/upgd_nl.bat
View file

@ -1,39 +1,39 @@
@echo off @echo off
if "x%ROOTPATH%x" == "xx" ( if "x%ROOTPATH%x" == "xx" (
echo upgd_nl.bat can only be launched from updt_nl.bat echo upgd_nl.bat can only be launched from updt_nl.bat
goto end goto end
) )
rem We used this hack because to client 2.1 to 3.0 patch, 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 rem MSVC10 DLLs are using the same name and are deleted during patch
if exist %ROOTPATH%\msvcp100_win32.dll ( if exist %ROOTPATH%\msvcp100_win32.dll (
if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll
copy /Y %ROOTPATH%\msvcp100_win32.dll %ROOTPATH%\msvcp100.dll copy /Y %ROOTPATH%\msvcp100_win32.dll %ROOTPATH%\msvcp100.dll
) )
if exist %ROOTPATH%\msvcr100_win32.dll ( if exist %ROOTPATH%\msvcr100_win32.dll (
if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll
copy /Y %ROOTPATH%\msvcr100_win32.dll %ROOTPATH%\msvcr100.dll copy /Y %ROOTPATH%\msvcr100_win32.dll %ROOTPATH%\msvcr100.dll
) )
if exist %ROOTPATH%\msvcp100_win64.dll ( if exist %ROOTPATH%\msvcp100_win64.dll (
if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll
copy /Y %ROOTPATH%\msvcp100_win64.dll %ROOTPATH%\msvcp100.dll copy /Y %ROOTPATH%\msvcp100_win64.dll %ROOTPATH%\msvcp100.dll
) )
if exist %ROOTPATH%\msvcr100_win64.dll ( if exist %ROOTPATH%\msvcr100_win64.dll (
if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll
copy /Y %ROOTPATH%\msvcr100_win64.dll %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 (
if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %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%\.. copy /Y %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\..
if exist %ROOTPATH%\..\msvcp100.dll del %ROOTPATH%\..\msvcp100.dll if exist %ROOTPATH%\..\msvcp100.dll del %ROOTPATH%\..\msvcp100.dll
copy /Y %ROOTPATH%\msvcp100.dll %ROOTPATH%\.. copy /Y %ROOTPATH%\msvcp100.dll %ROOTPATH%\..
if exist %ROOTPATH%\..\msvcr100.dll del %ROOTPATH%\..\msvcr100.dll if exist %ROOTPATH%\..\msvcr100.dll del %ROOTPATH%\..\msvcr100.dll
copy /Y %ROOTPATH%\msvcr100.dll %ROOTPATH%\.. copy /Y %ROOTPATH%\msvcr100.dll %ROOTPATH%\..
) )
:end :end

78
code/ryzom/client/windows/upgd_nl_msvc10.bat
View file

@ -1,39 +1,39 @@
@echo off @echo off
if "x%ROOTPATH%x" == "xx" ( if "x%ROOTPATH%x" == "xx" (
echo upgd_nl.bat can only be launched from updt_nl.bat echo upgd_nl.bat can only be launched from updt_nl.bat
goto end goto end
) )
rem We used this hack because to client 2.1 to 3.0 patch, 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 rem VC++ 2010 DLLs are using the same name and are deleted during patch
if exist %ROOTPATH%\msvcp100_win32.dll ( if exist %ROOTPATH%\msvcp100_win32.dll (
if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll
copy /Y %ROOTPATH%\msvcp100_win32.dll %ROOTPATH%\msvcp100.dll copy /Y %ROOTPATH%\msvcp100_win32.dll %ROOTPATH%\msvcp100.dll
) )
if exist %ROOTPATH%\msvcr100_win32.dll ( if exist %ROOTPATH%\msvcr100_win32.dll (
if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll
copy /Y %ROOTPATH%\msvcr100_win32.dll %ROOTPATH%\msvcr100.dll copy /Y %ROOTPATH%\msvcr100_win32.dll %ROOTPATH%\msvcr100.dll
) )
if exist %ROOTPATH%\msvcp100_win64.dll ( if exist %ROOTPATH%\msvcp100_win64.dll (
if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll
copy /Y %ROOTPATH%\msvcp100_win64.dll %ROOTPATH%\msvcp100.dll copy /Y %ROOTPATH%\msvcp100_win64.dll %ROOTPATH%\msvcp100.dll
) )
if exist %ROOTPATH%\msvcr100_win64.dll ( if exist %ROOTPATH%\msvcr100_win64.dll (
if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll
copy /Y %ROOTPATH%\msvcr100_win64.dll %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 (
if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %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%\.. copy /Y %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\..
if exist %ROOTPATH%\..\msvcp100.dll del %ROOTPATH%\..\msvcp100.dll if exist %ROOTPATH%\..\msvcp100.dll del %ROOTPATH%\..\msvcp100.dll
copy /Y %ROOTPATH%\msvcp100.dll %ROOTPATH%\.. copy /Y %ROOTPATH%\msvcp100.dll %ROOTPATH%\..
if exist %ROOTPATH%\..\msvcr100.dll del %ROOTPATH%\..\msvcr100.dll if exist %ROOTPATH%\..\msvcr100.dll del %ROOTPATH%\..\msvcr100.dll
copy /Y %ROOTPATH%\msvcr100.dll %ROOTPATH%\.. copy /Y %ROOTPATH%\msvcr100.dll %ROOTPATH%\..
) )
:end :end

78
code/ryzom/client/windows/upgd_nl_msvc12.bat
View file

@ -1,39 +1,39 @@
@echo off @echo off
if "x%ROOTPATH%x" == "xx" ( if "x%ROOTPATH%x" == "xx" (
echo upgd_nl.bat can only be launched from updt_nl.bat echo upgd_nl.bat can only be launched from updt_nl.bat
goto end goto end
) )
rem We used this hack because to client 2.1 to 3.0 patch, 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 rem VC++ 2013 DLLs are using the same name and are deleted during patch
if exist %ROOTPATH%\msvcp120_win32.dll ( if exist %ROOTPATH%\msvcp120_win32.dll (
if exist %ROOTPATH%\msvcp120.dll del %ROOTPATH%\msvcp120.dll if exist %ROOTPATH%\msvcp120.dll del %ROOTPATH%\msvcp120.dll
copy /Y %ROOTPATH%\msvcp120_win32.dll %ROOTPATH%\msvcp120.dll copy /Y %ROOTPATH%\msvcp120_win32.dll %ROOTPATH%\msvcp120.dll
) )
if exist %ROOTPATH%\msvcr120_win32.dll ( if exist %ROOTPATH%\msvcr120_win32.dll (
if exist %ROOTPATH%\msvcr120.dll del %ROOTPATH%\msvcr120.dll if exist %ROOTPATH%\msvcr120.dll del %ROOTPATH%\msvcr120.dll
copy /Y %ROOTPATH%\msvcr120_win32.dll %ROOTPATH%\msvcr120.dll copy /Y %ROOTPATH%\msvcr120_win32.dll %ROOTPATH%\msvcr120.dll
) )
if exist %ROOTPATH%\msvcp120_win64.dll ( if exist %ROOTPATH%\msvcp120_win64.dll (
if exist %ROOTPATH%\msvcp120.dll del %ROOTPATH%\msvcp120.dll if exist %ROOTPATH%\msvcp120.dll del %ROOTPATH%\msvcp120.dll
copy /Y %ROOTPATH%\msvcp120_win64.dll %ROOTPATH%\msvcp120.dll copy /Y %ROOTPATH%\msvcp120_win64.dll %ROOTPATH%\msvcp120.dll
) )
if exist %ROOTPATH%\msvcr120_win64.dll ( if exist %ROOTPATH%\msvcr120_win64.dll (
if exist %ROOTPATH%\msvcr120.dll del %ROOTPATH%\msvcr120.dll if exist %ROOTPATH%\msvcr120.dll del %ROOTPATH%\msvcr120.dll
copy /Y %ROOTPATH%\msvcr120_win64.dll %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 (
if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %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%\.. copy /Y %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\..
if exist %ROOTPATH%\..\msvcp120.dll del %ROOTPATH%\..\msvcp120.dll if exist %ROOTPATH%\..\msvcp120.dll del %ROOTPATH%\..\msvcp120.dll
copy /Y %ROOTPATH%\msvcp120.dll %ROOTPATH%\.. copy /Y %ROOTPATH%\msvcp120.dll %ROOTPATH%\..
if exist %ROOTPATH%\..\msvcr120.dll del %ROOTPATH%\..\msvcr120.dll if exist %ROOTPATH%\..\msvcr120.dll del %ROOTPATH%\..\msvcr120.dll
copy /Y %ROOTPATH%\msvcr120.dll %ROOTPATH%\.. copy /Y %ROOTPATH%\msvcr120.dll %ROOTPATH%\..
) )
:end :end

38
code/ryzom/server/patchman_cfg/admin_install/bin/admin.screen.rc
View file

@ -1,19 +1,19 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# SCREEN KEYBINDINGS # SCREEN KEYBINDINGS
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Remove some stupid / dangerous key bindings # Remove some stupid / dangerous key bindings
bind ^k bind ^k
#bind L #bind L
bind ^\ bind ^\
# Make them better # Make them better
bind \\ quit bind \\ quit
bind K kill bind K kill
bind I login on bind I login on
bind O login off bind O login off
# patchman # patchman
chdir "/srv/core/patchman/" chdir "/srv/core/patchman/"
screen -t patchman /bin/sh ./loop_patchman.sh screen -t patchman /bin/sh ./loop_patchman.sh

154
code/ryzom/server/shard.screen.rc
View file

@ -1,77 +1,77 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# SCREEN KEYBINDINGS # SCREEN KEYBINDINGS
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Remove some stupid / dangerous key bindings # Remove some stupid / dangerous key bindings
bind ^k bind ^k
#bind L #bind L
bind ^\ bind ^\
# Make them better # Make them better
bind \\ quit bind \\ quit
bind K kill bind K kill
bind I login on bind I login on
bind O login off bind O login off
hardstatus alwayslastline "%w" hardstatus alwayslastline "%w"
chdir $RYZOM_PATH/server 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 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 # 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 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 # 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 #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 # 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 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 # gpms
screen -t gpms /bin/sh ../tools/scripts/linux/service_launcher.sh gpms $RYZOM_PATH/../build/bin/ryzom_gpm_service -C. -L. --nobreak --writepid screen -t gpms /bin/sh ../tools/scripts/linux/service_launcher.sh gpms $RYZOM_PATH/../build/bin/ryzom_gpm_service -C. -L. --nobreak --writepid
# ios # ios
screen -t ios /bin/sh ../tools/scripts/linux/service_launcher.sh ios $RYZOM_PATH/../build/bin/ryzom_ios_service -C. -L. --nobreak --writepid screen -t ios /bin/sh ../tools/scripts/linux/service_launcher.sh ios $RYZOM_PATH/../build/bin/ryzom_ios_service -C. -L. --nobreak --writepid
# rns # rns
screen -t rns /bin/sh ../tools/scripts/linux/service_launcher.sh rns $RYZOM_PATH/../build/bin/ryzom_naming_service -C. -L. --nobreak --writepid screen -t rns /bin/sh ../tools/scripts/linux/service_launcher.sh rns $RYZOM_PATH/../build/bin/ryzom_naming_service -C. -L. --nobreak --writepid
# rws # rws
screen -t rws /bin/sh ../tools/scripts/linux/service_launcher.sh rws $RYZOM_PATH/../build/bin/ryzom_welcome_service -C. -L. --nobreak --writepid screen -t rws /bin/sh ../tools/scripts/linux/service_launcher.sh rws $RYZOM_PATH/../build/bin/ryzom_welcome_service -C. -L. --nobreak --writepid
# ts # ts
screen -t ts /bin/sh ../tools/scripts/linux/service_launcher.sh ts $RYZOM_PATH/../build/bin/ryzom_tick_service -C. -L. --nobreak --writepid screen -t ts /bin/sh ../tools/scripts/linux/service_launcher.sh ts $RYZOM_PATH/../build/bin/ryzom_tick_service -C. -L. --nobreak --writepid
# ms # ms
screen -t ms /bin/sh ../tools/scripts/linux/service_launcher.sh ms $RYZOM_PATH/../build/bin/ryzom_mirror_service -C. -L. --nobreak --writepid 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 # 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 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 # 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 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 # 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 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 # fes
screen -t fes /bin/sh ../tools/scripts/linux/service_launcher.sh fes $RYZOM_PATH/../build/bin/ryzom_frontend_service -C. -L. --nobreak --writepid screen -t fes /bin/sh ../tools/scripts/linux/service_launcher.sh fes $RYZOM_PATH/../build/bin/ryzom_frontend_service -C. -L. --nobreak --writepid
# sbs # 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 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 # lgs
screen -t lgs /bin/sh ../tools/scripts/linux/service_launcher.sh lgs $RYZOM_PATH/../build/bin/ryzom_logger_service -C. -L. --nobreak --writepid screen -t lgs /bin/sh ../tools/scripts/linux/service_launcher.sh lgs $RYZOM_PATH/../build/bin/ryzom_logger_service -C. -L. --nobreak --writepid
# mos # mos
#screen -t mos /bin/sh ../tools/scripts/linux/service_launcher.sh mos $RYZOM_PATH/../build/bin/ryzom_monitor_service -C. -L. --nobreak --writepid #screen -t mos /bin/sh ../tools/scripts/linux/service_launcher.sh mos $RYZOM_PATH/../build/bin/ryzom_monitor_service -C. -L. --nobreak --writepid
# pdss # 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 #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 # 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 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 # switch back to AES screen
select 0 select 0

198
code/ryzom/server/shard_start.bat
View file

@ -1,99 +1,99 @@
@echo off @echo off
REM This script will start all the services with good parameters REM This script will start all the services with good parameters
REM set MODE=Debug REM set MODE=Debug
set MODE=Release set MODE=Release
rem AS rem AS
start %MODE%\ryzom_admin_service.exe --fulladminname=admin_executor_service --shortadminname=AES 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) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem bms_master rem bms_master
start %MODE%\backup_service --writepid -P49990 start %MODE%\backup_service --writepid -P49990
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem egs rem egs
start %MODE%\entities_game_service --writepid start %MODE%\entities_game_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem gpms rem gpms
start %MODE%\gpm_service --writepid start %MODE%\gpm_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem ios rem ios
start %MODE%\input_output_service --writepid start %MODE%\input_output_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem rns rem rns
start %MODE%\ryzom_naming_service --writepid start %MODE%\ryzom_naming_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem rws rem rws
start %MODE%\ryzom_welcome_service --writepid start %MODE%\ryzom_welcome_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem ts rem ts
start %MODE%\tick_service --writepid start %MODE%\tick_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem ms rem ms
start %MODE%\mirror_service --writepid start %MODE%\mirror_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem ais_newbyland rem ais_newbyland
start %MODE%\ai_service --writepid -mCommon:Newbieland:Post start %MODE%\ai_service --writepid -mCommon:Newbieland:Post
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem mfs rem mfs
start %MODE%\mail_forum_service --writepid start %MODE%\mail_forum_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem su rem su
start %MODE%\shard_unifier_service --writepid start %MODE%\shard_unifier_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem fes rem fes
start %MODE%\frontend_service --writepid start %MODE%\frontend_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem sbs rem sbs
start %MODE%\session_browser_server --writepid start %MODE%\session_browser_server --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem lgs rem lgs
start %MODE%\logger_service --writepid start %MODE%\logger_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem ras rem ras
start %MODE%\ryzom_admin_service --fulladminname=admin_service --shortadminname=AS --writepid start %MODE%\ryzom_admin_service --fulladminname=admin_service --shortadminname=AS --writepid

210
code/ryzom/server/shard_start_cmake.bat
View file

@ -1,105 +1,105 @@
@echo off @echo off
REM This script will start all the services with good parameters REM This script will start all the services with good parameters
REM set MODE=Debug REM set MODE=Debug
set MODE=..\..\build\bin\Release set MODE=..\..\build\bin\Release
rem AS rem AS
start %MODE%\ryzom_admin_service.exe --fulladminname=admin_executor_service --shortadminname=AES 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) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem bms_master rem bms_master
start %MODE%\ryzom_backup_service --writepid -P49990 start %MODE%\ryzom_backup_service --writepid -P49990
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem egs rem egs
start %MODE%\ryzom_entities_game_service --writepid start %MODE%\ryzom_entities_game_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem gpms rem gpms
start %MODE%\ryzom_gpm_service --writepid start %MODE%\ryzom_gpm_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem ios rem ios
start %MODE%\ryzom_ios_service --writepid start %MODE%\ryzom_ios_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem rns rem rns
start %MODE%\ryzom_naming_service --writepid start %MODE%\ryzom_naming_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem rws rem rws
start %MODE%\ryzom_welcome_service --writepid start %MODE%\ryzom_welcome_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem ts rem ts
start %MODE%\ryzom_tick_service --writepid start %MODE%\ryzom_tick_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem ms rem ms
start %MODE%\ryzom_mirror_service --writepid start %MODE%\ryzom_mirror_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem ais_newbyland rem ais_newbyland
start %MODE%\ryzom_ai_service --writepid -mCommon:Newbieland:Post start %MODE%\ryzom_ai_service --writepid -mCommon:Newbieland:Post
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem mfs rem mfs
start %MODE%\ryzom_mail_forum_service --writepid start %MODE%\ryzom_mail_forum_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem su rem su
start %MODE%\ryzom_shard_unifier_service --writepid start %MODE%\ryzom_shard_unifier_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem fes rem fes
start %MODE%\ryzom_frontend_service --writepid start %MODE%\ryzom_frontend_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem sbs rem sbs
start %MODE%\ryzom_session_browser_service --writepid start %MODE%\ryzom_session_browser_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem lgs rem lgs
start %MODE%\ryzom_logger_service --writepid start %MODE%\ryzom_logger_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem lgs rem lgs
start %MODE%\ryzom_dynamic_scenario_service --writepid start %MODE%\ryzom_dynamic_scenario_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds) 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 ping -n 2 127.0.0.1 > NUL 2>&1
rem ras rem ras
start %MODE%\ryzom_admin_service --fulladminname=admin_service --shortadminname=AS --writepid start %MODE%\ryzom_admin_service --fulladminname=admin_service --shortadminname=AS --writepid

102
code/ryzom/server/shard_stop.bat
View file

@ -1,51 +1,51 @@
@echo off @echo off
REM This script will kill all the services launched by shard_start.bat REM This script will kill all the services launched by shard_start.bat
rem AS rem AS
taskkill /IM ryzom_admin_service.exe taskkill /IM ryzom_admin_service.exe
rem bms_master rem bms_master
taskkill /IM backup_service.exe taskkill /IM backup_service.exe
rem egs rem egs
taskkill /IM entities_game_service.exe taskkill /IM entities_game_service.exe
rem gpms rem gpms
taskkill /IM gpm_service.exe taskkill /IM gpm_service.exe
rem ios rem ios
taskkill /IM input_output_service.exe taskkill /IM input_output_service.exe
rem rns rem rns
taskkill /IM ryzom_naming_service.exe taskkill /IM ryzom_naming_service.exe
rem rws rem rws
taskkill /IM ryzom_welcome_service.exe taskkill /IM ryzom_welcome_service.exe
rem ts rem ts
taskkill /IM tick_service.exe taskkill /IM tick_service.exe
rem ms rem ms
taskkill /IM mirror_service.exe taskkill /IM mirror_service.exe
rem ais_newbyland rem ais_newbyland
taskkill /IM ai_service.exe taskkill /IM ai_service.exe
rem mfs rem mfs
taskkill /IM mail_forum_service.exe taskkill /IM mail_forum_service.exe
rem su rem su
taskkill /IM shard_unifier_service.exe taskkill /IM shard_unifier_service.exe
rem fes rem fes
taskkill /IM frontend_service.exe taskkill /IM frontend_service.exe
rem sbs rem sbs
taskkill /IM session_browser_server.exe taskkill /IM session_browser_server.exe
rem lgs rem lgs
taskkill /IM logger_service.exe taskkill /IM logger_service.exe
rem ras rem ras
taskkill /IM ryzom_admin_service.exe taskkill /IM ryzom_admin_service.exe

108
code/ryzom/server/shard_stop_cmake.bat
View file

@ -1,54 +1,54 @@
@echo off @echo off
REM This script will kill all the services launched by shard_start.bat REM This script will kill all the services launched by shard_start.bat
rem AS rem AS
taskkill /IM ryzom_admin_service.exe taskkill /IM ryzom_admin_service.exe
rem bms_master rem bms_master
taskkill /IM ryzom_backup_service.exe taskkill /IM ryzom_backup_service.exe
rem egs rem egs
taskkill /IM ryzom_entities_game_service.exe taskkill /IM ryzom_entities_game_service.exe
rem gpms rem gpms
taskkill /IM ryzom_gpm_service.exe taskkill /IM ryzom_gpm_service.exe
rem ios rem ios
taskkill /IM ryzom_ios_service.exe taskkill /IM ryzom_ios_service.exe
rem rns rem rns
taskkill /IM ryzom_naming_service.exe taskkill /IM ryzom_naming_service.exe
rem rws rem rws
taskkill /IM ryzom_welcome_service.exe taskkill /IM ryzom_welcome_service.exe
rem ts rem ts
taskkill /IM ryzom_tick_service.exe taskkill /IM ryzom_tick_service.exe
rem ms rem ms
taskkill /IM ryzom_mirror_service.exe taskkill /IM ryzom_mirror_service.exe
rem ais_newbyland rem ais_newbyland
taskkill /IM ryzom_ai_service.exe taskkill /IM ryzom_ai_service.exe
rem mfs rem mfs
taskkill /IM ryzom_mail_forum_service.exe taskkill /IM ryzom_mail_forum_service.exe
rem su rem su
taskkill /IM ryzom_shard_unifier_service.exe taskkill /IM ryzom_shard_unifier_service.exe
rem fes rem fes
taskkill /IM ryzom_frontend_service.exe taskkill /IM ryzom_frontend_service.exe
rem sbs rem sbs
taskkill /IM ryzom_session_browser_server.exe taskkill /IM ryzom_session_browser_server.exe
rem lgs rem lgs
taskkill /IM ryzom_logger_service.exe taskkill /IM ryzom_logger_service.exe
rem dss rem dss
taskkill /IM ryzom_dynamic_scenario_service.exe taskkill /IM ryzom_dynamic_scenario_service.exe
rem ras rem ras
taskkill /IM ryzom_admin_service.exe taskkill /IM ryzom_admin_service.exe