Skip to content

Commit 19204ff

Browse files
committed
together with org.eclipse.update.reconcile=false this seems to fix #321
Installation of the plugin in java ide is now possible Upgrade from 2.4 works Product works
1 parent 4b9c34d commit 19204ff

File tree

4 files changed

+147
-54
lines changed

4 files changed

+147
-54
lines changed

it.baeyens.arduino.core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,14 @@ Bundle-ClassPath: .,
2828
lib/jsch-0.1.50.jar,
2929
lib/jmdns-3.4.1.jar
3030
Require-Bundle: org.eclipse.core.resources,
31-
org.eclipse.equinox.registry,
3231
org.eclipse.jface,
3332
org.eclipse.ui.ide,
34-
org.eclipse.core.jobs,
35-
org.eclipse.equinox.preferences,
36-
org.eclipse.core.contenttype,
37-
org.eclipse.osgi,
3833
org.eclipse.cdt.managedbuilder.core,
3934
org.eclipse.core.filesystem,
40-
org.eclipse.swt,
4135
org.eclipse.cdt.core,
4236
org.apache.commons.compress,
4337
com.google.gson,
4438
org.eclipse.equinox.security,
4539
org.eclipse.ui.forms,
4640
org.eclipse.ui.workbench,
47-
org.eclipse.core.runtime,
48-
org.eclipse.core.commands
41+
org.eclipse.core.runtime

it.baeyens.arduino.feature/feature.xml

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,73 @@ If you do not agree with this policy, then please do not install this software.
133133
<discovery label="jan&apos;s site with plenty of documentation" url="http://eclipse.baeyens.it/"/>
134134
</url>
135135

136+
<includes
137+
id="org.eclipse.cdt.sdk"
138+
version="0.0.0"/>
139+
140+
<includes
141+
id="org.eclipse.linuxtools.cdt.libhover.feature"
142+
version="0.0.0"/>
143+
144+
<includes
145+
id="org.eclipse.sdk"
146+
version="0.0.0"/>
147+
148+
<includes
149+
id="org.eclipse.platform"
150+
version="0.0.0"/>
151+
152+
<includes
153+
id="org.eclipse.e4.rcp"
154+
version="0.0.0"/>
155+
156+
<includes
157+
id="org.eclipse.cdt.gnu.build"
158+
version="0.0.0"/>
159+
160+
<includes
161+
id="org.eclipse.cdt.gnu.debug"
162+
version="0.0.0"/>
163+
164+
<includes
165+
id="org.eclipse.cdt.gdb"
166+
version="0.0.0"/>
167+
168+
<includes
169+
id="org.eclipse.cdt.testsrunner.feature"
170+
version="0.0.0"/>
171+
172+
<includes
173+
id="org.eclipse.cdt.autotools"
174+
version="0.0.0"/>
175+
136176
<requires>
177+
<import plugin="org.eclipse.ui"/>
178+
<import plugin="org.eclipse.core.runtime"/>
179+
<import plugin="org.junit"/>
180+
<import plugin="org.eclipse.cdt.core"/>
181+
<import plugin="org.eclipse.core.resources"/>
182+
<import plugin="org.eclipse.equinox.registry"/>
183+
<import plugin="org.eclipse.jface"/>
184+
<import plugin="org.eclipse.ui.ide"/>
185+
<import plugin="org.eclipse.core.jobs"/>
186+
<import plugin="org.eclipse.equinox.preferences"/>
187+
<import plugin="org.eclipse.core.contenttype"/>
188+
<import plugin="org.eclipse.osgi"/>
189+
<import plugin="org.eclipse.cdt.managedbuilder.core"/>
190+
<import plugin="org.eclipse.core.filesystem"/>
191+
<import plugin="org.eclipse.swt"/>
192+
<import plugin="org.eclipse.equinox.security"/>
193+
<import plugin="org.eclipse.ui.forms"/>
194+
<import plugin="org.eclipse.ui.workbench"/>
195+
<import plugin="org.eclipse.core.commands"/>
196+
<import plugin="it.baeyens.arduino.common"/>
197+
<import plugin="it.baeyens.arduino.monitor"/>
198+
<import plugin="org.eclipse.cdt.ui"/>
199+
<import plugin="org.eclipse.ui.console"/>
200+
<import plugin="org.eclipse.ui.intro"/>
201+
<import plugin="it.baeyens.cdt.refactor"/>
202+
<import plugin="org.eclipse.ltk.core.refactoring"/>
137203
<import feature="org.eclipse.cdt" version="8.0.0" match="greaterOrEqual"/>
138204
</requires>
139205

@@ -179,4 +245,25 @@ If you do not agree with this policy, then please do not install this software.
179245
version="3.0.0.qualifier"
180246
unpack="false"/>
181247

