eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

deal with .class signing conflicts and use JDT .jar files for compilation

Browse Source
This commit is contained in:
Ben Fry
2015-01-21 19:43:02 -05:00
parent 3eccf56a84
commit a32a634b72
8 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/build.xml
+17 -4
View File
@@ -38,10 +38,10 @@
<property name="jdk.update" value="72" />
<property name="jdk.build" value="14" />
-->
<!-- Switching to 8 because updates end April 2015 -->
<!-- Switching to 8 because updates for 7 end April 2015 -->
<property name="jdk.version" value="8" />
<property name="jdk.update" value="25" />
<property name="jdk.build" value="17" />
<property name="jdk.update" value="31" />
<property name="jdk.build" value="13" />
<property name="jdk.stuff" value="${jdk.version}u${jdk.update}" />
<property name="jdk.esoteric" value="1.${jdk.version}.0_${jdk.update}" />
@@ -54,10 +54,23 @@
value="jre-${jdk.stuff}-${platform}-x64.tar.gz">
<equals arg1="${sun.arch.data.model}" arg2="64" />
</condition>
<!-- for the new one that uses the special getter -->
<condition property="jre.download"
value="${jdk.stuff}-${platform}-i586.tar.gz">
<equals arg1="${sun.arch.data.model}" arg2="32" />
</condition>
<condition property="jre.download"
value="${jdk.stuff}-${platform}-x64.tar.gz">
<equals arg1="${sun.arch.data.model}" arg2="64" />
</condition>
<!-- JDK location for Mac OS X -->
<!--
<condition property="jdk.file" value="jdk-${jdk.stuff}-macosx-x64.dmg">
<equals arg1="${platform}" arg2="macosx" />
</condition>
-->
<fileset dir="windows/work/java" id="jre-optional-windows">
<include name="lib/ext/dnsns.jar" />
@@ -183,7 +196,7 @@
<available file="${jdk.path.macosx}" property="macosx_jdk_found" />
<fail if="macosx" unless="macosx_jdk_found"
message="JDK ${jdk.stuff} required.${line.separator}To build on OS X, you must install Oracle's JDK ${jdk.stuff} from${line.separator}http://www.oracle.com/technetwork/java/javase/downloads${line.separator}or http://download.processing.org/java/${jdk.file}${line.separator}Note that only ${jdk.stuff} (not a later or earlier version) will work. ${line.separator}And it must be the JDK, not the JRE. And do not try to defy me again." />
message="JDK ${jdk.stuff} required.${line.separator}To build on OS X, you must install Oracle's JDK ${jdk.stuff} from${line.separator}http://www.oracle.com/technetwork/java/javase/downloads${line.separator}Note that only ${jdk.stuff} (not a later or earlier version) will work. ${line.separator}And it must be the JDK, not the JRE. And do not try to defy me again." />
<!--
<fail if="linux" unless="java_tools_found"
message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Ubuntu Linux, this might be /usr/lib/jvm/java-6-sun." />
build/shared/tools/MovieMaker/build.xml
+2 -1
View File
@@ -17,7 +17,8 @@
classpath="../../../../app/bin"
nowarn="true"
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
<compilerclasspath path="../../../../java/mode/ecj.jar" />
<compilerclasspath path="../../../../java/mode/org.eclipse.jdt.core.jar;
../../../../java/mode/jdtCompilerAdapter.jar" />
</javac>
</target>
core/todo.txt
+4 -1
View File
@@ -1,4 +1,4 @@
s0233 (3.0a6)
0233 (3.0a6)
X remove Applet as base class
X how to name the retina pixel stuff
X hint(ENABLE_RETINA_PIXELS) or hint(ENABLE_HIDPI_PIXELS)
@@ -6,6 +6,9 @@ X hint(ENABLE_2X_PIXELS)?
X hidpi is Apple's name as well
X mostly getting away from this
_ textAlign(RIGHT) including spaces at the end of each line
_ https://github.com/processing/processing/issues/3028
earlier
X size(640,360 , P3D) doesn't work properly
X https://github.com/processing/processing/issues/2924
java/libraries/dxf/build.xml
+2 -1
View File
@@ -21,7 +21,8 @@
classpath="../../../core/library/core.jar"
nowarn="true"
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
<compilerclasspath path="../../mode/ecj.jar" />
<compilerclasspath path="../../mode/org.eclipse.jdt.core.jar;
../../mode/jdtCompilerAdapter.jar" />
</javac>
</target>
java/libraries/glw/build.xml
+2 -1
View File
@@ -21,7 +21,8 @@
classpath="../../../core/library/core.jar; ../../../core/library/jogl-all.jar; ../../../core/library/gluegen-rt.jar"
nowarn="true"
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
<compilerclasspath path="../../mode/ecj.jar" />
<compilerclasspath path="mode/org.eclipse.jdt.core.jar;
mode/jdtCompilerAdapter.jar" />
</javac>
</target>
java/libraries/net/build.xml
+2 -1
View File
@@ -21,7 +21,8 @@
classpath="../../../core/library/core.jar"
nowarn="true"
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
<compilerclasspath path="../../mode/ecj.jar" />
<compilerclasspath path="../../mode/org.eclipse.jdt.core.jar;
../../mode/jdtCompilerAdapter.jar" />
</javac>
</target>
java/libraries/pdf/build.xml
+2 -1
View File
@@ -21,7 +21,8 @@
classpath="../../../core/library/core.jar; library/itext.jar"
nowarn="true"
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
<compilerclasspath path="../../mode/ecj.jar" />
<compilerclasspath path="../../mode/org.eclipse.jdt.core.jar;
../../mode/jdtCompilerAdapter.jar" />
</javac>
</target>
java/libraries/serial/build.xml
+2 -1
View File
@@ -21,7 +21,8 @@
classpath="../../../core/library/core.jar; library/jssc.jar"
nowarn="true"
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
<compilerclasspath path="../../mode/ecj.jar" />
<compilerclasspath path="../../mode/org.eclipse.jdt.core.jar;
../../mode/jdtCompilerAdapter.jar" />
</javac>
</target>