diff --git a/Kernel/Sys.cpp b/Kernel/Sys.cpp index 37f70da1..b0648783 100644 --- a/Kernel/Sys.cpp +++ b/Kernel/Sys.cpp @@ -14,13 +14,13 @@ SystemConfig g_Config = { "SmartOS_CPU", // 硬件 - 0x0, + (0x0 | __BUILD_DATE__), // 应用软件 - 0x0, - 0x0, + (0x0 | __BUILD_DATE__), + (0x0 | __BUILD_DATE__), __BUILD_USER__, - "170321", + __BUILD_SDATE__, }; #if defined(BOOT) || defined(APP) @@ -65,7 +65,7 @@ void TSys::ShowInfo() const debug_printf("%s::%s Code:%04X ", Company, Name, Code); Version v(Config->Ver); debug_printf("Ver:%s\r\n", v.ToString().GetBuffer()); - debug_printf("Product:%s Build:%s %s\r\n", Config->Product, __BUILD_USER__, __BUILD_COMPILE__); + debug_printf("Product:%s Build:%s %s\r\n", Config->Product, __BUILD_USER__, __BUILD_STIME__); Version v1(Config->AppVer); Version v2(Config->HardVer); debug_printf("AppVer:%s HardVer:%s\r\n", v1.ToString().GetBuffer(), v2.ToString().GetBuffer()); diff --git a/Kernel/Sys.h b/Kernel/Sys.h index d68662dc..3065382b 100644 --- a/Kernel/Sys.h +++ b/Kernel/Sys.h @@ -213,11 +213,14 @@ public: #ifndef __BUILD_TIME__ #define __BUILD_TIME__ 1490054400 // 2017-03-21 00:00:00 #endif -#ifndef __BUILD_COMPILE__ -#define __BUILD_COMPILE__ "2017-03-21 00:00:00" +#ifndef __BUILD_SDATE__ +#define __BUILD_SDATE__ "170321" +#endif +#ifndef __BUILD_STIME__ +#define __BUILD_STIME__ "2017-03-21 00:00:00" #endif #ifndef __BUILD_USER__ -#define __BUILD_USER__ "User_Computer" +#define __BUILD_USER__ "Computer_User" #endif diff --git a/Tool/NewLife.Build.dll b/Tool/NewLife.Build.dll index a64150a3..7e34ac81 100644 Binary files a/Tool/NewLife.Build.dll and b/Tool/NewLife.Build.dll differ diff --git a/Tool/NewLife.Core.dll b/Tool/NewLife.Core.dll index 9b51d2fc..1edcdcb9 100644 Binary files a/Tool/NewLife.Core.dll and b/Tool/NewLife.Core.dll differ diff --git a/Tool/XScript.exe b/Tool/XScript.exe index ccbf5663..befabad2 100644 Binary files a/Tool/XScript.exe and b/Tool/XScript.exe differ