248+
<plugin
249+
id="com.google.gson"
250+
download-size="0"
251+
install-size="0"
252+
version="0.0.0"
253+
unpack="false"/>
254+
255+
<plugin
256+
id="org.apache.commons.io"
257+
download-size="0"
258+
install-size="0"
259+
version="0.0.0"
260+
unpack="false"/>
261+
262+
<plugin
263+
id="org.apache.commons.compress"
264+
download-size="0"
265+
install-size="0"
266+
version="0.0.0"
267+
unpack="false"/>
268+
182269
</feature>

it.baeyens.arduino.product/arduino.product

Lines changed: 58 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -293,70 +293,86 @@ rights to a jury trial in any resulting litigation.&lt;/p&gt;
293293

294294
<features>
295295
<feature id="it.baeyens.arduino.feature" installMode="root"/>
296-
<feature id="org.eclipse.cdt" installMode="root"/>
297-
<feature id="org.eclipse.cdt.autotools" installMode="root"/>
298-
<feature id="org.eclipse.cdt.build.crossgcc" installMode="root"/>
299-
<feature id="org.eclipse.cdt.debug.ui.memory" installMode="root"/>
300-
<feature id="org.eclipse.cdt.gdb" installMode="root"/>
301-
<feature id="org.eclipse.cdt.gnu.build" installMode="root"/>
302-
<feature id="org.eclipse.cdt.gnu.debug" installMode="root"/>
303-
<feature id="org.eclipse.cdt.gnu.dsf" installMode="root"/>
304-
<feature id="org.eclipse.cdt.platform" installMode="root"/>
305-
<feature id="org.eclipse.e4.rcp" installMode="root"/>
306-
<feature id="org.eclipse.ecf.core.feature" installMode="root"/>
307-
<feature id="org.eclipse.ecf.core.ssl.feature" installMode="root"/>
308-
<feature id="org.eclipse.ecf.filetransfer.feature" installMode="root"/>
309-
<feature id="org.eclipse.ecf.filetransfer.httpclient4.feature" installMode="root"/>
310-
<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" installMode="root"/>
311-
<feature id="org.eclipse.ecf.filetransfer.ssl.feature" installMode="root"/>
312296
<feature id="org.eclipse.egit" installMode="root"/>
313-
<feature id="org.eclipse.emf.common" installMode="root"/>
314-
<feature id="org.eclipse.emf.ecore" installMode="root"/>
315-
<feature id="org.eclipse.epp.mpc" installMode="root"/>
316-
<feature id="org.eclipse.equinox.core.feature" installMode="root"/>
317-
<feature id="org.eclipse.equinox.executable" installMode="root"/>
318-
<feature id="org.eclipse.equinox.p2.core.feature" installMode="root"/>
319-
<feature id="org.eclipse.equinox.p2.discovery.feature" installMode="root"/>
320-
<feature id="org.eclipse.equinox.p2.extras.feature" installMode="root"/>
321-
<feature id="org.eclipse.equinox.p2.rcp.feature" installMode="root"/>
322-
<feature id="org.eclipse.equinox.p2.user.ui" installMode="root"/>
323-
<feature id="org.eclipse.help" installMode="root"/>
324-
<feature id="org.eclipse.jdt" installMode="root"/>
325-
<feature id="org.eclipse.jgit" installMode="root"/>
326-
<feature id="org.eclipse.mylyn.bugzilla_feature" installMode="root"/>
327-
<feature id="org.eclipse.mylyn.commons" installMode="root"/>
328-
<feature id="org.eclipse.mylyn.commons.identity" installMode="root"/>
329-
<feature id="org.eclipse.mylyn.commons.notifications" installMode="root"/>
330-
<feature id="org.eclipse.mylyn.commons.repositories" installMode="root"/>
331-
<feature id="org.eclipse.mylyn.context_feature" installMode="root"/>
332-
<feature id="org.eclipse.mylyn.discovery" installMode="root"/>
333-
<feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
334-
<feature id="org.eclipse.mylyn.monitor" installMode="root"/>
335-
<feature id="org.eclipse.mylyn.team_feature" installMode="root"/>
336-
<feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
337-
<feature id="org.eclipse.mylyn_feature" installMode="root"/>
338297
<feature id="org.eclipse.nebula.widgets.oscilloscope.feature" installMode="root"/>
339298
<feature id="org.eclipse.platform" installMode="root"/>
340299
<feature id="org.eclipse.rcp" installMode="root"/>
341300
<feature id="org.eclipse.rse" installMode="root"/>
301+
<feature id="org.eclipse.emf.common"/>
302+
<feature id="org.eclipse.cdt"/>
303+
<feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
304+
<feature id="org.eclipse.help"/>
305+
<feature id="org.eclipse.help.source"/>
306+
<feature id="org.eclipse.cdt.gnu.build"/>
307+
<feature id="org.eclipse.sdk"/>
308+
<feature id="org.eclipse.equinox.p2.core.feature"/>
309+
<feature id="org.eclipse.cvs.source"/>
310+
<feature id="org.eclipse.rcp.source"/>
311+
<feature id="org.eclipse.ecf.core.ssl.feature"/>
312+
<feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
313+
<feature id="org.eclipse.cdt.platform"/>
314+
<feature id="org.eclipse.cdt.gdb.source"/>
315+
<feature id="org.eclipse.cdt.gnu.debug.source"/>
316+
<feature id="org.eclipse.ecf.core.ssl.source.feature"/>
317+
<feature id="org.eclipse.equinox.p2.user.ui.source"/>
318+
<feature id="org.eclipse.ecf.core.source.feature"/>
319+
<feature id="org.eclipse.linuxtools.cdt.libhover.feature"/>
320+
<feature id="org.eclipse.emf.common.source"/>
321+
<feature id="org.eclipse.jdt.source"/>
322+
<feature id="org.eclipse.cvs"/>
323+
<feature id="org.eclipse.equinox.p2.rcp.feature"/>
324+
<feature id="org.eclipse.ecf.filetransfer.feature"/>
325+
<feature id="org.eclipse.cdt.autotools"/>
326+
<feature id="org.eclipse.equinox.p2.rcp.feature.source"/>
327+
<feature id="org.eclipse.cdt.gdb"/>
328+
<feature id="org.eclipse.emf.ecore.source"/>
329+
<feature id="org.eclipse.ecf.filetransfer.source.feature"/>
330+
<feature id="org.eclipse.cdt.platform.source"/>
331+
<feature id="org.eclipse.pde"/>
332+
<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
342333
<feature id="org.eclipse.cdt.testsrunner.feature"/>
334+
<feature id="org.eclipse.equinox.p2.core.feature.source"/>
335+
<feature id="org.eclipse.cdt.gnu.dsf"/>
336+
<feature id="org.eclipse.cdt.sdk"/>
337+
<feature id="org.eclipse.jdt"/>
338+
<feature id="org.eclipse.platform.source"/>
339+
<feature id="org.eclipse.pde.source"/>
340+
<feature id="org.eclipse.ecf.filetransfer.ssl.source.feature"/>
341+
<feature id="org.eclipse.emf.ecore"/>
342+
<feature id="org.eclipse.equinox.p2.user.ui"/>
343+
<feature id="org.eclipse.equinox.p2.extras.feature"/>
344+
<feature id="org.eclipse.cdt.native.source"/>
345+
<feature id="org.eclipse.equinox.p2.extras.feature.source"/>
346+
<feature id="org.eclipse.ecf.core.feature"/>
347+
<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature"/>
348+
<feature id="org.eclipse.jgit"/>
349+
<feature id="org.eclipse.ecf.filetransfer.httpclient4.source.feature"/>
350+
<feature id="org.eclipse.cdt.gnu.dsf.source"/>
351+
<feature id="org.eclipse.cdt.native"/>
352+
<feature id="org.eclipse.cdt.gnu.debug"/>
353+
<feature id="org.eclipse.cdt.gnu.build.source"/>
354+
<feature id="org.eclipse.e4.rcp.source"/>
355+
<feature id="org.eclipse.e4.rcp"/>
356+
<feature id="org.eclipse.remote" version="2.0.2.201601141453"/>
343357
</features>
344358

