Merge pull request #4387 from JakubValtar/update-jdt

Update JDT to 4.5.2
This commit is contained in:
Ben Fry
2016-04-06 21:25:42 -07:00
4 changed files with 19 additions and 34 deletions
+2 -12
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
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>
+1 -1
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