Merge pull request #3744 from margguo/fixbug_in_eclipse_py

fixbug:eclipse.py do not remove all unused path from list
This commit is contained in:
Bernard Xiong 2020-07-11 19:58:50 +08:00 committed by GitHub
commit 625caba726
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions

View File

@ -22,7 +22,7 @@ from xml.etree.ElementTree import SubElement
from building import *
MODULE_VER_NUM = 3
MODULE_VER_NUM = 4
source_pattern = ['*.c', '*.cpp', '*.cxx', '*.s', '*.S', '*.asm']
@ -348,12 +348,13 @@ def GenExcluding(env, project):
rtt_root = os.path.abspath(env['RTT_ROOT'])
bsp_root = os.path.abspath(env['BSP_ROOT'])
coll_dirs = CollectPaths(project['DIRS'])
all_paths = [OSPath(path) for path in coll_dirs]
all_paths_temp = [OSPath(path) for path in coll_dirs]
all_paths = []
# remove unused path
for path in all_paths:
if not path.startswith(rtt_root) and not path.startswith(bsp_root):
all_paths.remove(path)
# add used path
for path in all_paths_temp:
if path.startswith(rtt_root) or path.startswith(bsp_root):
all_paths.append(path)
if bsp_root.startswith(rtt_root):
# bsp folder is in the RT-Thread root folder, such as the RT-Thread source code on GitHub