Skip to content

Commit 13cfd56

Browse files
author
jantje
committed
Sloeber#898 move from gnuarm to gnumcu
1 parent 4c7033b commit 13cfd56

File tree

4 files changed

+36
-70
lines changed

4 files changed

+36
-70
lines changed

io.sloeber.feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ If you do not agree with this policy, please do not install this software.
3838

3939
<requires>
4040
<import feature="org.eclipse.cdt" version="8.0.0" match="greaterOrEqual"/>
41-
<import feature="ilg.gnuarmeclipse.debug.gdbjtag.openocd" version="4.1.4.201704251808"/>
41+
<import plugin="ilg.gnumcueclipse.debug.gdbjtag.openocd"/>
4242
</requires>
4343

4444
<plugin

io.sloeber.parent/pom.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<version>${tycho.version}</version>
181181
<configuration>
182182
<!-- configure the p2 target environments for multi-platform build -->
183-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
183+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
184184
spec -->
185185
<environments>
186186
<environment>
@@ -225,7 +225,7 @@
225225
<version>${tycho.version}</version>
226226
<configuration>
227227
<!-- configure the p2 target environments for multi-platform build -->
228-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
228+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
229229
spec -->
230230
<environments>
231231
<environment>
@@ -249,7 +249,7 @@
249249
<version>${tycho.version}</version>
250250
<configuration>
251251
<!-- configure the p2 target environments for multi-platform build -->
252-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
252+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
253253
spec -->
254254
<environments>
255255
<environment>
@@ -275,7 +275,7 @@
275275
<version>${tycho.version}</version>
276276
<configuration>
277277
<!-- configure the p2 target environments for multi-platform build -->
278-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
278+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
279279
spec -->
280280
<environments>
281281
<environment>
@@ -300,7 +300,7 @@
300300
<version>${tycho.version}</version>
301301
<configuration>
302302
<!-- configure the p2 target environments for multi-platform build -->
303-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
303+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
304304
spec -->
305305
<environments>
306306
<environment>
@@ -325,7 +325,7 @@
325325
<version>${tycho.version}</version>
326326
<configuration>
327327
<!-- configure the p2 target environments for multi-platform build -->
328-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
328+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
329329
spec -->
330330
<environments>
331331
<!-- Mac -->
@@ -350,7 +350,7 @@
350350
<version>${tycho.version}</version>
351351
<configuration>
352352
<!-- configure the p2 target environments for multi-platform build -->
353-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
353+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
354354
spec -->
355355
<environments>
356356
<!-- Mac -->
@@ -506,9 +506,9 @@
506506

507507

508508
<repository>
509-
<id>gnuarm</id>
509+
<id>gnumcu</id>
510510
<layout>p2</layout>
511-
<url>http://gnuarmeclipse.sourceforge.net/updates</url>
511+
<url>http://gnu-mcu-eclipse.netlify.com/v4-neon-updates/</url>
512512
</repository>
513513
</repositories>
514514

io.sloeber.product/arduino.product

+1-2
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,7 @@ rights to a jury trial in any resulting litigation.&lt;/p&gt;
348348
<feature id="org.eclipse.rse.ssh"/>
349349
<feature id="org.eclipse.rse.core"/>
350350
<feature id="org.eclipse.cdt.native"/>
351-
<feature id="ilg.gnuarmeclipse.debug.gdbjtag.openocd"/>
352-
<feature id="ilg.gnuarmeclipse.managedbuild.cross"/>
351+
<feature id="ilg.gnumcueclipse.debug.gdbjtag.openocd.feature" version="4.3.1.201801092051"/>
353352
</features>
354353

355354
<configurations>

io.sloeber.updatesite/category.xml

