Skip to content

Commit b3db2d8

Browse files
ilg-ulilg-ul
committed
[#419] - reorder search paths
1 parent 08e0674 commit b3db2d8

File tree

5 files changed

+149
-71
lines changed

5 files changed

+149
-71
lines changed

‎plugins/ilg.gnumcueclipse.debug.gdbjtag.openocd/preferences.ini

+28-17
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ xpack.names=\
2222

2323
# Platform specific defaults.
2424
search.path.windows=\
25-
${user.home}/AppData/Roaming/xPacks/openocd;\
25+
${user.home}/.local/openocd;\
26+
${user.home}/AppData/Local/openocd;\
2627
${user.home}/AppData/Roaming/openocd;\
28+
\
29+
${user.home}/AppData/Roaming/xPacks/openocd;\
2730
${user.home}/.local/xPacks/openocd;\
28-
${user.home}/.local/openocd;\
2931
C:/Program Files/xPacks/openocd;\
3032
${user.home}/AppData/Roaming/GNU MCU Eclipse/OpenOCD;\
3133
${user.home}/AppData/Local/GNU MCU Eclipse/OpenOCD;\
@@ -42,45 +44,54 @@ D:/Program Files/GNU MCU Eclipse/OpenOCD;\
4244
D:/Program Files (x86)/GNU MCU Eclipse/OpenOCD
4345

4446
search.path.linux=\
45-
${user.home}/opt/xPacks/openocd:\
46-
${user.home}/opt/xPacks/@xpack-dev-tools/openocd:\
47-
${user.home}/opt/xPacks/@gnu-mcu-eclipse/openocd:\
47+
${user.home}/.local/openocd:\
48+
\
4849
${user.home}/opt/openocd:\
50+
${user.home}/opt/xPacks/openocd:\
4951
${user.home}/.local/xPacks/openocd:\
50-
${user.home}/.local/openocd:\
51-
/opt/xPacks/openocd:\
5252
${user.home}/opt/gnu-mcu-eclipse/openocd:\
5353
${user.home}/opt/gnuarmeclipse/openocd:\
5454
${user.home}/local/gnu-mcu-eclipse/openocd:\
5555
${user.home}/.local/gnu-mcu-eclipse/openocd:\
5656
${user.home}/local/gnuarmeclipse/openocd:\
57-
/usr/local/gnu-mcu-eclipse/openocd:\
58-
/usr/local/gnuarmeclipse/openocd:\
59-
/usr/local:\
57+
\
58+
/opt/openocd:\
59+
\
60+
/opt/xPacks/openocd:\
6061
/opt/gnu-mcu-eclipse/openocd:\
6162
/opt/gnuarmeclipse/openocd:\
62-
/opt
63+
/opt:\
64+
/usr/local/gnu-mcu-eclipse/openocd:\
65+
/usr/local/gnuarmeclipse/openocd:\
66+
/usr/local
6367

6468
search.path.osx=\
69+
${user.home}/.local/openocd:\
70+
${user.home}/Library/openocd:\
71+
\
6572
${user.home}/Library/xPacks/openocd:\
6673
${user.home}/.local/xPacks/openocd:\
67-
${user.home}/.local/openocd:\
68-
/opt/xPacks/openocd:\
74+
${user.home}/opt/openocd:\
75+
${user.home}/opt/xPacks/openocd:\
6976
${user.home}/opt/gnu-mcu-eclipse/openocd:\
7077
${user.home}/opt/gnuarmeclipse/openocd:\
7178
${user.home}/local/gnu-mcu-eclipse/openocd:\
7279
${user.home}/.local/gnu-mcu-eclipse/openocd:\
7380
${user.home}/local/gnuarmeclipse/openocd:\
7481
${user.home}/Applications/GNU MCU Eclipse/OpenOCD:\
7582
${user.home}/Applications/GNU ARM Eclipse/OpenOCD:\
83+
\
84+
/opt/openocd:\
85+
\
7686
/Applications/GNU MCU Eclipse/OpenOCD:\
7787
/Applications/GNU ARM Eclipse/OpenOCD:\
78-
/usr/local/gnu-mcu-eclipse/openocd:\
79-
/usr/local/gnuarmeclipse/openocd:\
80-
/usr/local:\
88+
/opt/xPacks/openocd:\
8189
/opt/gnu-mcu-eclipse/openocd:\
8290
/opt/gnuarmeclipse/openocd:\
83-
/opt
91+
/opt:\
92+
/usr/local/gnu-mcu-eclipse/openocd:\
93+
/usr/local/gnuarmeclipse/openocd:\
94+
/usr/local
8495

8596
# -----------------------------------------------------------------------------
8697

‎plugins/ilg.gnumcueclipse.debug.gdbjtag.qemu/preferences.ini

+28-19
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ xpack.names=\
2222

2323
# Platform specific defaults.
2424
search.path.windows=\
25-
${user.home}/AppData/Roaming/xPacks/qemu-arm;\
25+
${user.home}/.local/qemu-arm;\
26+
${user.home}/AppData/Local/qemu-arm;\
2627
${user.home}/AppData/Roaming/qemu-arm;\
28+
\
29+
${user.home}/AppData/Roaming/xPacks/qemu-arm;\
2730
${user.home}/.local/xPacks/qemu-arm;\
28-
${user.home}/.local/qemu-arm;\
2931
C:/Program Files/xPacks/qemu-arm;\
3032
${user.home}/AppData/Roaming/GNU MCU Eclipse/QEMU;\
3133
${user.home}/AppData/Local/GNU MCU Eclipse/QEMU;\
@@ -43,32 +45,35 @@ D:/Program Files/GNU MCU Eclipse/QEMU;\
4345
D:/Program Files (x86)/GNU MCU Eclipse/QEMU
4446

4547
search.path.linux=\
46-
${user.home}/opt/xPacks/qemu-arm:\
47-
${user.home}/opt/xPacks/@xpack-dev-tools/qemu-arm:\
48-
${user.home}/opt/xPacks/@gnu-mcu-eclipse/qemu:\
48+
${user.home}/.local/qemu-arm:\
49+
\
4950
${user.home}/opt/qemu-arm:\
51+
${user.home}/opt/xPacks/qemu-arm:\
5052
${user.home}/.local/xPacks/qemu-arm:\
51-
${user.home}/.local/qemu-arm:\
52-
/opt/xPacks/qemu-arm:\
5353
${user.home}/opt/gnu-mcu-eclipse/qemu:\
5454
${user.home}/opt/gnuarmeclipse/qemu:\
5555
${user.home}/local/gnu-mcu-eclipse/qemu:\
5656
${user.home}/.local/gnu-mcu-eclipse/qemu:\
5757
${user.home}/local/gnuarmeclipse/qemu:\
58-
/usr/local/gnu-mcu-eclipse/qemu:\
59-
/usr/local/gnuarmeclipse/qemu:\
60-
/usr/local:\
58+
\
59+
/opt/qemu-arm:\
60+
\
61+
/opt/xPacks/qemu-arm:\
6162
/opt/gnu-mcu-eclipse/qemu:\
6263
/opt/gnuarmeclipse/qemu:\
63-
/opt
64+
/opt:\
65+
/usr/local/gnu-mcu-eclipse/qemu:\
66+
/usr/local/gnuarmeclipse/qemu:\
67+
/usr/local
6468

6569
search.path.osx=\
70+
${user.home}/.local/qemu-arm:\
71+
${user.home}/Library/qemu-arm:\
72+
\
6673
${user.home}/Library/xPacks/qemu-arm:\
67-
${user.home}/opt/xPacks/qemu-arm:\
68-
${user.home}/opt/qemu-arm:\
6974
${user.home}/.local/xPacks/qemu-arm:\
70-
${user.home}/.local/qemu-arm:\
71-
/opt/xPacks/qemu-arm:\
75+
${user.home}/opt/qemu-arm:\
76+
${user.home}/opt/xPacks/qemu-arm:\
7277
${user.home}/opt/gnu-mcu-eclipse/qemu:\
7378
${user.home}/opt/gnuarmeclipse/qemu:\
7479
${user.home}/local/gnu-mcu-eclipse/qemu:\
@@ -77,14 +82,18 @@ ${user.home}/local/gnuarmeclipse/qemu:\
7782
${user.home}/.local/qemu:\
7883
${user.home}/Applications/GNU MCU Eclipse/QEMU:\
7984
${user.home}/Applications/GNU ARM Eclipse/QEMU:\
85+
\
86+
/opt/qemu-arm:\
87+
\
8088
/Applications/GNU MCU Eclipse/QEMU:\
8189
/Applications/GNU ARM Eclipse/QEMU:\
82-
/usr/local/gnu-mcu-eclipse/qemu:\
83-
/usr/local/gnuarmeclipse/qemu:\
84-
/usr/local:\
90+
/opt/xPacks/qemu-arm:\
8591
/opt/gnu-mcu-eclipse/qemu:\
8692
/opt/gnuarmeclipse/qemu:\
87-
/opt
93+
/opt:\
94+
/usr/local/gnu-mcu-eclipse/qemu:\
95+
/usr/local/gnuarmeclipse/qemu:\
96+
/usr/local
8897

8998
# -----------------------------------------------------------------------------
9099

‎plugins/ilg.gnumcueclipse.managedbuild.cross.arm/preferences.ini

+49-20
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,54 @@ toolchain.xpack.names.435435382=\
1111
@gnu-mcu-eclipse/arm-none-eabi-gcc
1212

1313
toolchain.search.path.windows.435435382=\
14-
${user.home}/AppData/Roaming/xPacks/arm-none-eabi-gcc;\
14+
${user.home}/.local/arm-none-eabi-gcc;\
15+
${user.home}/AppData/Local/arm-none-eabi-gcc;\
1516
${user.home}/AppData/Roaming/arm-none-eabi-gcc;\
17+
\
18+
${user.home}/AppData/Roaming/xPacks/arm-none-eabi-gcc;\
1619
${user.home}/.local/xPacks/arm-none-eabi-gcc;\
17-
${user.home}/.local/arm-none-eabi-gcc;\
1820
C:/Program Files/xPacks/arm-none-eabi-gcc
1921

2022
toolchain.search.path.linux.435435382=\
23+
${user.home}/.local/arm-none-eabi-gcc:\
24+
\
2125
${user.home}/opt/xPacks/arm-none-eabi-gcc:\
2226
${user.home}/opt/xPacks/@xpack-dev-tools/arm-none-eabi-gcc:\
2327
${user.home}/opt/xPacks/@gnu-mcu-eclipse/arm-none-eabi-gcc:\
2428
${user.home}/opt/arm-none-eabi-gcc:\
2529
${user.home}/.local/xPacks/arm-none-eabi-gcc:\
26-
${user.home}/.local/arm-none-eabi-gcc:\
27-
/opt/xPacks/arm-none-eabi-gcc
30+
\
31+
/opt/arm-none-eabi-gcc:\
32+
\
33+
/opt/xPacks/arm-none-eabi-gcc:\
34+
/opt
2835

2936
toolchain.search.path.osx.435435382=\
30-
${user.home}/Library/xPacks/arm-none-eabi-gcc:\
31-
${user.home}/.local/xPacks/arm-none-eabi-gcc:\
3237
${user.home}/.local/arm-none-eabi-gcc:\
38+
${user.home}/Library/arm-none-eabi-gcc:\
39+
\
40+
${user.home}/.local/xPacks/arm-none-eabi-gcc:\
41+
${user.home}/Library/xPacks/arm-none-eabi-gcc:\
3342
${user.home}/opt/xPacks/arm-none-eabi-gcc:\
3443
${user.home}/opt/arm-none-eabi-gcc:\
35-
/opt/xPacks/arm-none-eabi-gcc
44+
\
45+
/opt/arm-none-eabi-gcc:\
46+
\
47+
/opt/xPacks/arm-none-eabi-gcc:\
48+
/opt
3649

3750
# GNU MCU Eclipse ARM Embedded GCC
3851
toolchain.xpack.names.962691777=\
3952
@xpack-dev-tools/arm-none-eabi-gcc;\
4053
@gnu-mcu-eclipse/arm-none-eabi-gcc
4154

4255
toolchain.search.path.windows.962691777=\
43-
${user.home}/AppData/Roaming/xPacks/arm-none-eabi-gcc;\
56+
${user.home}/.local/arm-none-eabi-gcc;\
57+
${user.home}/AppData/Local/arm-none-eabi-gcc;\
4458
${user.home}/AppData/Roaming/arm-none-eabi-gcc;\
59+
\
60+
${user.home}/AppData/Roaming/xPacks/arm-none-eabi-gcc;\
4561
${user.home}/.local/xPacks/arm-none-eabi-gcc;\
46-
${user.home}/.local/arm-none-eabi-gcc;\
4762
C:/Program Files/xPacks/arm-none-eabi-gcc;\
4863
${user.home}/AppData/Roaming/GNU MCU Eclipse/ARM Embedded GCC;\
4964
${user.home}/AppData/Local/GNU MCU Eclipse/ARM Embedded GCC;\
@@ -60,33 +75,45 @@ D:/Program Files/GNU MCU Eclipse/ARM Embedded GCC;\
6075
D:/Program Files (x86)/GNU MCU Eclipse/ARM Embedded GCC
6176

6277
toolchain.search.path.linux.962691777=\
78+
${user.home}/.local/arm-none-eabi-gcc:\
79+
\
6380
${user.home}/opt/xPacks/arm-none-eabi-gcc:\
6481
${user.home}/opt/xPacks/@xpack-dev-tools/arm-none-eabi-gcc:\
6582
${user.home}/opt/xPacks/@gnu-mcu-eclipse/arm-none-eabi-gcc:\
6683
${user.home}/opt/arm-none-eabi-gcc:\
6784
${user.home}/.local/xPacks/arm-none-eabi-gcc:\
68-
${user.home}/.local/arm-none-eabi-gcc:\
69-
/opt/xPacks/arm-none-eabi-gcc:\
7085
${user.home}/opt/gnu-mcu-eclipse/arm-none-eabi-gcc:\
7186
${user.home}/local/gnu-mcu-eclipse/arm-none-eabi-gcc:\
7287
${user.home}/.local/gnu-mcu-eclipse/arm-none-eabi-gcc:\
73-
/usr/opt/gnu-mcu-eclipse/arm-none-eabi-gcc:\
88+
\
89+
/opt/arm-none-eabi-gcc:\
90+
\
91+
/opt/xPacks/arm-none-eabi-gcc:\
92+
/opt/gnu-mcu-eclipse/arm-none-eabi-gcc:\
93+
/opt:\
7494
/usr/local/gnu-mcu-eclipse/arm-none-eabi-gcc:\
75-
/opt/gnu-mcu-eclipse/arm-none-eabi-gcc
95+
/usr/local
7696

7797
toolchain.search.path.osx.962691777=\
98+
${user.home}/.local/arm-none-eabi-gcc:\
99+
${user.home}/Library/arm-none-eabi-gcc:\
100+
\
78101
${user.home}/Library/xPacks/arm-none-eabi-gcc:\
102+
${user.home}/.local/xPacks/arm-none-eabi-gcc:\
79103
${user.home}/opt/xPacks/arm-none-eabi-gcc:\
80104
${user.home}/opt/arm-none-eabi-gcc:\
81-
${user.home}/.local/xPacks/arm-none-eabi-gcc:\
82-
${user.home}/.local/arm-none-eabi-gcc:\
83-
/opt/xPacks/arm-none-eabi-gcc:\
84105
${user.home}/opt/gnu-mcu-eclipse/arm-none-eabi-gcc:\
85106
${user.home}/local/gnu-mcu-eclipse/arm-none-eabi-gcc:\
86107
${user.home}/.local/gnu-mcu-eclipse/arm-none-eabi-gcc:\
87-
/usr/opt/gnu-mcu-eclipse/arm-none-eabi-gcc:\
108+
\
109+
/opt/arm-none-eabi-gcc:\
110+
\
111+
/opt/xPacks/arm-none-eabi-gcc:\
112+
/opt/gnu-mcu-eclipse/arm-none-eabi-gcc:\
113+
/opt:\
114+
/usr/gnu-mcu-eclipse/arm-none-eabi-gcc:\
88115
/usr/local/gnu-mcu-eclipse/arm-none-eabi-gcc:\
89-
/opt/gnu-mcu-eclipse/arm-none-eabi-gcc:
116+
/usr/local
90117

91118
# GNU Tools for ARM Embedded Processors (ARM toolchain)
92119

@@ -113,16 +140,18 @@ D:/Program Files/GNU Tools ARM Embedded;\
113140
D:/Program Files (x86)/GNU Tools ARM Embedded
114141

115142
toolchain.search.path.linux.1287942917=\
143+
${user.home}/.local:\
144+
\
116145
${user.home}/opt:\
117146
${user.home}/local:\
118-
${user.home}/.local:\
119147
/usr/local:\
120148
/opt
121149

122150
toolchain.search.path.osx.1287942917=\
151+
${user.home}/.local:\
152+
\
123153
${user.home}/opt:\
124154
${user.home}/local:\
125-
${user.home}/.local:\
126155
/usr/local:\
127156
/opt
128157

0 commit comments

Comments
 (0)