Skip to content

Commit 7bc4090

Browse files
committed
[kernel][version] 采用新的版本宏定义
版本控制规范:https://semver.org/ 目前的版本子号不是很规范,其中RT_VERSION甚至和VS那边造成了冲突 ```c /* RT-Thread version information */ #define RT_VERSION 4L /**< major version number */ #define RT_SUBVERSION 1L /**< minor version number */ #define RT_REVISION 1L /**< revise version number */ ``` 参考ESP32: ```c /** Major version number (X.x.x) */ #define ESP_ARDUINO_VERSION_MAJOR 2 /** Minor version number (x.X.x) */ #define ESP_ARDUINO_VERSION_MINOR 0 /** Patch version number (x.x.X) */ #define ESP_ARDUINO_VERSION_PATCH 3 ``` 建议改成: ```c /* Major version number (X.x.x) */ #define RT_VERSION_MAJOR 4 /* Minor version number (x.X.x) */ #define RT_VERSION_MINOR 2 /* Patch version number (x.x.X) */ #define RT_VERSION_PATCH 0 ```
1 parent 7d58cf1 commit 7bc4090

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

bsp/nuvoton/libraries/nu_packages/Demo/slcd_show_tick.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void slcd_demo_hook(void)
118118
/* Show RTT version. */
119119
{
120120
LCDLIB_SetSymbol(SYMBOL_VERSION, 1);
121-
rt_snprintf(au8Str, sizeof(au8Str), "%d%02d%03d", RT_VERSION, RT_SUBVERSION, RT_REVISION);
121+
rt_snprintf(au8Str, sizeof(au8Str), "%d%02d%03d", RT_VERSION_MAJOR, RT_VERSION_MINOR, RT_VERSION_PATCH);
122122
LCDLIB_Printf(ZONE_VER_DIGIT, &au8Str[0]);
123123
LCDLIB_SetSymbol(SYMBOL_VER_DIG_P1, 1);
124124
LCDLIB_SetSymbol(SYMBOL_VER_DIG_P2, 1);

bsp/simulator/drivers/SConscript

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ if rtconfig.CROSS_TOOL == 'msvc':
2121
'_CRT_NO_TIME_T',
2222
# disable deprecation of unsafe functions, such as strncpy
2323
'_CRT_SECURE_NO_WARNINGS',
24-
# RT_VESRION conflicts in winuser.h
25-
'NORESOURCE',
2624
# lean and mean for Windows.h, exclude winsock.h when include Windows.h
2725
# avoid conlicts between sys/select.h, time.h, and winsock.h
2826
# such as fd_set related, struct timeval...

components/legacy/rtlegacy.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212
#define __RT_LEGACY_H__
1313

1414
#include <rtconfig.h>
15+
#include <rtdef.h>
1516

16-
/* rtlibc */
17-
#include <stdint.h>
18-
#include <stddef.h>
17+
/* legacy version macros */
18+
#define RT_VERSION RT_VERSION_MAJOR /**< major version number */
19+
#define RT_SUBVERSION RT_VERSION_MINOR /**< minor version number */
20+
#define RT_REVISION RT_VERSION_PATCH /**< revise version number */
1921

2022
/* IPC */
2123
#ifdef RT_USING_DEVICE_IPC

components/net/sal/src/sal_socket.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@ static void check_netdev_internet_up_work(struct rt_work *work, void *work_data)
238238
{
239239
send_data[index + 1] = netdev->hwaddr[index] + moth_num;
240240
}
241-
send_data[9] = RT_VERSION;
242-
send_data[10] = RT_SUBVERSION;
243-
send_data[11] = RT_REVISION;
241+
send_data[9] = RT_VERSION_MAJOR;
242+
send_data[10] = RT_VERSION_MINOR;
243+
send_data[11] = RT_VERSION_PATCH;
244244

245245
skt_ops->sendto(sockfd, send_data, SAL_INTERNET_BUFF_LEN, 0,
246246
(struct sockaddr *)&server_addr, sizeof(struct sockaddr));

include/rtdef.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ extern "C" {
6868
/**@{*/
6969

7070
/* RT-Thread version information */
71-
#define RT_VERSION 5 /**< major version number */
72-
#define RT_SUBVERSION 0 /**< minor version number */
73-
#define RT_REVISION 0 /**< revise version number */
71+
#define RT_VERSION_MAJOR 5 /**< Major version number (X.x.x) */
72+
#define RT_VERSION_MINOR 0 /**< Minor version number (x.X.x) */
73+
#define RT_VERSION_PATCH 0 /**< Patch version number (x.x.X) */
7474

7575
/* e.g. #if (RTTHREAD_VERSION >= RT_VERSION_CHECK(4, 1, 0) */
7676
#define RT_VERSION_CHECK(major, minor, revise) ((major * 10000) + (minor * 100) + revise)
7777

7878
/* RT-Thread version */
79-
#define RTTHREAD_VERSION RT_VERSION_CHECK(RT_VERSION, RT_SUBVERSION, RT_REVISION)
79+
#define RTTHREAD_VERSION RT_VERSION_CHECK(RT_VERSION_MAJOR, RT_VERSION_MINOR, RT_VERSION_PATCH)
8080

8181

8282
/* RT-Thread basic data type definitions */

src/kservice.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ void rt_show_version(void)
639639
rt_kprintf("\n \\ | /\n");
640640
rt_kprintf("- RT - Thread Operating System\n");
641641
rt_kprintf(" / | \\ %d.%d.%d build %s %s\n",
642-
(rt_int32_t)RT_VERSION, (rt_int32_t)RT_SUBVERSION, (rt_int32_t)RT_REVISION, __DATE__, __TIME__);
642+
(rt_int32_t)RT_VERSION_MAJOR, (rt_int32_t)RT_VERSION_MINOR, (rt_int32_t)RT_VERSION_PATCH, __DATE__, __TIME__);
643643
rt_kprintf(" 2006 - 2022 Copyright by RT-Thread team\n");
644644
}
645645
RTM_EXPORT(rt_show_version);

tools/building.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -968,11 +968,11 @@ def GetVersion():
968968
prepcessor.process_contents(contents)
969969
def_ns = prepcessor.cpp_namespace
970970

971-
version = int([ch for ch in def_ns['RT_VERSION'] if ch in '0123456789.'])
972-
subversion = int([ch for ch in def_ns['RT_SUBVERSION'] if ch in '0123456789.'])
971+
version = int([ch for ch in def_ns['RT_VERSION_MAJOR'] if ch in '0123456789.'])
972+
subversion = int([ch for ch in def_ns['RT_VERSION_MINOR'] if ch in '0123456789.'])
973973

974-
if 'RT_REVISION' in def_ns:
975-
revision = int([ch for ch in def_ns['RT_REVISION'] if ch in '0123456789.'])
974+
if 'RT_VERSION_PATCH' in def_ns:
975+
revision = int([ch for ch in def_ns['RT_VERSION_PATCH'] if ch in '0123456789.'])
976976
return '%d.%d.%d' % (version, subversion, revision)
977977

978978
return '0.%d.%d' % (version, subversion)

0 commit comments

Comments
 (0)