Skip to content

Commit d387112

Browse files
Pieter12345Pieter12345
committed
Sync Eclipse project file dependencies with launcher classpath
- Sync Eclipse classpath file (`.classpath`) by adding exactly all entries that are in the launcher's classpath configuration (`build/windows/launcher/config.xml`). - Refer to `arduino-core/lib` where possible to avoid having duplicate jars on the classpath (this fixes problems when running Arduino from Eclipse and prepares for having a project without duplicate dependencies). - Sort the Eclipse classpath files alphabetically (This greatly helps when comparing them).
1 parent 3bea0ab commit d387112

File tree

2 files changed

+43
-32
lines changed

2 files changed

+43
-32
lines changed

‎.classpath

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,45 @@
22
<classpath>
33
<classpathentry excluding="processing/app/tools/format/|processing/app/tools/format/src/|processing/app/Trace.java|processing/app/RunnerClassLoader.java" kind="src" path="app/src"/>
44
<classpathentry kind="src" path="app/test"/>
5-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6-
<classpathentry kind="lib" path="app/lib/apple.jar"/>
7-
<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
5+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
6+
<classpathentry kind="lib" path="arduino-core/lib/apple.jar"/>
7+
<classpathentry kind="lib" path="app/lib/batik-1.8.jar"/>
8+
<classpathentry kind="lib" path="app/lib/batik-anim-1.8.jar"/>
9+
<classpathentry kind="lib" path="app/lib/batik-awt-util-1.8.jar"/>
10+
<classpathentry kind="lib" path="app/lib/batik-bridge-1.8.jar"/>
11+
<classpathentry kind="lib" path="app/lib/batik-codec-1.8.jar"/>
12+
<classpathentry kind="lib" path="app/lib/batik-css-1.8.jar"/>
13+
<classpathentry kind="lib" path="app/lib/batik-dom-1.8.jar"/>
14+
<classpathentry kind="lib" path="app/lib/batik-ext-1.8.jar"/>
15+
<classpathentry kind="lib" path="app/lib/batik-gvt-1.8.jar"/>
16+
<classpathentry kind="lib" path="app/lib/batik-parser-1.8.jar"/>
17+
<classpathentry kind="lib" path="app/lib/batik-rasterizer-1.8.jar"/>
18+
<classpathentry kind="lib" path="app/lib/batik-script-1.8.jar"/>
19+
<classpathentry kind="lib" path="app/lib/batik-squiggle-1.8.jar"/>
20+
<classpathentry kind="lib" path="app/lib/batik-svg-dom-1.8.jar"/>
21+
<classpathentry kind="lib" path="app/lib/batik-svgpp-1.8.jar"/>
22+
<classpathentry kind="lib" path="app/lib/batik-transcoder-1.8.jar"/>
23+
<classpathentry kind="lib" path="app/lib/batik-util-1.8.jar"/>
24+
<classpathentry kind="lib" path="app/lib/batik-xml-1.8.jar"/>
25+
<classpathentry kind="lib" path="arduino-core/lib/commons-compress-1.8.jar"/>
26+
<classpathentry kind="lib" path="arduino-core/lib/commons-lang3-3.8.1.jar"/>
27+
<classpathentry kind="lib" path="arduino-core/lib/jackson-core-2.9.5.jar"/>
28+
<classpathentry kind="lib" path="arduino-core/lib/jackson-databind-2.9.5.jar"/>
29+
<classpathentry kind="lib" path="arduino-core/lib/jackson-module-mrbean-2.9.5.jar"/>
30+
<classpathentry kind="lib" path="arduino-core/lib/java-semver-0.8.0.jar"/>
31+
<classpathentry kind="lib" path="arduino-core/lib/jsch-0.1.50.jar"/>
32+
<classpathentry kind="lib" path="arduino-core/lib/jssc-2.8.0-arduino3.jar"/>
33+
<classpathentry kind="lib" path="app/lib/jtouchbar-1.0.0.jar"/>
34+
<classpathentry kind="lib" path="app/lib/rsyntaxtextarea-3.0.3-SNAPSHOT.jar"/>
35+
<classpathentry kind="lib" path="app/lib/xml-apis-1.3.04.jar"/>
36+
<classpathentry kind="lib" path="app/lib/xml-apis-ext-1.3.04.jar"/>
37+
<classpathentry kind="lib" path="app/lib/xmlgraphics-commons-2.0.jar"/>
838
<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
939
<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>
1040
<classpathentry kind="lib" path="app/test-lib/fest-swing-1.2.jar"/>
1141
<classpathentry kind="lib" path="app/test-lib/fest-util-1.1.2.jar"/>
1242
<classpathentry kind="lib" path="app/test-lib/jcip-annotations-1.0.jar"/>
13-
<classpathentry kind="lib" path="app/lib/batik-transcoder-1.8.jar"/>
14-
<classpathentry kind="lib" path="app/lib/commons-codec-1.7.jar"/>
15-
<classpathentry kind="lib" path="app/lib/commons-exec-1.1.jar"/>
16-
<classpathentry kind="lib" path="app/lib/commons-logging-1.0.4.jar"/>
17-
<classpathentry kind="lib" path="app/lib/commons-net-3.3.jar"/>
18-
<classpathentry kind="lib" path="app/lib/jmdns-3.5.3.jar"/>
19-
<classpathentry kind="lib" path="app/lib/slf4j-api-1.7.22.jar"/>
20-
<classpathentry kind="lib" path="app/lib/java-semver-0.8.0.jar"/>
21-
<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
22-
<classpathentry kind="lib" path="app/lib/jssc-2.8.0-arduino3.jar"/>
23-
<classpathentry kind="lib" path="app/lib/jtouchbar-1.0.0.jar"/>
24-
<classpathentry kind="lib" path="app/lib/bcpg-jdk15on-152.jar"/>
25-
<classpathentry kind="lib" path="app/lib/bcprov-jdk15on-152.jar"/>
26-
<classpathentry kind="lib" path="app/lib/jackson-core-2.9.5.jar"/>
27-
<classpathentry kind="lib" path="app/lib/jackson-databind-2.9.5.jar"/>
28-
<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.9.5.jar"/>
29-
<classpathentry kind="lib" path="app/lib/jackson-annotations-2.9.5.jar"/>
30-
<classpathentry kind="lib" path="app/lib/commons-compress-1.8.jar"/>
31-
<classpathentry kind="lib" path="app/lib/commons-lang3-3.8.1.jar"/>
32-
<classpathentry kind="lib" path="app/lib/rsyntaxtextarea-3.0.3-SNAPSHOT.jar"/>
43+
<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
3344
<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
3445
<classpathentry kind="output" path="app/bin"/>
3546
</classpath>

