add build warnings for JAVA_HOME, improve platform detection, misc todo notes

This commit is contained in:
Ben Fry
2013-02-03 10:18:32 -05:00
parent 24088f4fd4
commit ed1c8cca76
3 changed files with 46 additions and 14 deletions
+3
View File
@@ -78,11 +78,13 @@
<mkdir dir="bin" />
<!-- moved to the main build script -->
<!-- ant seems to nuke ${java.home} for some reason, pointing at the JRE
subfolder instead of the actual JDK found at JAVA_HOME.
To avoid this, we grab the actual JAVA_HOME environment variable
and use that to specify the location of tools.jar. -->
<!-- if someone is better with ant please help clean this up -->
<!--
<property environment="env" />
<property name="java_home" value="${env.JAVA_HOME}" />
<available file="${env.JAVA_HOME}/lib/tools.jar"
@@ -104,6 +106,7 @@
</condition>
<fail if="windows" unless="java_tools_found"
message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Windows, this might be c:\jdk1.6.0_19." />
-->
<javac source="1.6"
target="1.6"
+37 -11
View File
@@ -2,24 +2,50 @@
<project name="Processing" default="build">
<!-- Sets properties for macosx/windows/linux depending on current system -->
<condition property="macosx"><os family="mac" /></condition>
<condition property="windows"><os family="windows" /></condition>
<condition property="linux"><os family="unix" /></condition>
<condition property="platform"
value="macosx"><os family="mac" /> </condition>
<condition property="platform"
value="windows"><os family="windows" /> </condition>
<condition property="platform"
value="linux"><os family="unix" /> </condition>
<condition property="platform" value="macosx">
<os family="mac" />
</condition>
<!-- <echo message="" />-->
<condition property="platform" value="windows">
<os family="windows" />
</condition>
<condition property="platform" value="linux">
<and>
<os family="unix" />
<not>
<os family="mac" />
</not>
</and>
</condition>
<!-- Set a property named macosx, linux, or windows.
The 'value' chosen is arbitrary. -->
<property name="${platform}" value="${platform}" />
<property environment="env" />
<!-- code signing hack, turns on code signing during dist -->
<condition property="codesign">
<equals arg1="${env.USER}" arg2="fry" />
</condition>
<!-- Make sure that we have a legitimate JDK... This was promoted
from app/build.xml because we now need this on OS X as well. -->
<property name="java_home" value="${env.JAVA_HOME}" />
<available file="${env.JAVA_HOME}/lib/tools.jar"
property="java_tools_found" />
<fail if="windows" unless="java_tools_found"
message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Windows, this might be c:\jdk1.6.0_19." />
<fail if="macosx" unless="java_tools_found"
message="To build on OS X, you must have a full JDK installed, and set JAVA_HOME=`/usr/libexec/java_home`" />
<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." />
<!-- Figure out the platform-specific output directory for all this work. -->
<condition property="target.path"
value="macosx/work/Processing.app/Contents/Resources/Java">
<os family="mac" />
+6 -3
View File
@@ -54,6 +54,9 @@ X Library manager leaves temporary folders in sketchbook folder
X http://code.google.com/p/processing/issues/detail?id=1527
X "Auto format" should not scroll current line to first line
X http://code.google.com/p/processing/issues/detail?id=1533
X add to build instructions for OS X:
X ant won't work w/ Java 1.7 until you set JAVA_HOME
X export JAVA_HOME=`/usr/libexec/java_home`
manindra
M bug that was causing the Debugger to point to wrong break point line numbers
@@ -78,9 +81,9 @@ o if sketch was open, then restart by dragging the .pde to p5.app
https://processing-js.lighthouseapp.com/
_ add to build instructions for OS X:
_ ant won't work w/ Java 1.7 until you set JAVA_HOME
_ export JAVA_HOME=`/usr/libexec/java_home`
Exception in thread "AWT-EventQueue-0" java.lang.IllegalArgumentException: Bounds out of range: 5374,5376 [5375]
at processing.app.syntax.JEditTextArea.select(JEditTextArea.java:1214)
at processing.app.Editor.handleIndentOutdent(Editor.java:1819)
_ add Iterator as an import?