diff options
| author | armink <[email protected]> | 2019-10-25 15:56:34 +0800 |
|---|---|---|
| committer | armink <[email protected]> | 2019-10-25 16:35:09 +0800 |
| commit | 8dabc3be27ed7269bddd7da37d019a99213fa46e (patch) | |
| tree | f185aeeaf554c10fa996f1f9907e3e41732cbec2 | |
| parent | 5560e59d206410ee7b6d5ad6e6bc388041426992 (diff) | |
[tools] change the eclipse project include path format
| -rw-r--r-- | bsp/stm32/stm32f103-dofly-M3S/.cproject | 34 | ||||
| -rw-r--r-- | bsp/stm32/stm32f103-yf-ufun/.cproject | 33 | ||||
| -rw-r--r-- | bsp/stm32/stm32f401-st-nucleo/.cproject | 32 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-atk-explorer/.cproject | 34 | ||||
| -rw-r--r-- | bsp/stm32/stm32f411-st-nucleo/.cproject | 33 | ||||
| -rw-r--r-- | bsp/stm32/stm32f429-atk-apollo/.cproject | 34 | ||||
| -rw-r--r-- | bsp/stm32/stm32f429-fire-challenger/.cproject | 34 | ||||
| -rw-r--r-- | bsp/stm32/stm32f767-atk-apollo/.cproject | 34 | ||||
| -rw-r--r-- | bsp/stm32/stm32l475-atk-pandora/.cproject | 46 | ||||
| -rw-r--r-- | tools/eclipse.py | 41 |
10 files changed, 176 insertions, 179 deletions
diff --git a/bsp/stm32/stm32f103-dofly-M3S/.cproject b/bsp/stm32/stm32f103-dofly-M3S/.cproject index eaeea747e7..ebcf2b2323 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/.cproject +++ b/bsp/stm32/stm32f103-dofly-M3S/.cproject @@ -60,22 +60,22 @@ </tool> <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1570350559" name="GNU ARM Cross C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler"> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.634882052" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/applications}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/CubeMX_Config/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/ports}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F1xx_HAL/STM32F1xx_HAL_Driver/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/drivers/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/finsh}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/libc/compilers/minilibc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/common}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/cortex-m3}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//applications}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/CubeMX_Config/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/ports}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F1xx_HAL/STM32F1xx_HAL_Driver/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/drivers/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/finsh}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/libc/compilers/minilibc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/common}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/cortex-m3}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols"> <listOptionValue builtIn="false" value="DEBUG" /> @@ -95,7 +95,7 @@ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano.923990336" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano" useByScannerDiscovery="false" value="true" valueType="boolean" /> <option defaultValue="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared.548869459" name="Shared (-shared)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared" useByScannerDiscovery="false" valueType="boolean" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile.1818777301" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/linker_scripts/link.lds}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/linker_scripts/link.lds}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs.1135656995" name="Libraries (-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs" useByScannerDiscovery="false" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths.36884122" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths" useByScannerDiscovery="false" /> diff --git a/bsp/stm32/stm32f103-yf-ufun/.cproject b/bsp/stm32/stm32f103-yf-ufun/.cproject index 6501085647..1c88b85c64 100644 --- a/bsp/stm32/stm32f103-yf-ufun/.cproject +++ b/bsp/stm32/stm32f103-yf-ufun/.cproject @@ -60,22 +60,21 @@ </tool> <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1570350559" name="GNU ARM Cross C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler"> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.634882052" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/applications}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/CubeMX_Config/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/ports}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F1xx_HAL/STM32F1xx_HAL_Driver/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/drivers/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/finsh}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/libc/compilers/minilibc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/common}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/cortex-m3}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//applications}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/CubeMX_Config/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F1xx_HAL/CMSIS/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F1xx_HAL/STM32F1xx_HAL_Driver/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/drivers/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/finsh}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/libc/compilers/minilibc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/common}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/cortex-m3}"" /> </option> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols"> <listOptionValue builtIn="false" value="DEBUG" /> @@ -95,7 +94,7 @@ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano.923990336" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano" useByScannerDiscovery="false" value="true" valueType="boolean" /> <option defaultValue="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared.548869459" name="Shared (-shared)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared" useByScannerDiscovery="false" valueType="boolean" /> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile.1818777301" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/linker_scripts/link.lds}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/linker_scripts/link.lds}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs.1135656995" name="Libraries (-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs" useByScannerDiscovery="false" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths.36884122" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths" useByScannerDiscovery="false" /> diff --git a/bsp/stm32/stm32f401-st-nucleo/.cproject b/bsp/stm32/stm32f401-st-nucleo/.cproject index 6fffea387c..4651155e21 100644 --- a/bsp/stm32/stm32f401-st-nucleo/.cproject +++ b/bsp/stm32/stm32f401-st-nucleo/.cproject @@ -62,21 +62,21 @@ </tool> <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1570350559" name="GNU ARM Cross C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler"> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.634882052" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/applications}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/CubeMX_Config/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/STM32F4xx_HAL_Driver/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/drivers/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/finsh}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/libc/compilers/minilibc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/common}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/cortex-m4}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//applications}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/CubeMX_Config/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/STM32F4xx_HAL_Driver/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/drivers/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/finsh}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/libc/compilers/minilibc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/common}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/cortex-m4}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols"> <listOptionValue builtIn="false" value="DEBUG" /> @@ -96,7 +96,7 @@ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano.923990336" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano" useByScannerDiscovery="false" value="true" valueType="boolean" /> <option defaultValue="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared.548869459" name="Shared (-shared)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared" useByScannerDiscovery="false" valueType="boolean" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile.1818777301" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/linker_scripts/link.lds}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/linker_scripts/link.lds}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs.1135656995" name="Libraries (-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs" useByScannerDiscovery="false" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths.36884122" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths" useByScannerDiscovery="false" /> diff --git a/bsp/stm32/stm32f407-atk-explorer/.cproject b/bsp/stm32/stm32f407-atk-explorer/.cproject index f162e4d0b6..a64ff851f1 100644 --- a/bsp/stm32/stm32f407-atk-explorer/.cproject +++ b/bsp/stm32/stm32f407-atk-explorer/.cproject @@ -62,22 +62,22 @@ </tool> <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1570350559" name="GNU ARM Cross C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler"> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.634882052" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/applications}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/CubeMX_Config/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/ports}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/STM32F4xx_HAL_Driver/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/drivers/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/finsh}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/libc/compilers/minilibc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/common}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/cortex-m4}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//applications}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/CubeMX_Config/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/ports}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/STM32F4xx_HAL_Driver/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/drivers/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/finsh}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/libc/compilers/minilibc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/common}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/cortex-m4}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols"> <listOptionValue builtIn="false" value="DEBUG" /> @@ -97,7 +97,7 @@ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano.923990336" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano" useByScannerDiscovery="false" value="true" valueType="boolean" /> <option defaultValue="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared.548869459" name="Shared (-shared)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared" useByScannerDiscovery="false" valueType="boolean" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile.1818777301" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/linker_scripts/link.lds}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/linker_scripts/link.lds}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs.1135656995" name="Libraries (-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs" useByScannerDiscovery="false" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths.36884122" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths" useByScannerDiscovery="false" /> diff --git a/bsp/stm32/stm32f411-st-nucleo/.cproject b/bsp/stm32/stm32f411-st-nucleo/.cproject index 61e218e54c..2078a87054 100644 --- a/bsp/stm32/stm32f411-st-nucleo/.cproject +++ b/bsp/stm32/stm32f411-st-nucleo/.cproject @@ -62,22 +62,21 @@ </tool> <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1570350559" name="GNU ARM Cross C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler"> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.634882052" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/applications}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/CubeMX_Config/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/ports}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/STM32F4xx_HAL_Driver/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/drivers/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/finsh}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/libc/compilers/minilibc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/common}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/cortex-m4}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//applications}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/CubeMX_Config/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/STM32F4xx_HAL_Driver/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/drivers/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/finsh}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/libc/compilers/minilibc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/common}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/cortex-m4}"" /> </option> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols"> <listOptionValue builtIn="false" value="DEBUG" /> @@ -97,7 +96,7 @@ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano.923990336" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano" useByScannerDiscovery="false" value="true" valueType="boolean" /> <option defaultValue="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared.548869459" name="Shared (-shared)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared" useByScannerDiscovery="false" valueType="boolean" /> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile.1818777301" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/linker_scripts/link.lds}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/linker_scripts/link.lds}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs.1135656995" name="Libraries (-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs" useByScannerDiscovery="false" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths.36884122" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths" useByScannerDiscovery="false" /> diff --git a/bsp/stm32/stm32f429-atk-apollo/.cproject b/bsp/stm32/stm32f429-atk-apollo/.cproject index f91e6f6782..4bd13e765a 100644 --- a/bsp/stm32/stm32f429-atk-apollo/.cproject +++ b/bsp/stm32/stm32f429-atk-apollo/.cproject @@ -62,22 +62,22 @@ </tool> <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1570350559" name="GNU ARM Cross C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler"> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.634882052" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/applications}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/CubeMX_Config/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/ports}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/STM32F4xx_HAL_Driver/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/drivers/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/finsh}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/libc/compilers/minilibc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/common}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/cortex-m4}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//applications}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/CubeMX_Config/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/ports}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/STM32F4xx_HAL_Driver/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/drivers/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/finsh}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/libc/compilers/minilibc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/common}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/cortex-m4}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols"> <listOptionValue builtIn="false" value="DEBUG" /> @@ -97,7 +97,7 @@ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano.923990336" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano" useByScannerDiscovery="false" value="true" valueType="boolean" /> <option defaultValue="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared.548869459" name="Shared (-shared)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared" useByScannerDiscovery="false" valueType="boolean" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile.1818777301" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/linker_scripts/link.lds}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/linker_scripts/link.lds}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs.1135656995" name="Libraries (-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs" useByScannerDiscovery="false" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths.36884122" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths" useByScannerDiscovery="false" /> diff --git a/bsp/stm32/stm32f429-fire-challenger/.cproject b/bsp/stm32/stm32f429-fire-challenger/.cproject index 0139f0c6aa..4fe60457b7 100644 --- a/bsp/stm32/stm32f429-fire-challenger/.cproject +++ b/bsp/stm32/stm32f429-fire-challenger/.cproject @@ -62,22 +62,22 @@ </tool> <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1570350559" name="GNU ARM Cross C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler"> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.634882052" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/applications}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/CubeMX_Config/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/ports}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/STM32F4xx_HAL_Driver/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/drivers/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/finsh}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/libc/compilers/minilibc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/common}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/cortex-m4}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//applications}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/CubeMX_Config/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/ports}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/CMSIS/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F4xx_HAL/STM32F4xx_HAL_Driver/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/drivers/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/finsh}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/libc/compilers/minilibc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/common}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/cortex-m4}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols"> <listOptionValue builtIn="false" value="DEBUG" /> @@ -97,7 +97,7 @@ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano.923990336" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano" useByScannerDiscovery="false" value="true" valueType="boolean" /> <option defaultValue="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared.548869459" name="Shared (-shared)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared" useByScannerDiscovery="false" valueType="boolean" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile.1818777301" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/linker_scripts/link.lds}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/linker_scripts/link.lds}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs.1135656995" name="Libraries (-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs" useByScannerDiscovery="false" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths.36884122" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths" useByScannerDiscovery="false" /> diff --git a/bsp/stm32/stm32f767-atk-apollo/.cproject b/bsp/stm32/stm32f767-atk-apollo/.cproject index ffe0b49011..d1c84d2651 100644 --- a/bsp/stm32/stm32f767-atk-apollo/.cproject +++ b/bsp/stm32/stm32f767-atk-apollo/.cproject @@ -62,22 +62,22 @@ </tool> <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1570350559" name="GNU ARM Cross C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler"> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.634882052" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/applications}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/CubeMX_Config/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/ports}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F7xx_HAL/CMSIS/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32F7xx_HAL/STM32F7xx_HAL_Driver/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/drivers/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/finsh}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/libc/compilers/minilibc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/common}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/cortex-m7}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//applications}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/CubeMX_Config/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/ports}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F7xx_HAL/CMSIS/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32F7xx_HAL/STM32F7xx_HAL_Driver/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/drivers/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/finsh}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/libc/compilers/minilibc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/common}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/cortex-m7}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols"> <listOptionValue builtIn="false" value="DEBUG" /> @@ -97,7 +97,7 @@ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano.923990336" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano" useByScannerDiscovery="false" value="true" valueType="boolean" /> <option defaultValue="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared.548869459" name="Shared (-shared)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared" useByScannerDiscovery="false" valueType="boolean" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile.1818777301" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/linker_scripts/link.lds}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/linker_scripts/link.lds}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs.1135656995" name="Libraries (-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs" useByScannerDiscovery="false" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths.36884122" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths" useByScannerDiscovery="false" /> diff --git a/bsp/stm32/stm32l475-atk-pandora/.cproject b/bsp/stm32/stm32l475-atk-pandora/.cproject index ad720c7dbe..f9f3507d68 100644 --- a/bsp/stm32/stm32l475-atk-pandora/.cproject +++ b/bsp/stm32/stm32l475-atk-pandora/.cproject @@ -50,35 +50,35 @@ <builder buildPath="${workspace_loc:/qemu-vexpress-a9}/Debug" cleanBuildTarget="clean2" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1736709688" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder" /> <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1810966071" name="GNU ARM Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler"> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1072524326" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean" /> - <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.161242639" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" useByScannerDiscovery="true" valueType="includePath"> + <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.161242639" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" useByScannerDiscovery="true" valueType="includePath"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}"" /> </option> - <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.1521934876" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" useByScannerDiscovery="true" valueType="definedSymbols" /> - <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.flags.1325367962" name="Assembler flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.flags" useByScannerDiscovery="false" valueType="stringList"> + <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.1521934876" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" useByScannerDiscovery="true" /> + <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.flags.1325367962" name="Assembler flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.flags" useByScannerDiscovery="false" valueType="stringList"> <listOptionValue builtIn="false" value="-mimplicit-it=thumb" /> </option> <inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1843333483" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input" /> </tool> <tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1570350559" name="GNU ARM Cross C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler"> - <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.634882052" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/applications}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/CubeMX_Config/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/ports}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/CMSIS/Include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Inc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/drivers/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/finsh}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/components/libc/compilers/minilibc}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/include}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/common}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/rt-thread/libcpu/arm/cortex-m4}"" /> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/}"" /> + <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.634882052" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath"> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//applications}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/CubeMX_Config/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/ports}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers/config}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/HAL_Drivers}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/CMSIS/Include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/bsp/stm32/libraries/STM32L4xx_HAL/STM32L4xx_HAL_Driver/Inc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/drivers/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/finsh}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/libc/compilers/minilibc}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/include}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/common}"" /> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/libcpu/arm/cortex-m4}"" /> </option> - <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols"> + <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols"> <listOptionValue builtIn="false" value="DEBUG" /> <listOptionValue builtIn="false" value="_REENT_SMALL" /> </option> @@ -95,8 +95,8 @@ <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.nodeflibs.2016026082" name="Do not use default libraries (-nodefaultlibs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.nodeflibs" useByScannerDiscovery="false" value="false" valueType="boolean" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano.923990336" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano" useByScannerDiscovery="false" value="true" valueType="boolean" /> <option defaultValue="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared.548869459" name="Shared (-shared)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.shared" useByScannerDiscovery="false" valueType="boolean" /> - <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile.1818777301" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/board/linker_scripts/link.lds}"" /> + <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile.1818777301" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList"> + <listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//board/linker_scripts/link.lds}"" /> </option> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs.1135656995" name="Libraries (-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.libs" useByScannerDiscovery="false" /> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths.36884122" name="Library search path (-L)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.paths" useByScannerDiscovery="false" /> diff --git a/tools/eclipse.py b/tools/eclipse.py index 840ed9f191..c7fefc0bda 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 |