Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 14:25:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[REACTOS][ROSAPPS][ROSSUBSYS]

Browse source 
The buildno #defines KERNEL_RELEASE_STR, KERNEL_RELEASE_RC (introduced in r756 17 years ago), and REACTOS_DLL_RELEASE_STR, REACTOS_DLL_RELEASE_RC (introduced in r11297 12 years ago) are things that never really caught out in our project. They were actually eclipsed in favour of the more common KERNEL_VERSION_STR and co. in our code.
I therefore remove the very last remains of the old KERNEL_RELEASE_xxx defines and replace them with KERNEL_VERSION_xxx ones.

svn path=/trunk/; revision=71478
This commit is contained in:
Hermès Bélusca-Maïto 2016-05-31 22:36:48 +00:00
parent d37cb8f5ad
commit 982dd1a3c6
6 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/shell/cmd/cmd.c
View file

@ -1745,7 +1745,7 @@ Initialize()
/* If neither /C or /K was given, display a simple version string */ /* If neither /C or /K was given, display a simple version string */
ConOutChar(_T('\n')); ConOutChar(_T('\n'));
ConOutResPrintf(STRING_REACTOS_VERSION, ConOutResPrintf(STRING_REACTOS_VERSION,
_T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_STR),
_T(KERNEL_VERSION_BUILD_STR)); _T(KERNEL_VERSION_BUILD_STR));
ConOutPuts(_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.\n")); ConOutPuts(_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.\n"));
} }

2
reactos/base/shell/cmd/ver.c
View file

@ -135,7 +135,7 @@ INT cmd_ver (LPTSTR param)
return 0; return 0;
} }
ConOutResPrintf(STRING_CMD_SHELLINFO, _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); ConOutResPrintf(STRING_CMD_SHELLINFO, _T(KERNEL_VERSION_STR), _T(KERNEL_VERSION_BUILD_STR));
ConOutChar(_T('\n')); ConOutChar(_T('\n'));
ConOutResPuts(STRING_VERSION_RUNNING_ON); ConOutResPuts(STRING_VERSION_RUNNING_ON);
PrintOSVersion(); PrintOSVersion();

4
reactos/sdk/include/reactos/buildno.h.cmake
View file

@ -5,13 +5,9 @@
#define KERNEL_VERSION_BUILD_HEX 0x@KERNEL_VERSION_BUILD_HEX@ #define KERNEL_VERSION_BUILD_HEX 0x@KERNEL_VERSION_BUILD_HEX@
#define KERNEL_VERSION_BUILD_STR "@KERNEL_VERSION_BUILD@-@REVISION@" #define KERNEL_VERSION_BUILD_STR "@KERNEL_VERSION_BUILD@-@REVISION@"
#define KERNEL_VERSION_BUILD_RC "@KERNEL_VERSION_BUILD@-@REVISION@\0" #define KERNEL_VERSION_BUILD_RC "@KERNEL_VERSION_BUILD@-@REVISION@\0"
#define KERNEL_RELEASE_RC "@KERNEL_VERSION@\0"
#define KERNEL_RELEASE_STR "@KERNEL_VERSION@"
#define KERNEL_VERSION_RC "@KERNEL_VERSION@\0" #define KERNEL_VERSION_RC "@KERNEL_VERSION@\0"
#define KERNEL_VERSION_STR "@KERNEL_VERSION@" #define KERNEL_VERSION_STR "@KERNEL_VERSION@"
#define REACTOS_DLL_VERSION_MAJOR @REACTOS_DLL_VERSION_MAJOR@ #define REACTOS_DLL_VERSION_MAJOR @REACTOS_DLL_VERSION_MAJOR@
#define REACTOS_DLL_RELEASE_RC "@DLL_VERSION_STR@\0"
#define REACTOS_DLL_RELEASE_STR "@DLL_VERSION_STR@"
#define REACTOS_DLL_VERSION_RC "@DLL_VERSION_STR@\0" #define REACTOS_DLL_VERSION_RC "@DLL_VERSION_STR@\0"
#define REACTOS_DLL_VERSION_STR "@DLL_VERSION_STR@" #define REACTOS_DLL_VERSION_STR "@DLL_VERSION_STR@"
#endif #endif

2
rosapps/applications/sysutils/lsdd/lsdd.c
View file

@ -60,7 +60,7 @@ main (int argc, char * argv [] )
printf ( printf (
"ReactOS/Win32 %s - List DOS Devices Utility\n" "ReactOS/Win32 %s - List DOS Devices Utility\n"
"Written by E.Aliberti (%s)\n\n", "Written by E.Aliberti (%s)\n\n",
KERNEL_RELEASE_STR, KERNEL_VERSION_STR,
__DATE__ __DATE__
); );

2
rosapps/applications/sysutils/tlist/tlist.c
View file

@ -65,7 +65,7 @@ void PsaiFree(void *ptr)
int WINAPI PrintBanner (VOID) int WINAPI PrintBanner (VOID)
{ {
printf ("ReactOS "KERNEL_RELEASE_STR" T(ask)List\n"); printf ("ReactOS "KERNEL_VERSION_STR" T(ask)List\n");
printf ("Copyright (c) 2000,2001 Emanuele Aliberti\n\n"); printf ("Copyright (c) 2000,2001 Emanuele Aliberti\n\n");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

6
rossubsys/posix/server/misc/main.c
View file

@ -1,4 +1,4 @@
/* $Id: main.c,v 1.3 2002/10/29 04:45:54 rex Exp $ /* $Id$
* *
* PROJECT : ReactOS / POSIX+ Environment Subsystem Server * PROJECT : ReactOS / POSIX+ Environment Subsystem Server
* FILE : reactos/subsys/psx/server/misc/main.c * FILE : reactos/subsys/psx/server/misc/main.c
@ -49,7 +49,7 @@ int main (int argc, char * argv[])
{ {
INT c; INT c;
debug_print(L"POSIX+ Subsystem for ReactOS "KERNEL_RELEASE_STR); debug_print(L"POSIX+ Subsystem for ReactOS "KERNEL_VERSION_STR);
if (STATUS_SUCCESS == PsxServerInitialization(0,NULL)) if (STATUS_SUCCESS == PsxServerInitialization(0,NULL))
{ {
@ -71,7 +71,7 @@ VOID NtProcessStartup (PPEB Peb)
{ {
UNICODE_STRING Banner; UNICODE_STRING Banner;
RtlInitUnicodeString (& Banner, L"POSIX+ Subsystem for ReactOS "KERNEL_RELEASE_STR); RtlInitUnicodeString (& Banner, L"POSIX+ Subsystem for ReactOS "KERNEL_VERSION_STR);
NtDisplayString(& Banner); NtDisplayString(& Banner);
if (STATUS_SUCCESS == PsxServerInitialization(0,NULL)) if (STATUS_SUCCESS == PsxServerInitialization(0,NULL))