Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lfmiao0
rt-thread
提交
cfd101ac
R
rt-thread
项目概览
lfmiao0
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
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,发现更多精彩内容 >>
提交
cfd101ac
编写于
10月 14, 2015
作者:
B
Bernard Xiong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Tools] Fix the buildlib with LOCAL_* options group
上级
1bebbecd
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
32 addition
and
17 deletion
+32
-17
tools/building.py
tools/building.py
+32
-17
未找到文件。
tools/building.py
浏览文件 @
cfd101ac
...
...
@@ -267,6 +267,12 @@ def PrepareModuleBuilding(env, root_directory, bsp_directory):
global
Env
global
Rtt_Root
# patch for win32 spawn
if
env
[
'PLATFORM'
]
==
'win32'
:
win32_spawn
=
Win32Spawn
()
win32_spawn
.
env
=
env
env
[
'SPAWN'
]
=
win32_spawn
.
spawn
Env
=
env
Rtt_Root
=
root_directory
...
...
@@ -491,37 +497,35 @@ def DoBuilding(target, objects):
lst
.
append
(
item
)
return
lst
objects
=
one_list
(
objects
)
# remove source files with local flags setting
for
group
in
Projects
:
if
group
.
has_key
(
'LOCAL_CCFLAGS'
)
or
group
.
has_key
(
'LOCAL_CPPPATH'
)
or
group
.
has_key
(
'LOCAL_CPPDEFINES'
):
for
source
in
group
[
'src'
]:
for
obj
in
objects
:
if
source
.
abspath
==
obj
.
abspath
or
(
len
(
obj
.
sources
)
>
0
and
source
.
abspath
==
obj
.
sources
[
0
].
abspath
):
objects
.
remove
(
obj
)
# re-add the source files to the objects
for
group
in
Projects
:
# handle local group
def
local_group
(
group
,
objects
):
if
group
.
has_key
(
'LOCAL_CCFLAGS'
)
or
group
.
has_key
(
'LOCAL_CPPPATH'
)
or
group
.
has_key
(
'LOCAL_CPPDEFINES'
):
CCFLAGS
=
Env
.
get
(
'CCFLAGS'
,
''
)
+
group
.
get
(
'LOCAL_CCFLAGS'
,
''
)
CPPPATH
=
Env
.
get
(
'CPPPATH'
,
[
''
])
+
group
.
get
(
'LOCAL_CPPPATH'
,
[
''
])
CPPDEFINES
=
Env
.
get
(
'CPPDEFINES'
,
[
''
])
+
group
.
get
(
'LOCAL_CPPDEFINES'
,
[
''
])
for
source
in
group
[
'src'
]:
objects
+=
Env
.
Object
(
source
,
CCFLAGS
=
CCFLAGS
,
CPPPATH
=
CPPPATH
,
CPPDEFINES
=
CPPDEFINES
)
objects
.
append
(
Env
.
Object
(
source
,
CCFLAGS
=
CCFLAGS
,
CPPPATH
=
CPPPATH
,
CPPDEFINES
=
CPPDEFINES
))
return
True
return
False
objects
=
one_list
(
objects
)
program
=
None
# check whether special buildlib option
lib_name
=
GetOption
(
'buildlib'
)
if
lib_name
:
objects
=
[]
# remove all of objects
# build library with special component
for
Group
in
Projects
:
if
Group
[
'name'
]
==
lib_name
:
lib_name
=
GroupLibName
(
Group
[
'name'
],
Env
)
if
not
local_group
(
Group
,
objects
):
objects
=
Env
.
Object
(
Group
[
'src'
])
program
=
Env
.
Library
(
lib_name
,
objects
)
# add library copy action
...
...
@@ -529,6 +533,18 @@ def DoBuilding(target, objects):
break
else
:
# remove source files with local flags setting
for
group
in
Projects
:
if
group
.
has_key
(
'LOCAL_CCFLAGS'
)
or
group
.
has_key
(
'LOCAL_CPPPATH'
)
or
group
.
has_key
(
'LOCAL_CPPDEFINES'
):
for
source
in
group
[
'src'
]:
for
obj
in
objects
:
if
source
.
abspath
==
obj
.
abspath
or
(
len
(
obj
.
sources
)
>
0
and
source
.
abspath
==
obj
.
sources
[
0
].
abspath
):
objects
.
remove
(
obj
)
# re-add the source files to the objects
for
group
in
Projects
:
local_group
(
group
,
objects
)
program
=
Env
.
Program
(
target
,
objects
)
EndBuilding
(
target
,
program
)
...
...
@@ -557,7 +573,6 @@ def EndBuilding(target, program = None):
else
:
print
'No template project file found.'
if
GetOption
(
'target'
)
==
'mdk4'
:
from
keil
import
MDK4Project
MDK4Project
(
'project.uvproj'
,
Projects
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录