eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-02 21:29:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4387 from JakubValtar/update-jdt

Browse Source 
Update JDT to 4.5.2
This commit is contained in:
Ben Fry
2016-04-06 21:25:42 -07:00
parent 1de209ccb0 8cae611554
commit 80fe29e4a5
4 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build/build.xml
View File

@@ -280,11 +280,6 @@
<include name="app/lib/jna.jar" />
<include name="app/lib/ant.jar" />
<include name="app/lib/ant-launcher.jar" />
<include name="app/lib/org-netbeans-swing-outline.jar" />
<include name="app/lib/jdi.jar" />
<include name="app/lib/jdimodel.jar" />
<include name="app/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar" />
<include name="app/lib/com.ibm.icu_4.4.2.v20110823.jar" />
</fileset>
<target name="build" description="Build Processing.">
@@ -523,11 +518,6 @@
<classpath file="../app/lib/jna.jar" />
<classpath file="../app/lib/ant.jar" />
<classpath file="../app/lib/ant-launcher.jar" />
<classpath file="../app/lib/org-netbeans-swing-outline.jar" />
<classpath file="../app/lib/jdi.jar" />
<classpath file="../app/lib/jdimodel.jar" />
<classpath file="../app/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar" />
<classpath file="../app/lib/com.ibm.icu_4.4.2.v20110823.jar" />
<!-- plus core.jar... note that this is no longer shared -->
<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
<arg line="everything -type f -exec rm -rf {} ';'" />
</exec>
<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">
<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">
<arg value="-notimestamp" />
@@ -1335,7 +1325,7 @@ remove the spaces for depth since it should be double dash, but screws up commen
<arg line="libraries -type f -exec rm -rf {} ';'" />
</exec>
<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">
<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">
<arg value="-notimestamp" />

5
build/windows/config.xml
View File

@@ -21,11 +21,6 @@
<cp>lib/antlr.jar</cp>
<cp>lib/ant.jar</cp>
<cp>lib/ant-launcher.jar</cp>
<cp>lib/org-netbeans-swing-outline.jar</cp>
<cp>lib/com.ibm.icu_4.4.2.v20110823.jar</cp>
<cp>lib/jdi.jar</cp>
<cp>lib/jdimodel.jar</cp>
<cp>lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar</cp>
<!-- <cp>%EXEDIR%/java/lib/tools.jar</cp> -->
</classPath>
<jre>

2
build/windows/processing.bat
View File

@@ -1,3 +1,3 @@
@echo off
.\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
.\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

32
java/mode/readme.txt
View File

@@ -1,8 +1,8 @@
Packages from Eclipse 4.4.1:
Packages from Eclipse 4.5.2:
http://download.eclipse.org/eclipse/downloads/
File listing at:
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/?d
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/?d
The jdtCompilerAdapter.jar is extracted from org.eclipse.jdt.core.jar to provide
the JDTCompilerAdapter class, which is the Ant task for the JDT compiler.
@@ -15,31 +15,31 @@ https://github.com/processing/processing/pull/3324
. . .
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/com.ibm.icu_52.1.0.v201404241930.jar
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/com.ibm.icu_54.1.1.v201501272100.jar
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.core.contenttype_3.4.200.v20140207-1251.jar
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.core.contenttype_3.5.0.v20150421-2214.jar
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.core.jobs_3.6.0.v20140424-0053.jar
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.core.jobs_3.7.0.v20150330-2103.jar
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.core.resources_3.9.1.v20140825-1431.jar
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.core.resources_3.10.1.v20150725-1910.jar
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.core.runtime_3.10.0.v20140318-2214.jar
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.core.runtime_3.11.1.v20150903-1804.jar
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.equinox.common_3.7.0.v20150402-1709.jar
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.equinox.preferences_3.5.200.v20140224-1527.jar
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.equinox.preferences_3.5.300.v20150408-1437.jar
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.jdt.core_3.10.0.v20140902-0626.jar
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.jdt.core_3.11.2.v20160128-0629.jar
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.jdt.debug_3.8.101.v20140902-1548.jar
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.osgi_3.10.102.v20160118-1700.jar
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
http://download.eclipse.org/eclipse/updates/4.4/R-4.4.1-201409250400/plugins/org.eclipse.text_3.5.300.v20130515-1451.jar
http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.text_3.5.400.v20150505-1044.jar
. . .
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.
Finally, the archive site contains additional jars for the 4.4.1 release, including the JDT Core Batch Compiler (ECJ):
http://archive.eclipse.org/eclipse/downloads/drops4/R-4.4.1-201409250400/
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
Finally, the archive site contains additional jars for the 4.5.2 release, including the JDT Core Batch Compiler (ECJ):
http://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.2-201602121500/