[ros-diffs] [hbelusca] 71478: [REACTOS][ROSAPPS][ROSSUBSYS] The buildno #defines KERNEL_RELEASE_STR, KERNEL_RELEASE_RC (introduced in r756 17 years ago), and REACTOS_DLL_RELEASE_STR, REACTOS_DLL_RELEASE_RC (in...

Author: hbelusca
Date: Tue May 31 22:36:48 2016
New Revision: 71478
URL: http://svn.reactos.org/svn/reactos?rev=71478&view=rev
Log:
[REACTOS][ROSAPPS][ROSSUBSYS]
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.
Modified:
    trunk/reactos/base/shell/cmd/cmd.c
    trunk/reactos/base/shell/cmd/ver.c
    trunk/reactos/sdk/include/reactos/buildno.h.cmake
    trunk/rosapps/applications/sysutils/lsdd/lsdd.c
    trunk/rosapps/applications/sysutils/tlist/tlist.c
    trunk/rossubsys/posix/server/misc/main.c
Modified: trunk/reactos/base/shell/cmd/cmd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=7…
==============================================================================
--- trunk/reactos/base/shell/cmd/cmd.c  [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/cmd.c  [iso-8859-1] Tue May 31 22:36:48 2016
@@ -1745,7 +1745,7 @@
         /* If neither /C or /K was given, display a simple version string */
         ConOutChar(_T('\n'));
         ConOutResPrintf(STRING_REACTOS_VERSION,
-                        _T(KERNEL_RELEASE_STR),
+                        _T(KERNEL_VERSION_STR),
                         _T(KERNEL_VERSION_BUILD_STR));
         ConOutPuts(_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T("
ReactOS Team.\n"));
     }
Modified: trunk/reactos/base/shell/cmd/ver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=7…
==============================================================================
--- trunk/reactos/base/shell/cmd/ver.c  [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/ver.c  [iso-8859-1] Tue May 31 22:36:48 2016
@@ -135,7 +135,7 @@
         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'));
     ConOutResPuts(STRING_VERSION_RUNNING_ON);
     PrintOSVersion();
Modified: trunk/reactos/sdk/include/reactos/buildno.h.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/buildn…
==============================================================================
--- trunk/reactos/sdk/include/reactos/buildno.h.cmake   [iso-8859-1] (original)
+++ trunk/reactos/sdk/include/reactos/buildno.h.cmake   [iso-8859-1] Tue May 31 22:36:48
2016
@@ -5,13 +5,9 @@
 #define KERNEL_VERSION_BUILD_HEX       0x@KERNEL_VERSION_BUILD_HEX@
 #define KERNEL_VERSION_BUILD_STR       "@KERNEL_VERSION_BUILD@-@REVISION@"
 #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_STR     "@KERNEL_VERSION@"
 #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_STR        "@DLL_VERSION_STR@"
 #endif
Modified: trunk/rosapps/applications/sysutils/lsdd/lsdd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/lsdd…
==============================================================================
--- trunk/rosapps/applications/sysutils/lsdd/lsdd.c     [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/lsdd/lsdd.c     [iso-8859-1] Tue May 31 22:36:48
2016
@@ -60,7 +60,7 @@
        printf (
                "ReactOS/Win32 %s - List DOS Devices Utility\n"
                "Written by E.Aliberti (%s)\n\n",
-               KERNEL_RELEASE_STR,
+               KERNEL_VERSION_STR,
                __DATE__
                );
Modified: trunk/rosapps/applications/sysutils/tlist/tlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/tlis…
==============================================================================
--- trunk/rosapps/applications/sysutils/tlist/tlist.c   [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/tlist/tlist.c   [iso-8859-1] Tue May 31 22:36:48
2016
@@ -65,7 +65,7 @@
 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");
   return EXIT_SUCCESS;
 }
Modified: trunk/rossubsys/posix/server/misc/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rossubsys/posix/server/misc/main.c…
==============================================================================
--- trunk/rossubsys/posix/server/misc/main.c    [iso-8859-1] (original)
+++ trunk/rossubsys/posix/server/misc/main.c    [iso-8859-1] Tue May 31 22:36:48 2016
@@ -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
  * FILE       : reactos/subsys/psx/server/misc/main.c
@@ -49,7 +49,7 @@
 {
     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))
     {
@@ -71,7 +71,7 @@
 {
     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);
     if (STATUS_SUCCESS == PsxServerInitialization(0,NULL))