Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dgr6878
rt-thread
提交
86ae6146
R
rt-thread
项目概览
dgr6878
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
86ae6146
编写于
6月 14, 2018
作者:
X
xieyangrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[tools/building.py]fixed SrcRemove /\ convert issue.
上级
35a0e8e8
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
43 addition
and
20 deletion
+43
-20
tools/building.py
tools/building.py
+43
-20
未找到文件。
tools/building.py
浏览文件 @
86ae6146
...
...
@@ -21,7 +21,7 @@
# Date Author Notes
# 2015-01-20 Bernard Add copyright information
# 2015-07-25 Bernard Add LOCAL_CCFLAGS/LOCAL_CPPPATH/LOCAL_CPPDEFINES for
# group definition.
# group definition.
#
import
os
...
...
@@ -69,7 +69,7 @@ def stop_handling_includes(self, t=None):
d
[
'include'
]
=
self
.
do_nothing
d
[
'include_next'
]
=
self
.
do_nothing
d
[
'define'
]
=
self
.
do_nothing
PatchedPreProcessor
=
SCons
.
cpp
.
PreProcessor
PatchedPreProcessor
.
start_handling_includes
=
start_handling_includes
PatchedPreProcessor
.
stop_handling_includes
=
stop_handling_includes
...
...
@@ -278,7 +278,7 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
'ua'
:(
'gcc'
,
'gcc'
),
'cdk'
:(
'gcc'
,
'gcc'
)}
tgt_name
=
GetOption
(
'target'
)
if
tgt_name
:
# --target will change the toolchain settings which clang-analyzer is
# depend on
...
...
@@ -297,10 +297,10 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
and
rtconfig
.
PLATFORM
==
'gcc'
:
AddDepend
(
'RT_USING_MINILIBC'
)
AddOption
(
'--genconfig'
,
AddOption
(
'--genconfig'
,
dest
=
'genconfig'
,
action
=
'store_true'
,
default
=
False
,
default
=
False
,
help
=
'Generate .config from rtconfig.h'
)
if
GetOption
(
'genconfig'
):
from
genconf
import
genconfig
...
...
@@ -308,7 +308,7 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
exit
(
0
)
if
env
[
'PLATFORM'
]
!=
'win32'
:
AddOption
(
'--menuconfig'
,
AddOption
(
'--menuconfig'
,
dest
=
'menuconfig'
,
action
=
'store_true'
,
default
=
False
,
...
...
@@ -772,7 +772,7 @@ def EndBuilding(target, program = None):
if
GetOption
(
'target'
)
==
'vsc'
:
from
vsc
import
GenerateVSCode
GenerateVSCode
(
Env
)
if
GetOption
(
'target'
)
==
'cdk'
:
from
cdk
import
CDKProject
CDKProject
(
'project.cdkproj'
,
Projects
)
...
...
@@ -803,22 +803,45 @@ def SrcRemove(src, remove):
if
not
src
:
return
for
item
in
src
:
if
type
(
item
)
==
type
(
'str'
):
item_str
=
item
else
:
item_str
=
item
.
rstr
()
src_bak
=
src
if
type
(
remove
)
==
type
(
'str'
):
if
os
.
path
.
isabs
(
remove
):
remove
=
os
.
path
.
relpath
(
remove
,
GetCurrentDir
())
remove
=
os
.
path
.
normpath
(
remove
)
if
os
.
path
.
isabs
(
item_str
):
item_str
=
os
.
path
.
relpath
(
item_str
,
GetCurrentDir
())
for
item
in
src
:
if
type
(
item
)
==
type
(
'str'
):
item_str
=
item
else
:
item_str
=
item
.
rstr
()
if
os
.
path
.
isabs
(
item_str
):
item_str
=
os
.
path
.
relpath
(
item_str
,
GetCurrentDir
())
item_str
=
os
.
path
.
normpath
(
item_str
)
if
type
(
remove
)
==
type
(
'str'
):
if
item_str
==
remove
:
src
.
remove
(
item
)
else
:
for
remove_item
in
remove
:
if
item_str
==
str
(
remove_item
):
src
.
remove
(
item
)
src_bak
.
remove
(
item
)
else
:
for
remove_item
in
remove
:
remove_str
=
str
(
remove_item
)
if
os
.
path
.
isabs
(
remove_str
):
remove_str
=
os
.
path
.
relpath
(
remove_str
,
GetCurrentDir
())
remove_str
=
os
.
path
.
normpath
(
remove_str
)
for
item
in
src
:
if
type
(
item
)
==
type
(
'str'
):
item_str
=
item
else
:
item_str
=
item
.
rstr
()
if
os
.
path
.
isabs
(
item_str
):
item_str
=
os
.
path
.
relpath
(
item_str
,
GetCurrentDir
())
item_str
=
os
.
path
.
normpath
(
item_str
)
if
item_str
==
remove_str
:
src_bak
.
remove
(
item
)
src
=
src_bak
def
GetVersion
():
import
SCons.cpp
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录