345359
<configurations>
346360
<plugin id="it.baeyens.arduino.application" autoStart="true" startLevel="4" />
347361
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
348362
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
349-
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
363+
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
350364
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
351365
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
352366
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
367+
<property name="org.eclipse.update.reconcile" value="false" />
353368
</configurations>
354369

355370
<repositories>
356371
<repository location="http://download.eclipse.org/releases/mars" enabled="true" />
357372
<repository location="http://download.eclipse.org/eclipse/updates/4.5" enabled="true" />
358373
<repository location="http://eclipse.baeyens.it/nightly" enabled="false" />
359374
<repository location="http://eclipse.baeyens.it/V3" enabled="true" />
375+
<repository location="http://download.eclipse.org/tools/cdt/releases/8.8.1" enabled="true" />
360376
</repositories>
361377

362378
<preferencesInfo>

it.baeyens.arduino.product/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</executions>
3535
<configuration>
3636
<formats>
37-
<win32>zip</win32>
37+
<win32>tar.gz</win32>
3838
<linux>tar.gz</linux>
3939
<macosx>tar.gz</macosx>
4040
</formats>
@@ -54,9 +54,6 @@
5454
/opt folder -->
5555
<!-- LSB: "binary-only packages of nonessential applications and add-on
5656
software products" -->
57-
<rootFolders>
58-
<linux>/opt/eclipseArduino/</linux>
59-
</rootFolders>
6057
</product>
6158
</products>
6259
</configuration>

0 commit comments

Comments
 (0)