Skip to content

Commit 30e1e5e

Browse files
authored
Reorganize Group names in build system for clarity and IDE integration #10923
1 parent ae2a575 commit 30e1e5e

File tree

84 files changed

+84
-84
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+84
-84
lines changed

components/drivers/ktime/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ if rtconfig.PLATFORM in ['gcc', 'armclang']:
1919
elif rtconfig.PLATFORM in ['armcc']:
2020
LOCAL_CCFLAGS += ' --c99 --gnu'
2121

22-
group = DefineGroup('ktime', src, depend=['RT_USING_KTIME'], CPPPATH=CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS)
22+
group = DefineGroup('DeviceDrivers', src, depend=['RT_USING_KTIME'], CPPPATH=CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS)
2323

2424
Return('group')

components/drivers/usb/cherryusb/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ if GetDepend(['RT_CHERRYUSB_HOST']):
320320
src += Glob('platform/rtthread/usb_msh.c')
321321
src += Glob('platform/rtthread/usb_check.c')
322322

323-
group = DefineGroup('CherryUSB', src, depend = ['RT_USING_CHERRYUSB'], LIBS = LIBS, LIBPATH=LIBPATH, CPPPATH = path, CPPDEFINES = CPPDEFINES)
323+
group = DefineGroup('UsbStack', src, depend = ['RT_USING_CHERRYUSB'], LIBS = LIBS, LIBPATH=LIBPATH, CPPPATH = path, CPPDEFINES = CPPDEFINES)
324324

325325
Return('group')
326326

components/libc/compilers/armlibc/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ group = []
77
if rtconfig.PLATFORM in ['armcc', 'armclang']:
88
CPPDEFINES = ['RT_USING_ARMLIBC', 'RT_USING_LIBC', '__STDC_LIMIT_MACROS']
99
AddDepend(['RT_USING_ARMLIBC', 'RT_USING_LIBC'])
10-
group = DefineGroup('Compiler', src, depend = [''], CPPDEFINES = CPPDEFINES)
10+
group = DefineGroup('Libc', src, depend = [''], CPPDEFINES = CPPDEFINES)
1111

1212
Return('group')

components/libc/compilers/common/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ elif rtconfig.PLATFORM in ['gcc'] and rtconfig.CPU in ['posix']:
1616

1717
src += Glob('*.c')
1818

19-
group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
19+
group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
2020

2121
list = os.listdir(cwd)
2222
for item in list:

components/libc/compilers/common/extension/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ group = []
1010
src += Glob('*.c')
1111

1212
if rtconfig.PLATFORM not in ['gcc', 'llvm-arm']:
13-
group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH)
13+
group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH)
1414

1515
list = os.listdir(cwd)
1616
for d in list:

components/libc/compilers/common/extension/fcntl/msvc/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ CPPPATH = [cwd]
77
group = []
88

99
if rtconfig.CROSS_TOOL == 'msvc':
10-
group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH)
10+
group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH)
1111
Return('group')

components/libc/compilers/common/extension/fcntl/octal/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ CPPPATH = [cwd]
77
group = []
88

99
if rtconfig.PLATFORM in ['armcc', 'armclang', 'iccarm']:
10-
group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH)
10+
group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH)
1111
Return('group')

components/libc/compilers/dlib/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ if rtconfig.PLATFORM in ['iccarm']:
1717
if iar_version != LooseVersion("0.0") and iar_version < LooseVersion("8.20.1"):
1818
CPPDEFINES = CPPDEFINES + ['_DLIB_THREAD_SUPPORT']
1919

20-
group = DefineGroup('Compiler', src, depend = [''], CPPDEFINES = CPPDEFINES)
20+
group = DefineGroup('Libc', src, depend = [''], CPPDEFINES = CPPDEFINES)
2121

2222
Return('group')

components/libc/compilers/musl/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if musllibc_version:
1919
LINKFLAGS = ' --specs=kernel.specs'
2020
AddDepend(['RT_USING_MUSLLIBC', 'RT_USING_LIBC'])
2121

22-
group = group + DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
22+
group = group + DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
2323

2424
list = os.listdir(cwd)
2525
for d in list:

components/libc/compilers/newlib/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if newlib_version and not GetDepend('RT_USING_EXTERNAL_LIBC'):
1818
LIBS = ['c', 'm'] # link libc and libm
1919
AddDepend(['RT_USING_NEWLIBC', 'RT_USING_LIBC'])
2020

21-
group = group + DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
21+
group = group + DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
2222

2323
list = os.listdir(cwd)
2424
for d in list:

0 commit comments

Comments
 (0)