Commit 55fb0d1
File tree
- build
- java/mode
- pdex/mode
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -34,9 +34,15 @@ | |||
| 34 | 34 | <property name="examples.dir" | |
| 35 | 35 | value="../../processing-docs/content/examples" /> | |
| 36 | 36 | ||
| 37 | + <!-- | ||
| 37 | 38 | <property name="jdk.version" value="7" /> | |
| 38 | 39 | <property name="jdk.update" value="72" /> | |
| 39 | 40 | <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" /> | ||
| 40 | 46 | <property name="jdk.stuff" value="${jdk.version}u${jdk.update}" /> | |
| 41 | 47 | <property name="jdk.esoteric" value="1.${jdk.version}.0_${jdk.update}" /> | |
| 42 | 48 | ||
@@ -55,14 +61,16 @@ | |||
| 55 | 61 | </condition> | |
| 56 | 62 | ||
| 57 | 63 | <fileset dir="windows/work/java" id="jre-optional-windows"> | |
| 64 | + <include name="lib/ext/dnsns.jar" /> | ||
| 65 | + | ||
| 58 | 66 | <include name="bin/dtplugin" /> | |
| 59 | 67 | <include name="bin/plugin2" /> | |
| 60 | 68 | ||
| 61 | 69 | <include name="bin/kinit.exe" /> | |
| 62 | 70 | <include name="bin/klist.exe" /> | |
| 63 | 71 | <include name="bin/ktab.exe" /> | |
| 64 | 72 | ||
| 65 | - <!--<include name="bin/keytool" />--> | ||
| 73 | + <!--<include name="bin/keytool" />--> <!-- needed for Android --> | ||
| 66 | 74 | <include name="bin/orbd" /> | |
| 67 | 75 | <include name="bin/policytool" /> | |
| 68 | 76 | <include name="bin/rmid" /> | |
@@ -73,12 +81,14 @@ | |||
| 73 | 81 | <include name="bin/javaws.exe" /> | |
| 74 | 82 | <include name="lib/javaws.jar" /> | |
| 75 | 83 | ||
| 76 | - <include name="lib/ext/dnsns.jar" /> | ||
| 77 | 84 | <include name="lib/cmm/PYCC.pf" /> | |
| 78 | 85 | </fileset> | |
| 79 | 86 | ||
| 80 | 87 | <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 | + | ||
| 82 | 92 | <include name="bin/orbd" /> | |
| 83 | 93 | <include name="bin/policytool" /> | |
| 84 | 94 | <include name="bin/rmid" /> | |
@@ -89,7 +99,6 @@ | |||
| 89 | 99 | <include name="bin/javaws" /> | |
| 90 | 100 | <include name="lib/javaws.jar" /> | |
| 91 | 101 | ||
| 92 | - <include name="lib/ext/dnsns.jar" /> | ||
| 93 | 102 | <include name="lib/cmm/PYCC.pf" /> | |
| 94 | 103 | </fileset> | |
| 95 | 104 | ||
@@ -101,6 +110,9 @@ | |||
| 101 | 110 | but that info isn't part of the Java 7 instructions. | |
| 102 | 111 | http://www.oracle.com/technetwork/java/javase/jrereadme-182762.html --> | |
| 103 | 112 | ||
| 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 | + | ||
| 104 | 116 | <fileset dir="${platform}/work/java" id="javafx-basics"> | |
| 105 | 117 | <include name="THIRDPARTYLICENSEREADME-JAVAFX.txt" /> | |
| 106 | 118 | <include name="lib/javafx.properties" /> | |
Binary file not shown.
| Original file line number | Diff line number | Diff 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/ | ||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 commit comments