Skip to content

Commit 05f3b39

Browse files
benfrybenfry
committed
rolling over to new Eclipse packages to support Java 8
1 parent 0f79db4 commit 05f3b39

4 files changed

Lines changed: 56 additions & 5 deletions

File tree

‎build/build.xml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,15 @@
3434
<property name="examples.dir"
3535
value="../../processing-docs/content/examples" />
3636

37+
<!--
3738
<property name="jdk.version" value="7" />
3839
<property name="jdk.update" value="72" />
3940
<property name="jdk.build" value="14" />
41+
-->
42+
<!-- Switching to 8 because updates end April 2015 -->
43+
<property name="jdk.version" value="8" />
44+
<property name="jdk.update" value="25" />
45+
<property name="jdk.build" value="17" />
4046
<property name="jdk.stuff" value="${jdk.version}u${jdk.update}" />
4147
<property name="jdk.esoteric" value="1.${jdk.version}.0_${jdk.update}" />
4248

@@ -55,14 +61,16 @@
5561
</condition>
5662

5763
<fileset dir="windows/work/java" id="jre-optional-windows">
64+
<include name="lib/ext/dnsns.jar" />
65+
5866
<include name="bin/dtplugin" />
5967
<include name="bin/plugin2" />
6068

6169
<include name="bin/kinit.exe" />
6270
<include name="bin/klist.exe" />
6371
<include name="bin/ktab.exe" />
6472

65-
<!--<include name="bin/keytool" />-->
73+
<!--<include name="bin/keytool" />--> <!-- needed for Android -->
6674
<include name="bin/orbd" />
6775
<include name="bin/policytool" />
6876
<include name="bin/rmid" />
@@ -73,12 +81,14 @@
7381
<include name="bin/javaws.exe" />
7482
<include name="lib/javaws.jar" />
7583

76-
<include name="lib/ext/dnsns.jar" />
7784
<include name="lib/cmm/PYCC.pf" />
7885
</fileset>
7986

8087
<fileset dir="linux/work/java" id="jre-optional-linux">
81-
<!--<include name="bin/keytool" />-->
88+
<!--<include name="bin/keytool" />--> <!-- needed for Android -->
89+
90+
<include name="lib/ext/dnsns.jar" />
91+
8292
<include name="bin/orbd" />
8393
<include name="bin/policytool" />
8494
<include name="bin/rmid" />
@@ -89,7 +99,6 @@
8999
<include name="bin/javaws" />
90100
<include name="lib/javaws.jar" />
91101

92-
<include name="lib/ext/dnsns.jar" />
93102
<include name="lib/cmm/PYCC.pf" />
94103
</fileset>
95104

@@ -101,6 +110,9 @@
101110
but that info isn't part of the Java 7 instructions.
102111
http://www.oracle.com/technetwork/java/javase/jrereadme-182762.html -->
103112

113+
<!-- New list for Java 8, not updated yet here, nor in appbundler on OS X
114+
http://www.oracle.com/technetwork/java/javase/jre-8-readme-2095710.html -->
115+
104116
<fileset dir="${platform}/work/java" id="javafx-basics">
105117
<include name="THIRDPARTYLICENSEREADME-JAVAFX.txt" />
106118
<include name="lib/javafx.properties" />

‎java/mode/readme.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ecj.jar 4.4.1, downloaded from:
2+
http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.1-201409250400/

‎pdex/mode/readme.txt‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
1-
Packages from Eclipse 4.2.1:
1+
Packages from Eclipse 4.4.1:
22
http://download.eclipse.org/eclipse/downloads/
33

4+
File listing at:
5+
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/?d
6+
47
The jdi.jar and jdimodel.jar files are unpacked
58
from the org.eclipse.jdt.debug JAR file.
9+
10+
. . .
11+
12+
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/com.ibm.icu_52.1.0.v201404241930.jar
13+
14+
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.core.contenttype_3.4.200.v20140207-1251.jar
15+
16+
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.core.jobs_3.6.0.v20140424-0053.jar
17+
18+
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.core.resources_3.9.1.v20140825-1431.jar
19+
20+
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.core.runtime_3.10.0.v20140318-2214.jar
21+
22+
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar
23+
24+
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.equinox.preferences_3.5.200.v20140224-1527.jar
25+
26+
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.jdt.core_3.10.0.v20140902-0626.jar
27+
28+
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.jdt.debug_3.8.101.v20140902-1548.jar
29+
30+
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
31+
32+
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.text_3.5.300.v20130515-1451.jar
33+
34+
. . .
35+
36+
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.

‎todo.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ X https://github.com/processing/processing/issues/2979
66
X splash screen for Linux
77
X https://github.com/processing/processing/pull/3005
88

9+
X moving to Java 8 because Java 7 will be discontinued
10+
_ http://www.oracle.com/technetwork/java/javase/eol-135779.html
11+
_ requires Vista SP2 (ok, just say 7), and OS X 10.8.3, Ubuntu 12.04
12+
_ requires ECJ update (using 4.4.1)
13+
_ http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.1-201409250400/
14+
915
_ Determine shortcut for Export vs Use Selection for Find
1016
_ https://github.com/processing/processing/issues/2985
1117

0 commit comments

Comments
 (0)