Skip to content

Commit 17ddf88

Browse files
wimjongmanwimjongman
committed
#1027 Update site and product build maintenance
1 parent 3cf0f08 commit 17ddf88

File tree

3 files changed

+30
-96
lines changed

3 files changed

+30
-96
lines changed

‎io.sloeber.parent/pom.xml‎

Lines changed: 12 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,12 @@
104104
<modules>
105105
<module>../io.sloeber.feature</module>
106106
<module>../io.sloeber.core</module>
107+
<module>../io.sloeber.core.nl1</module>
107108
<module>../io.sloeber.product.sdk</module>
108109
<module>../io.sloeber.updatesite</module>
109-
<module>../io.sloeber.application</module>
110110
<module>../io.sloeber.ui.nl1</module>
111111
<module>../io.sloeber.ui</module>
112+
<module>../io.sloeber.tests</module>
112113
</modules>
113114
</profile>
114115

@@ -255,32 +256,6 @@
255256
</build>
256257
</profile>
257258

258-
259-
<profile>
260-
<id>linux32</id>
261-
<build>
262-
<plugins>
263-
<plugin>
264-
<groupId>org.eclipse.tycho</groupId>
265-
<artifactId>target-platform-configuration</artifactId>
266-
<version>${tycho.version}</version>
267-
<configuration>
268-
<!-- configure the p2 target environments for multi-platform build -->
269-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
270-
spec -->
271-
<environments>
272-
<environment>
273-
<os>linux</os>
274-
<ws>gtk</ws>
275-
<arch>x86</arch>
276-
</environment>
277-
</environments>
278-
</configuration>
279-
</plugin>
280-
</plugins>
281-
</build>
282-
</profile>
283-
284259
<profile>
285260
<id>linux64</id>
286261
<build>
@@ -306,32 +281,6 @@
306281
</build>
307282
</profile>
308283

309-
<profile>
310-
<id>mac32</id>
311-
<build>
312-
<plugins>
313-
<plugin>
314-
<groupId>org.eclipse.tycho</groupId>
315-
<artifactId>target-platform-configuration</artifactId>
316-
<version>${tycho.version}</version>
317-
<configuration>
318-
<!-- configure the p2 target environments for multi-platform build -->
319-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
320-
spec -->
321-
<environments>
322-
<!-- Mac -->
323-
<environment>
324-
<os>macosx</os>
325-
<ws>cocoa</ws>
326-
<arch>x86</arch>
327-
</environment>
328-
</environments>
329-
</configuration>
330-
</plugin>
331-
</plugins>
332-
</build>
333-
</profile>
334-
335284
<profile>
336285
<id>mac64</id>
337286
<build>
@@ -358,31 +307,6 @@
358307
</build>
359308
</profile>
360309

361-
<profile>
362-
<id>neon</id>
363-
<properties>
364-
<platform-version-name>neon</platform-version-name>
365-
</properties>
366-
<activation>
367-
<activeByDefault>false</activeByDefault>
368-
</activation>
369-
370-
<repositories>
371-
<repository>
372-
<id>platform_neon</id>
373-
<layout>p2</layout>
374-
<url> http://download.eclipse.org/eclipse/updates/4.6</url>
375-
</repository>
376-
377-
<repository>
378-
<id>release-train_neon</id>
379-
<layout>p2</layout>
380-
<url> http://download.eclipse.org/releases/neon</url>
381-
</repository>
382-
383-
</repositories>
384-
</profile>
385-
386310
<profile>
387311
<id>oxygen</id>
388312
<properties>
@@ -433,6 +357,16 @@
433357
</repositories>
434358
</profile>
435359

360+
361+
<profile>
362+
<id>2018-09</id>
363+
<properties>
364+
<platform-version-name>2018-09</platform-version-name>
365+
</properties>
366+
<activation>
367+
<activeByDefault>false</activeByDefault>
368+
</activation>
369+
436370
<repositories>
437371
<repository>
438372
<id>2018-09</id>

‎io.sloeber.product.sdk/arduino.product‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<product name="Sloeber, the Eclipse Arduino IDE" uid="io.sloeber.product" id="io.sloeber.application.product" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
4+
<product name="Sloeber, the Eclipse Arduino IDE" uid="io.sloeber.product" id="io.sloeber.application.product" application="org.eclipse.ui.ide.workbench" version="4.3.1.qualifier" useFeatures="true" includeLaunchers="true">
55

66
<aboutInfo>
77
<image path="/io.sloeber.application/icons/eclipse_lg.png"/>
88
<text>
99
Sloeber, the Eclipse IDE for Arduino Developers
1010

