Skip to content

Commit 80fe29e

Browse files
benfrybenfry
committed
Merge pull request #4387 from JakubValtar/update-jdt
Update JDT to 4.5.2
2 parents 1de209c + 8cae611 commit 80fe29e

4 files changed

Lines changed: 19 additions & 34 deletions

File tree

‎build/build.xml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,6 @@
280280
<include name="app/lib/jna.jar" />
281281
<include name="app/lib/ant.jar" />
282282
<include name="app/lib/ant-launcher.jar" />
283-
<include name="app/lib/org-netbeans-swing-outline.jar" />
284-
<include name="app/lib/jdi.jar" />
285-
<include name="app/lib/jdimodel.jar" />
286-
<include name="app/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar" />
287-
<include name="app/lib/com.ibm.icu_4.4.2.v20110823.jar" />
288283
</fileset>
289284

290285
<target name="build" description="Build Processing.">
@@ -523,11 +518,6 @@
523518
<classpath file="../app/lib/jna.jar" />
524519
<classpath file="../app/lib/ant.jar" />
525520
<classpath file="../app/lib/ant-launcher.jar" />
526-
<classpath file="../app/lib/org-netbeans-swing-outline.jar" />
527-
<classpath file="../app/lib/jdi.jar" />
528-
<classpath file="../app/lib/jdimodel.jar" />
529-
<classpath file="../app/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar" />
530-
<classpath file="../app/lib/com.ibm.icu_4.4.2.v20110823.jar" />
531521

532522
<!-- plus core.jar... note that this is no longer shared -->
533523
<classpath file="../core/library/core.jar" />
@@ -1302,7 +1292,7 @@ remove the spaces for depth since it should be double dash, but screws up commen
13021292
<arg line="everything -type f -exec rm -rf {} ';'" />
13031293
</exec>
13041294

1305-
<javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/antlr.jar:../app/lib/apple.jar:../app/lib/jna.jar:../app/lib/org-netbeans-swing-outline.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg/bin:../java/libraries/pdf/bin:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf/bin:../java/libraries/io/bin:../java/libraries/net/bin:../java/libraries/serial/bin:../java/mode/ecj.jar:${java.home}/lib/tools.jar" destdir="javadoc/everything" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.7" splitindex="false" use="false" version="false" noqualifier="all">
1295+
<javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/antlr.jar:../app/lib/apple.jar:../app/lib/jna.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg/bin:../java/libraries/pdf/bin:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf/bin:../java/libraries/io/bin:../java/libraries/net/bin:../java/libraries/serial/bin:${java.home}/lib/tools.jar" destdir="javadoc/everything" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.8" splitindex="false" use="false" version="false" noqualifier="all">
13061296

13071297
<arg value="-notimestamp" />
13081298

@@ -1335,7 +1325,7 @@ remove the spaces for depth since it should be double dash, but screws up commen
13351325
<arg line="libraries -type f -exec rm -rf {} ';'" />
13361326
</exec>
13371327

1338-
<javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/antlr.jar:../app/lib/apple.jar:../app/lib/jna.jar:../app/lib/org-netbeans-swing-outline.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg/bin:../java/libraries/pdf/bin:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf/bin:../java/libraries/net/bin:../java/libraries/serial/bin:../java/mode/ecj.jar:${java.home}/lib/tools.jar" destdir="javadoc/libraries" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.7" splitindex="false" use="false" version="false" noqualifier="all">
1328+
<javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/antlr.jar:../app/lib/apple.jar:../app/lib/jna.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg/bin:../java/libraries/pdf/bin:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf/bin:../java/libraries/net/bin:../java/libraries/serial/bin:${java.home}/lib/tools.jar" destdir="javadoc/libraries" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.8" splitindex="false" use="false" version="false" noqualifier="all">
13391329

13401330
<arg value="-notimestamp" />
13411331

