Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[VERSION]

Browse source 
- Revision string without the dash. That allows to possibly use a different separator.
- Just use the ROS revision number in the kernel SOS banner, instead of using a convoluted computation that overflows when the revision number is >= 65536. CORE-8877 #resolve #comment Fixed in r66398, thanks!

svn path=/trunk/; revision=66398
This commit is contained in:
Hermès Bélusca-Maïto 2015-02-21 22:38:22 +00:00
parent 391daff8d0
commit acf5c98c36
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,8 +3,8 @@
#define _INC_REACTOS_BUILDNO
#define KERNEL_VERSION_BUILD @KERNEL_VERSION_BUILD@
#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_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"

4
reactos/include/reactos/version.cmake
View file

@ -50,14 +50,14 @@ math(EXPR REACTOS_DLL_VERSION_MAJOR "${KERNEL_VERSION_MAJOR}+42")
set(DLL_VERSION_STR "${REACTOS_DLL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}-${KERNEL_VERSION_BUILD_TYPE}")
# get svn revision number
set(REVISION "-rUNKNOWN")
set(REVISION "rUNKNOWN")
set(KERNEL_VERSION_BUILD_HEX "0")
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
find_package(Subversion)
if(Subversion_FOUND)
subversion_wc_info(${CMAKE_CURRENT_SOURCE_DIR} SVNINFO)
if(SVNINFO_WC_REVISION)
set(REVISION "-r${SVNINFO_WC_REVISION}")
set(REVISION "r${SVNINFO_WC_REVISION}")
converttohex(${SVNINFO_WC_REVISION} KERNEL_VERSION_BUILD_HEX)
endif()
endif()

3
reactos/ntoskrnl/ex/init.c
View file

@ -1226,7 +1226,8 @@ ExpInitializeExecutive(IN ULONG Cpu,
Status = RtlStringCbPrintfA(RcEnd,
Remaining,
"r%u",
(CmNtCSDVersion & 0xFFFF0000) >> 16);
/*(CmNtCSDVersion & 0xFFFF0000) >> 16*/
KERNEL_VERSION_BUILD_HEX);
if (!NT_SUCCESS(Status))
{
/* Fail */