Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Mozi
rt-thread
提交
aa411a25
R
rt-thread
项目概览
Mozi
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aa411a25
编写于
7月 24, 2020
作者:
Y
yaxing.chen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixbug:keep user's lib configuration while running --target=eclipse
上级
e22bbf97
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
27 addition
and
7 deletion
+27
-7
tools/eclipse.py
tools/eclipse.py
+27
-7
未找到文件。
tools/eclipse.py
浏览文件 @
aa411a25
...
@@ -22,7 +22,7 @@ from xml.etree.ElementTree import SubElement
...
@@ -22,7 +22,7 @@ from xml.etree.ElementTree import SubElement
from
building
import
*
from
building
import
*
MODULE_VER_NUM
=
4
MODULE_VER_NUM
=
5
source_pattern
=
[
'*.c'
,
'*.cpp'
,
'*.cxx'
,
'*.s'
,
'*.S'
,
'*.asm'
]
source_pattern
=
[
'*.c'
,
'*.cpp'
,
'*.cxx'
,
'*.s'
,
'*.S'
,
'*.asm'
]
...
@@ -139,6 +139,20 @@ def IsRttEclipsePathFormat(path):
...
@@ -139,6 +139,20 @@ def IsRttEclipsePathFormat(path):
else
:
else
:
return
False
return
False
# all libs added by scons should be ends with five whitespace as a flag
rtt_lib_flag
=
5
*
" "
def
ConverToRttEclipseLibFormat
(
lib
):
return
str
(
lib
)
+
str
(
rtt_lib_flag
)
def
IsRttEclipseLibFormat
(
path
):
if
path
.
endswith
(
rtt_lib_flag
):
return
True
else
:
return
False
def
IsCppProject
():
def
IsCppProject
():
return
GetDepend
(
'RT_USING_CPLUSPLUS'
)
return
GetDepend
(
'RT_USING_CPLUSPLUS'
)
...
@@ -189,7 +203,7 @@ def HandleToolOption(tools, env, project, reset):
...
@@ -189,7 +203,7 @@ def HandleToolOption(tools, env, project, reset):
linker_script_option
=
option
linker_script_option
=
option
elif
option
.
get
(
'id'
).
find
(
'linker.nostart'
)
!=
-
1
:
elif
option
.
get
(
'id'
).
find
(
'linker.nostart'
)
!=
-
1
:
linker_nostart_option
=
option
linker_nostart_option
=
option
elif
option
.
get
(
'id'
).
find
(
'linker.libs'
)
!=
-
1
and
env
.
has_key
(
'LIBS'
)
:
elif
option
.
get
(
'id'
).
find
(
'linker.libs'
)
!=
-
1
:
linker_libs_option
=
option
linker_libs_option
=
option
elif
option
.
get
(
'id'
).
find
(
'linker.paths'
)
!=
-
1
and
env
.
has_key
(
'LIBPATH'
):
elif
option
.
get
(
'id'
).
find
(
'linker.paths'
)
!=
-
1
and
env
.
has_key
(
'LIBPATH'
):
linker_paths_option
=
option
linker_paths_option
=
option
...
@@ -288,16 +302,22 @@ def HandleToolOption(tools, env, project, reset):
...
@@ -288,16 +302,22 @@ def HandleToolOption(tools, env, project, reset):
else
:
else
:
option
.
set
(
'value'
,
'false'
)
option
.
set
(
'value'
,
'false'
)
# update libs
# update libs
if
linker_libs_option
is
not
None
:
if
linker_libs_option
is
not
None
:
option
=
linker_libs_option
option
=
linker_libs_option
# remove old libs
# remove old libs
for
item
in
option
.
findall
(
'listOptionValue'
):
for
item
in
option
.
findall
(
'listOptionValue'
):
if
IsRttEclipseLibFormat
(
item
.
get
(
"value"
)):
option
.
remove
(
item
)
option
.
remove
(
item
)
# add new libs
# add new libs
if
env
.
has_key
(
'LIBS'
):
for
lib
in
env
[
'LIBS'
]:
for
lib
in
env
[
'LIBS'
]:
SubElement
(
option
,
'listOptionValue'
,
{
'builtIn'
:
'false'
,
'value'
:
lib
})
formatedLib
=
ConverToRttEclipseLibFormat
(
lib
)
SubElement
(
option
,
'listOptionValue'
,
{
'builtIn'
:
'false'
,
'value'
:
formatedLib
})
# update lib paths
# update lib paths
if
linker_paths_option
is
not
None
:
if
linker_paths_option
is
not
None
:
option
=
linker_paths_option
option
=
linker_paths_option
# remove old lib paths
# remove old lib paths
for
item
in
option
.
findall
(
'listOptionValue'
):
for
item
in
option
.
findall
(
'listOptionValue'
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录