‎build/windows/config.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@
2121
<cp>lib/antlr.jar</cp>
2222
<cp>lib/ant.jar</cp>
2323
<cp>lib/ant-launcher.jar</cp>
24-
<cp>lib/org-netbeans-swing-outline.jar</cp>
25-
<cp>lib/com.ibm.icu_4.4.2.v20110823.jar</cp>
26-
<cp>lib/jdi.jar</cp>
27-
<cp>lib/jdimodel.jar</cp>
28-
<cp>lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar</cp>
2924
<!-- <cp>%EXEDIR%/java/lib/tools.jar</cp> -->
3025
</classPath>
3126
<jre>

‎build/windows/processing.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
22

3-
.\java\bin\java -cp lib/pde.jar;core/library/core.jar;lib/jna.jar;lib/antlr.jar;lib/ant.jar;lib/ant-launcher.jar;lib/org-netbeans-swing-outline.jar;lib/com.ibm.icu_4.4.2.v20110823.jar;lib/jdi.jar;lib/jdimodel.jar;lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar processing.app.Base
3+
.\java\bin\java -cp lib/pde.jar;core/library/core.jar;lib/jna.jar;lib/antlr.jar;lib/ant.jar;lib/ant-launcher.jar processing.app.Base

‎java/mode/readme.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Packages from Eclipse 4.4.1:
1+
Packages from Eclipse 4.5.2:
22
http://download.eclipse.org/eclipse/downloads/
33

44
File listing at:
5-
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/?d
5+
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/?d
66

77
The jdtCompilerAdapter.jar is extracted from org.eclipse.jdt.core.jar to provide
88
the JDTCompilerAdapter class, which is the Ant task for the JDT compiler.
@@ -15,31 +15,31 @@ https://github.com/processing/processing/pull/3324
1515

1616
. . .
1717

18-
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/com.ibm.icu_52.1.0.v201404241930.jar
18+
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/com.ibm.icu_54.1.1.v201501272100.jar
1919

20-
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.core.contenttype_3.4.200.v20140207-1251.jar
20+
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.core.contenttype_3.5.0.v20150421-2214.jar
2121

22-
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.core.jobs_3.6.0.v20140424-0053.jar
22+
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.core.jobs_3.7.0.v20150330-2103.jar
2323

24-
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.core.resources_3.9.1.v20140825-1431.jar
24+
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.core.resources_3.10.1.v20150725-1910.jar
2525

26-
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.core.runtime_3.10.0.v20140318-2214.jar
26+
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.core.runtime_3.11.1.v20150903-1804.jar
2727

28-
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar
28+
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.equinox.common_3.7.0.v20150402-1709.jar
2929

30-
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.equinox.preferences_3.5.200.v20140224-1527.jar
30+
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.equinox.preferences_3.5.300.v20150408-1437.jar
3131

32-
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.jdt.core_3.10.0.v20140902-0626.jar
32+
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.jdt.core_3.11.2.v20160128-0629.jar
3333

34-
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.jdt.debug_3.8.101.v20140902-1548.jar
34+
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.osgi_3.10.102.v20160118-1700.jar
3535

36-
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
37-
38-
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.text_3.5.300.v20130515-1451.jar
36+
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.text_3.5.400.v20150505-1044.jar
3937

4038
. . .
4139

4240
Updated 19 January 2015 to fix Java 8 support. The previous versions gave an "Annotation processing got disabled, since it requires a 1.6 compliant JVM" error.
4341

44-
Finally, the archive site contains additional jars for the 4.4.1 release, including the JDT Core Batch Compiler (ECJ):
45-
http://archive.eclipse.org/eclipse/downloads/drops4/R-4.4.1-201409250400/
42+
Updated 21 March 2016 to newest version (from R-4.4.1-201409250400 to R-4.5.2-201602121500) as part of updating Java Mode
43+
44+
Finally, the archive site contains additional jars for the 4.5.2 release, including the JDT Core Batch Compiler (ECJ):
45+
http://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.2-201602121500/

0 commit comments

Comments
 (0)