11-
Info: http://sloeber.io/
11+
Info: https://sloeber.io/
1212
Source: https://github.com/sloeber/arduino-eclipse-plugin
1313

1414

1515
Contributors (github users): jantje, wimjongman, rlogiacco, MarceloLimori, brodykenrick, neuweiler, darcade, amorellgarcia
1616

17-
https://github.com/jantje/arduino-eclipse-plugin/graphs/contributors
17+
https://github.com/sloeber/arduino-eclipse-plugin/graphs/contributors
1818
</text>
1919
</aboutInfo>
2020

@@ -346,8 +346,9 @@ rights to a jury trial in any resulting litigation.&lt;/p&gt;
346346
<feature id="org.eclipse.rse.ssh" installMode="root"/>
347347
<feature id="org.eclipse.rse.core" installMode="root"/>
348348
<feature id="org.eclipse.cdt.native" installMode="root"/>
349-
<feature id="ilg.gnuarmeclipse.debug.gdbjtag.openocd" installMode="root"/>
350-
<feature id="ilg.gnuarmeclipse.managedbuild.cross" installMode="root"/>
349+
<feature id="ilg.gnumcueclipse.debug.gdbjtag.openocd.feature"/>
350+
351+
<!-- SDK Features are below -->
351352
<feature id="org.eclipse.jdt" installMode="root"/>
352353
<feature id="org.eclipse.jdt.source" installMode="root"/>
353354
<feature id="org.eclipse.platform.source" installMode="root"/>
@@ -358,16 +359,16 @@ rights to a jury trial in any resulting litigation.&lt;/p&gt;
358359
</features>
359360

360361
<configurations>
361-
<plugin id="io.sloeber.application" autoStart="true" startLevel="4" />
362362
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
363363
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
364364
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
365365
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
366366
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
367367
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
368+
<property name="org.eclipse.oomph.setup.ui/enable.preference.recorder" value="false" />
368369
<property name="osgi.instance.area.default" value="@user.home/Documents/sloeber-workspace" os="win32" />
369370
</configurations>
370-
371+
371372
<repositories>
372373
<repository location="http://download.eclipse.org/technology/babel/update-site/R0.16.0/photon/" enabled="true" />
373374
<repository location="http://eclipse.baeyens.it/update/V4/nightly/" enabled="false" />

‎io.sloeber.product/arduino.product‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -337,21 +337,20 @@ rights to a jury trial in any resulting litigation.&lt;/p&gt;
337337
<feature id="org.eclipse.platform" installMode="root"/>
338338
<feature id="org.eclipse.rcp" installMode="root"/>
339339
<feature id="org.eclipse.rse" installMode="root"/>
340-
<feature id="org.eclipse.cdt.testsrunner.feature"/>
341-
<feature id="org.eclipse.equinox.core.sdk"/>
342-
<feature id="org.eclipse.rse.local"/>
343-
<feature id="org.eclipse.mylyn.tasks.ide"/>
344-
<feature id="org.eclipse.rse.dstore"/>
345-
<feature id="org.eclipse.rse.ftp"/>
346-
<feature id="org.eclipse.rse.telnet"/>
347-
<feature id="org.eclipse.rse.ssh"/>
348-
<feature id="org.eclipse.rse.core"/>
349-
<feature id="org.eclipse.cdt.native"/>
340+
<feature id="org.eclipse.cdt.testsrunner.feature" installMode="root"/>
341+
<feature id="org.eclipse.equinox.core.sdk" installMode="root"/>
342+
<feature id="org.eclipse.rse.local" installMode="root"/>
343+
<feature id="org.eclipse.mylyn.tasks.ide" installMode="root"/>
344+
<feature id="org.eclipse.rse.dstore" installMode="root"/>
345+
<feature id="org.eclipse.rse.ftp" installMode="root"/>
346+
<feature id="org.eclipse.rse.telnet" installMode="root"/>
347+
<feature id="org.eclipse.rse.ssh" installMode="root"/>
348+
<feature id="org.eclipse.rse.core" installMode="root"/>
349+
<feature id="org.eclipse.cdt.native" installMode="root"/>
350350
<feature id="ilg.gnumcueclipse.debug.gdbjtag.openocd.feature"/>
351351
</features>
352352

353353
<configurations>
354-
<plugin id="io.sloeber.application" autoStart="true" startLevel="4" />
355354
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
356355
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
357356
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />

0 commit comments

Comments
 (0)