‎arduino-core/.classpath

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
<classpathentry kind="src" path="src"/>
44
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
55
<classpathentry kind="lib" path="lib/apple.jar"/>
6-
<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
7-
<classpathentry kind="lib" path="lib/commons-net-3.3.jar"/>
8-
<classpathentry kind="lib" path="lib/jmdns-3.5.3.jar"/>
9-
<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
10-
<classpathentry kind="lib" path="lib/slf4j-simple-1.7.22.jar"/>
11-
<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino3.jar"/>
12-
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
13-
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
146
<classpathentry kind="lib" path="lib/bcpg-jdk15on-152.jar"/>
157
<classpathentry kind="lib" path="lib/bcprov-jdk15on-152.jar"/>
168
<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
179
<classpathentry kind="lib" path="lib/commons-compress-1.8.jar"/>
10+
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
11+
<classpathentry kind="lib" path="lib/commons-lang3-3.8.1.jar"/>
12+
<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
13+
<classpathentry kind="lib" path="lib/commons-net-3.3.jar"/>
1814
<classpathentry kind="lib" path="lib/jackson-annotations-2.9.5.jar"/>
1915
<classpathentry kind="lib" path="lib/jackson-core-2.9.5.jar"/>
2016
<classpathentry kind="lib" path="lib/jackson-databind-2.9.5.jar"/>
2117
<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.9.5.jar"/>
2218
<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
19+
<classpathentry kind="lib" path="lib/jmdns-3.5.3.jar"/>
2320
<classpathentry kind="lib" path="lib/jna-4.2.2.jar"/>
2421
<classpathentry kind="lib" path="lib/jna-platform-4.2.2.jar"/>
25-
<classpathentry kind="lib" path="lib/commons-lang3-3.8.1.jar"/>
22+
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
23+
<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino3.jar"/>
24+
<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
25+
<classpathentry kind="lib" path="lib/slf4j-simple-1.7.22.jar"/>
2626
<classpathentry kind="output" path="bin"/>
2727
</classpath>

0 commit comments

Comments
 (0)