Skip to content

Commit b5d647b

Browse files
wimjongmanwimjongman
committed
#1027 Update site and product build maintenance
* Fixed the build. Needed to include oscilloscope into feature.
1 parent 00f9910 commit b5d647b

File tree

10 files changed

+102
-80
lines changed

10 files changed

+102
-80
lines changed

‎images_plugin_dev_setup/.project‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>images_plugin_dev_setup</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
</buildSpec>
9+
<natures>
10+
</natures>
11+
</projectDescription>

‎io.sloeber.core.nl1/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin/

‎io.sloeber.core.nl1/src/io/sloeber/core/nl1/Empty.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package io.sloeber.core.nl1;
22

33
public class Empty {
4-
4+
// Is only here because of SRC folder creation
55
}

‎io.sloeber.core/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin/

‎io.sloeber.feature/feature.xml‎

Lines changed: 58 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<feature
3-
id="io.sloeber.feature"
4-
label="%featureName"
5-
version="4.3.1.qualifier"
6-
provider-name="%provider">
7-
8-
<description url="http://sloeber.io">
9-
%description
10-
</description>
11-
12-
<copyright>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<feature
3+
id="io.sloeber.feature"
4+
label="%featureName"
5+
version="4.3.1.qualifier"
6+
provider-name="%provider">
7+
8+
<description url="http://sloeber.io">
9+
%description
10+
</description>
11+
12+
<copyright>
1313
Copyright (c) 2011-2017 Jan Baeyens and others
1414

1515

@@ -23,46 +23,51 @@ Eclipse -&gt; see license-Eclipse.HTML
2323

2424
Boards code
2525

26-
Trump211
27-
</copyright>
28-
29-
<license url="%licenseUrl">
26+
Trump211
27+
</copyright>
28+
29+
<license url="%licenseUrl">
3030
Sloeber sends non personalised activity data (build/upload/open serial monitor/open plotter) to baeyens.it for statistical analysis of the plugin usage.
3131

32-
If you do not agree with this policy, please do not install this software.
33-
</license>
34-
35-
<requires>
36-
<import feature="org.eclipse.cdt" version="9.5.0" match="greaterOrEqual"/>
37-
</requires>
38-
39-
<plugin
40-
id="io.sloeber.core"
41-
download-size="0"
42-
install-size="0"
43-
version="0.0.0"
44-
unpack="false"/>
45-
46-
<plugin
47-
id="io.sloeber.ui.nl1"
48-
download-size="0"
49-
install-size="0"
50-
version="0.0.0"
51-
fragment="true"/>
52-
53-
<plugin
54-
id="io.sloeber.ui"
55-
download-size="0"
56-
install-size="0"
57-
version="0.0.0"
58-
unpack="false"/>
59-
60-
<plugin
61-
id="io.sloeber.core.nl1"
62-
download-size="0"
63-
install-size="0"
64-
version="0.0.0"
65-
fragment="true"
66-
unpack="false"/>
67-
68-
</feature>
32+
If you do not agree with this policy, please do not install this software.
33+
</license>
34+
35+
<includes
36+
id="org.eclipse.nebula.widgets.oscilloscope.feature"
37+
version="0.0.0"
38+
search-location="both"/>
39+
40+
<requires>
41+
<import feature="org.eclipse.cdt" version="9.5.0" match="greaterOrEqual"/>
42+
</requires>
43+
44+
<plugin
45+
id="io.sloeber.core"
46+
download-size="0"
47+
install-size="0"
48+
version="0.0.0"
49+
unpack="false"/>
50+
51+
<plugin
52+
id="io.sloeber.ui.nl1"
53+
download-size="0"
54+
install-size="0"
55+
version="0.0.0"
56+
fragment="true"/>
57+
58+
<plugin
59+
id="io.sloeber.ui"
60+
download-size="0"
61+
install-size="0"
62+
version="0.0.0"
63+
unpack="false"/>
64+
65+
<plugin
66+
id="io.sloeber.core.nl1"
67+
download-size="0"
68+
install-size="0"
69+
version="0.0.0"
70+
fragment="true"
71+
unpack="false"/>
72+
73+
</feature>

‎io.sloeber.parent/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
<module>../io.sloeber.core</module>
107107
<module>../io.sloeber.core.nl1</module>
108108
<module>../io.sloeber.product.sdk</module>
109-
<module>../io.sloeber.updatesite</module>
110109
<module>../io.sloeber.ui.nl1</module>
111110
<module>../io.sloeber.ui</module>
112111
<module>../io.sloeber.tests</module>

