diff --git a/bsp/stm32/stm32f103-dofly-M3S/.cproject b/bsp/stm32/stm32f103-dofly-M3S/.cproject
index eaeea747e7e1bfce5ecb2dec6d28d65c59bd4071..ebcf2b23239d4986f3a12118da5321ec3595780c 100644
--- a/bsp/stm32/stm32f103-dofly-M3S/.cproject
+++ b/bsp/stm32/stm32f103-dofly-M3S/.cproject
@@ -60,22 +60,22 @@
diff --git a/bsp/stm32/stm32f103-yf-ufun/.cproject b/bsp/stm32/stm32f103-yf-ufun/.cproject
index 65010856476f19b32d4d2c0e5b91fc06f0b463b5..1c88b85c6475c07bc6d256bc814a417037cf9a53 100644
--- a/bsp/stm32/stm32f103-yf-ufun/.cproject
+++ b/bsp/stm32/stm32f103-yf-ufun/.cproject
@@ -60,22 +60,21 @@
diff --git a/bsp/stm32/stm32f401-st-nucleo/.cproject b/bsp/stm32/stm32f401-st-nucleo/.cproject
index 6fffea387cd1b08560a4dd80ec26fa246e429e70..4651155e210bbe022b1268db7ba195f1179470b8 100644
--- a/bsp/stm32/stm32f401-st-nucleo/.cproject
+++ b/bsp/stm32/stm32f401-st-nucleo/.cproject
@@ -62,21 +62,21 @@
diff --git a/bsp/stm32/stm32f407-atk-explorer/.cproject b/bsp/stm32/stm32f407-atk-explorer/.cproject
index f162e4d0b6b90cf693d8cf47f1f8beb25c59534a..a64ff851f18eb8c0ec3f3bd515634ab4064f6ad1 100644
--- a/bsp/stm32/stm32f407-atk-explorer/.cproject
+++ b/bsp/stm32/stm32f407-atk-explorer/.cproject
@@ -62,22 +62,22 @@
diff --git a/bsp/stm32/stm32f411-st-nucleo/.cproject b/bsp/stm32/stm32f411-st-nucleo/.cproject
index 61e218e54c390c9fe48859fcb8698d5857272a8f..2078a87054c0e641c30095e272c66519a66f8ef1 100644
--- a/bsp/stm32/stm32f411-st-nucleo/.cproject
+++ b/bsp/stm32/stm32f411-st-nucleo/.cproject
@@ -62,22 +62,21 @@
diff --git a/bsp/stm32/stm32f429-atk-apollo/.cproject b/bsp/stm32/stm32f429-atk-apollo/.cproject
index f91e6f67823533836ebb009d0aacdba06f5acc4e..4bd13e765a733c2ce66e28557a38eec77ac87404 100644
--- a/bsp/stm32/stm32f429-atk-apollo/.cproject
+++ b/bsp/stm32/stm32f429-atk-apollo/.cproject
@@ -62,22 +62,22 @@
diff --git a/bsp/stm32/stm32f429-fire-challenger/.cproject b/bsp/stm32/stm32f429-fire-challenger/.cproject
index 0139f0c6aa5b9ae07a241fedd1b88161be6f1918..4fe60457b7c8b8586af48e17bd2fd40a9a861567 100644
--- a/bsp/stm32/stm32f429-fire-challenger/.cproject
+++ b/bsp/stm32/stm32f429-fire-challenger/.cproject
@@ -62,22 +62,22 @@
diff --git a/bsp/stm32/stm32f767-atk-apollo/.cproject b/bsp/stm32/stm32f767-atk-apollo/.cproject
index ffe0b49011f1d1f27056cb7072395fd8b0887a83..d1c84d26514663bb8af5c18a9909f4d9da103e09 100644
--- a/bsp/stm32/stm32f767-atk-apollo/.cproject
+++ b/bsp/stm32/stm32f767-atk-apollo/.cproject
@@ -62,22 +62,22 @@
diff --git a/bsp/stm32/stm32l475-atk-pandora/.cproject b/bsp/stm32/stm32l475-atk-pandora/.cproject
index ad720c7dbe43d304d324b7630e8681a466fab7a6..f9f3507d68ad183015d3c908817294b192df0643 100644
--- a/bsp/stm32/stm32l475-atk-pandora/.cproject
+++ b/bsp/stm32/stm32l475-atk-pandora/.cproject
@@ -50,35 +50,35 @@
-
-
-
+
-
-
@@ -95,8 +95,8 @@
-
diff --git a/tools/eclipse.py b/tools/eclipse.py
index 840ed9f191c03ee50f3bd807fadb11fe9902f338..c7fefc0bdac076fc800c824fdeec8b25e277e97a 100644
--- a/tools/eclipse.py
+++ b/tools/eclipse.py
@@ -122,17 +122,25 @@ def ExcludePaths(rootpath, paths):
return ret
-def ConverToEclipsePathFormat(path):
- if path.startswith('.'):
- path = path[1:]
- return '"${workspace_loc:/${ProjName}/' + path + '}"'
+rtt_path_prefix = '"${workspace_loc://${ProjName}//'
+
+
+def ConverToRttEclipsePathFormat(path):
+ return rtt_path_prefix + path + '}"'
+
+
+def IsRttEclipsePathFormat(path):
+ if path.startswith(rtt_path_prefix):
+ return True
+ else :
+ return False
def HandleToolOption(tools, env, project, reset):
BSP_ROOT = os.path.abspath(env['BSP_ROOT'])
CPPDEFINES = project['CPPDEFINES']
- paths = [ConverToEclipsePathFormat(RelativeProjectPath(env, os.path.normpath(i)).replace('\\', '/')) for i in project['CPPPATH']]
+ paths = [ConverToRttEclipsePathFormat(RelativeProjectPath(env, os.path.normpath(i)).replace('\\', '/')) for i in project['CPPPATH']]
for tool in tools:
if tool.get('id').find('c.compile') != 1:
@@ -153,22 +161,13 @@ def HandleToolOption(tools, env, project, reset):
option = include_paths_option
# find all of paths in this project
include_paths = option.findall('listOptionValue')
- project_paths = []
for item in include_paths:
- if reset is True:
- # clean all old configuration
+ if reset is True or IsRttEclipsePathFormat(item.get('value')) :
+ # clean old configuration
option.remove(item)
- else:
- project_paths += [item.get('value')]
-
- if len(project_paths) > 0:
- cproject_paths = set(paths) - set(project_paths)
- else:
- cproject_paths = paths
-
# print('c.compiler.include.paths')
- cproject_paths = sorted(cproject_paths)
- for item in cproject_paths:
+ paths = sorted(paths)
+ for item in paths:
SubElement(option, 'listOptionValue', {'builtIn': 'false', 'value': item})
# change the inclue files (default) or definitions
if include_files_option is not None:
@@ -178,7 +177,7 @@ def HandleToolOption(tools, env, project, reset):
#define RTCONFIG_PREINC_H__
/* Automatically generated file; DO NOT EDIT. */
-/* RT-Thread Configuration */
+/* RT-Thread pre-include file */
'''
file_tail = '\n#endif /*RTCONFIG_PREINC_H__*/\n'
@@ -227,7 +226,7 @@ def HandleToolOption(tools, env, project, reset):
items = env['LINKFLAGS'].split(' ')
if '-T' in items:
linker_script = items[items.index('-T') + 1]
- linker_script = ConverToEclipsePathFormat(linker_script)
+ linker_script = ConverToRttEclipsePathFormat(linker_script)
listOptionValue = option.find('listOptionValue')
if listOptionValue != None:
@@ -239,7 +238,7 @@ def HandleToolOption(tools, env, project, reset):
if option.get('id').find('c.linker.option.script') != -1:
items = env['LINKFLAGS'].split(' ')
if '-T' in items:
- linker_script = ConverToEclipsePathFormat(items[items.index('-T') + 1]).strip('"')
+ linker_script = ConverToRttEclipsePathFormat(items[items.index('-T') + 1]).strip('"')
option.set('value',linker_script)
# update nostartfiles config