+25-58
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,25 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<site>
3-
<feature url="features/org.eclipse.nebula.widgets.oscilloscope.feature_0.0.0.qualifier.jar" id="org.eclipse.nebula.widgets.oscilloscope.feature" version="0.0.0">
4-
<category name="Dependencies"/>
5-
</feature>
6-
<feature url="features/org.eclipse.cdt_0.0.0.qualifier.jar" id="org.eclipse.cdt" version="0.0.0">
7-
<category name="Dependencies"/>
8-
</feature>
9-
<feature url="features/ilg.gnuarmeclipse.managedbuild.cross_0.0.0.qualifier.jar" id="ilg.gnuarmeclipse.managedbuild.cross" version="0.0.0">
10-
<category name="Dependencies"/>
11-
</feature>
12-
<feature url="features/ilg.gnuarmeclipse.debug.gdbjtag.openocd_0.0.0.qualifier.jar" id="ilg.gnuarmeclipse.debug.gdbjtag.openocd" version="0.0.0">
13-
<category name="Dependencies"/>
14-
</feature>
15-
<feature url="features/ilg.gnuarmeclipse.debug.gdbjtag.jlink_0.0.0.qualifier.jar" id="ilg.gnuarmeclipse.debug.gdbjtag.jlink" version="0.0.0">
16-
<category name="Dependencies"/>
17-
</feature>
18-
<feature url="features/ilg.gnuarmeclipse.debug.gdbjtag.pyocd_0.0.0.qualifier.jar" id="ilg.gnuarmeclipse.debug.gdbjtag.pyocd" version="0.0.0">
19-
<category name="Dependencies"/>
20-
</feature>
21-
<feature url="features/ilg.gnuarmeclipse.debug.gdbjtag.qemu_0.0.0.qualifier.jar" id="ilg.gnuarmeclipse.debug.gdbjtag.qemu" version="0.0.0">
22-
<category name="Dependencies"/>
23-
</feature>
24-
<feature url="features/ilg.gnuarmeclipse.codered_0.0.0.qualifier.jar" id="ilg.gnuarmeclipse.codered" version="0.0.0">
25-
<category name="Dependencies"/>
26-
</feature>
27-
<feature url="features/ilg.gnuarmeclipse.doc.user_0.0.0.qualifier.jar" id="ilg.gnuarmeclipse.doc.user" version="0.0.0">
28-
<category name="Dependencies"/>
29-
</feature>
30-
<feature url="features/ilg.gnuarmeclipse.packs_0.0.0.qualifier.jar" id="ilg.gnuarmeclipse.packs" version="0.0.0">
31-
<category name="Dependencies"/>
32-
</feature>
33-
<feature url="features/ilg.gnuarmeclipse.templates.ad_0.0.0.qualifier.jar" id="ilg.gnuarmeclipse.templates.ad" version="0.0.0">
34-
<category name="Dependencies"/>
35-
</feature>
36-
<feature url="features/ilg.gnuarmeclipse.templates.cortexm_0.0.0.qualifier.jar" id="ilg.gnuarmeclipse.templates.cortexm" version="0.0.0">
37-
<category name="Dependencies"/>
38-
</feature>
39-
<feature url="features/ilg.gnuarmeclipse.templates.freescale_0.0.0.qualifier.jar" id="ilg.gnuarmeclipse.templates.freescale" version="0.0.0">
40-
<category name="Dependencies"/>
41-
</feature>
42-
<feature url="features/ilg.gnuarmeclipse.templates.stm_0.0.0.qualifier.jar" id="ilg.gnuarmeclipse.templates.stm" version="0.0.0">
43-
<category name="Dependencies"/>
44-
</feature>
45-
<feature url="features/io.sloeber.feature_4.2.0.qualifier.jar" id="io.sloeber.feature" version="4.2.0.qualifier">
46-
<category name="Sloeber"/>
47-
</feature>
48-
<category-def name="Sloeber" label="Sloeber Arduino IDE">
49-
<description>
50-
Sloeber, Arduino development in the Eclipse IDE.
51-
</description>
52-
</category-def>
53-
<category-def name="Dependencies" label="Dependencies (will be automatically installed when needed)"/>
54-
<repository-reference location="http://download.eclipse.org/nebula/snapshot" enabled="true" />
55-
<repository-reference location="http://download.eclipse.org/tools/cdt/releases/9.2" enabled="true" />
56-
<repository-reference location="http://download.eclipse.org/tools/cdt/releases/8.8.1" enabled="true" />
57-
<repository-reference location="http://gnuarmeclipse.sourceforge.net/updates" enabled="true" />
58-
</site>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<site>
3+
<feature url="features/org.eclipse.nebula.widgets.oscilloscope.feature_0.0.0.qualifier.jar" id="org.eclipse.nebula.widgets.oscilloscope.feature" version="0.0.0">
4+
<category name="Dependencies"/>
5+
</feature>
6+
<feature url="features/org.eclipse.cdt_0.0.0.qualifier.jar" id="org.eclipse.cdt" version="0.0.0">
7+
<category name="Dependencies"/>
8+
</feature>
9+
<feature url="features/io.sloeber.feature_4.2.0.qualifier.jar" id="io.sloeber.feature" version="4.2.0.qualifier">
10+
<category name="Sloeber"/>
11+
</feature>
12+
<feature url="features/ilg.gnumcueclipse.debug.gdbjtag.openocd.feature_4.3.1.201801092051.jar" id="ilg.gnumcueclipse.debug.gdbjtag.openocd.feature" version="4.3.1.201801092051">
13+
<category name="Dependencies"/>
14+
</feature>
15+
<category-def name="Sloeber" label="Sloeber Arduino IDE">
16+
<description>
17+
Sloeber, Arduino development in the Eclipse IDE.
18+
</description>
19+
</category-def>
20+
<category-def name="Dependencies" label="Dependencies (will be automatically installed when needed)"/>
21+
<repository-reference location="http://download.eclipse.org/nebula/snapshot" enabled="true" />
22+
<repository-reference location="http://download.eclipse.org/tools/cdt/releases/9.2" enabled="true" />
23+
<repository-reference location="http://download.eclipse.org/tools/cdt/releases/8.8.1" enabled="true" />
24+
<repository-reference location="http://gnuarmeclipse.sourceforge.net/updates" enabled="true" />
25+
</site>

0 commit comments

Comments
 (0)