Skip to content

Commit 3bc5517

Browse files
wimjongmanwimjongman
committed
Revert "together with org.eclipse.update.reconcile=false this seems to fix #321"
This reverts commit 19204ff.
1 parent 147d9e7 commit 3bc5517

File tree

4 files changed

+54
-147
lines changed

4 files changed

+54
-147
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,21 @@ 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,
3132
org.eclipse.jface,
3233
org.eclipse.ui.ide,
34+
org.eclipse.core.jobs,
35+
org.eclipse.equinox.preferences,
36+
org.eclipse.core.contenttype,
37+
org.eclipse.osgi,
3338
org.eclipse.cdt.managedbuilder.core,
3439
org.eclipse.core.filesystem,
40+
org.eclipse.swt,
3541
org.eclipse.cdt.core,
3642
org.apache.commons.compress,
3743
com.google.gson,
3844
org.eclipse.equinox.security,
3945
org.eclipse.ui.forms,
4046
org.eclipse.ui.workbench,
41-
org.eclipse.core.runtime
47+
org.eclipse.core.runtime,
48+
org.eclipse.core.commands

‎it.baeyens.arduino.feature/feature.xml

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -133,73 +133,7 @@ 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-
176136
<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"/>
203137
<import feature="org.eclipse.cdt" version="8.0.0" match="greaterOrEqual"/>
204138
</requires>
205139

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

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-
269182
</feature>

‎it.baeyens.arduino.product/arduino.product

Lines changed: 42 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -293,86 +293,70 @@ 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"/>
296312
<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"/>
297338
<feature id="org.eclipse.nebula.widgets.oscilloscope.feature" installMode="root"/>
298339
<feature id="org.eclipse.platform" installMode="root"/>
299340
<feature id="org.eclipse.rcp" installMode="root"/>
300341
<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"/>
333342
<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"/>
357343
</features>
358344

359345
<configurations>
360346
<plugin id="it.baeyens.arduino.application" autoStart="true" startLevel="4" />
361347
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
362348
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
363-
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
349+
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
364350
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
365351
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
366352
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
367-
<property name="org.eclipse.update.reconcile" value="false" />
368353
</configurations>
369354

370355
<repositories>
371356
<repository location="http://download.eclipse.org/releases/mars" enabled="true" />
372357
<repository location="http://download.eclipse.org/eclipse/updates/4.5" enabled="true" />
373358
<repository location="http://eclipse.baeyens.it/nightly" enabled="false" />
374359
<repository location="http://eclipse.baeyens.it/V3" enabled="true" />
375-
<repository location="http://download.eclipse.org/tools/cdt/releases/8.8.1" enabled="true" />
376360
</repositories>
377361

378362
<preferencesInfo>

‎it.baeyens.arduino.product/pom.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</executions>
3535
<configuration>
3636
<formats>
37-
<win32>tar.gz</win32>
37+
<win32>zip</win32>
3838
<linux>tar.gz</linux>
3939
<macosx>tar.gz</macosx>
4040
</formats>
@@ -54,6 +54,9 @@
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>
5760
</product>
5861
</products>
5962
</configuration>

0 commit comments

Comments
 (0)