diff --git a/build/build.xml b/build/build.xml index 0117e3933..af8df134a 100644 --- a/build/build.xml +++ b/build/build.xml @@ -280,11 +280,6 @@ - - - - - @@ -523,11 +518,6 @@ - - - - - @@ -1302,7 +1292,7 @@ remove the spaces for depth since it should be double dash, but screws up commen - + @@ -1335,7 +1325,7 @@ remove the spaces for depth since it should be double dash, but screws up commen - + diff --git a/build/windows/config.xml b/build/windows/config.xml index f15f9a3ab..771501603 100644 --- a/build/windows/config.xml +++ b/build/windows/config.xml @@ -21,11 +21,6 @@ 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 diff --git a/build/windows/processing.bat b/build/windows/processing.bat index 64e7291eb..2843a7c90 100755 --- a/build/windows/processing.bat +++ b/build/windows/processing.bat @@ -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 \ No newline at end of file +.\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 \ No newline at end of file diff --git a/java/mode/readme.txt b/java/mode/readme.txt index 607c060be..5b94b7a70 100644 --- a/java/mode/readme.txt +++ b/java/mode/readme.txt @@ -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/