‎io.sloeber.product.sdk/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin/

‎io.sloeber.product/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin/

‎io.sloeber.ui/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,17 @@ Bundle-Activator: io.sloeber.ui.Activator
77
Require-Bundle: org.eclipse.ui,
88
org.eclipse.core.runtime,
99
org.eclipse.ui.console,
10-
org.eclipse.core.resources,
11-
org.eclipse.ui.workbench,
1210
io.sloeber.core,
1311
org.eclipse.cdt.ui,
1412
org.eclipse.cdt.core,
1513
org.eclipse.ui.forms,
1614
org.eclipse.ui.ide,
1715
org.eclipse.debug.ui,
18-
org.eclipse.ui.navigator
16+
org.eclipse.nebula.widgets.oscilloscope;bundle-version="1.0.0"
1917
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2018
Bundle-ActivationPolicy: lazy
21-
Import-Package: io.sloeber.core.api,
22-
org.apache.commons.io;version="2.2.0",
23-
org.apache.commons.lang,
24-
org.eclipse.nebula.widgets.oscilloscope.multichannel,
25-
org.eclipse.ui.dialogs
19+
Import-Package: org.apache.commons.io;version="2.2.0",
20+
org.apache.commons.lang
2621
Bundle-Vendor: Sloeber.io
2722
Export-Package: io.sloeber.ui;x-internal:=true,
2823
io.sloeber.ui.monitor;uses:="org.eclipse.jface.resource,org.eclipse.ui.plugin,org.osgi.framework",

‎io.sloeber.updatesite/category.xml‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<site>
3-
<feature url="features/io.sloeber.feature_4.3.1.qualifier.jar" id="io.sloeber.feature" version="4.3.1.qualifier">
4-
<category name="Sloeber"/>
5-
</feature>
6-
<category-def name="Sloeber" label="Sloeber Arduino IDE">
7-
<description>
8-
Sloeber, Arduino development in the Eclipse IDE.
9-
</description>
10-
</category-def>
11-
<repository-reference location="http://download.eclipse.org/eclipse/updatest/4.9/" enabled="true" />
12-
<repository-reference location="http://download.eclipse.org/releases/latest/" enabled="true" />
13-
<repository-reference location="http://download.eclipse.org/tools/cdt/releases/9.5/" enabled="true" />
14-
<repository-reference location="http://download.eclipse.org/nebula/releases/latest/" enabled="true" />
15-
<repository-reference location="http://gnu-mcu-eclipse.netlify.com/v4-neon-updates/" enabled="true" />
16-
<repository-reference location="http://download.eclipse.org/technology/babel/update-site/R0.16.0/photon/" enabled="true" />
17-
</site>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<site>
3+
<feature url="features/io.sloeber.feature_4.3.1.qualifier.jar" id="io.sloeber.feature" version="4.3.1.qualifier">
4+
<category name="Sloeber"/>
5+
</feature>
6+
<bundle id="io.sloeber.product" version="4.3.1.qualifier">
7+
<category name="product_ide"/>
8+
</bundle>
9+
<category-def name="Sloeber" label="Sloeber Arduino IDE">
10+
<description>
11+
Sloeber, Arduino development in the Eclipse IDE.
12+
</description>
13+
</category-def>
14+
<category-def name="product_ide" label="Sloeber Arduino IDE Product">
15+
<description>
16+
Only select this if you are upgrading the Sloeber IDE
17+
</description>
18+
</category-def>
19+
<repository-reference location="http://download.eclipse.org/eclipse/updatest/4.9/" enabled="true" />
20+
<repository-reference location="http://download.eclipse.org/releases/latest/" enabled="true" />
21+
<repository-reference location="http://download.eclipse.org/tools/cdt/releases/9.5/" enabled="true" />
22+
<repository-reference location="http://download.eclipse.org/nebula/releases/latest/" enabled="true" />
23+
<repository-reference location="http://gnu-mcu-eclipse.netlify.com/v4-neon-updates/" enabled="true" />
24+
<repository-reference location="http://download.eclipse.org/technology/babel/update-site/R0.16.0/photon/" enabled="true" />
25+
</site>

0 commit comments

Comments
 (0)