make download-jdk-macosx target work properly

This commit is contained in:
Ben Fry
2015-08-08 08:57:54 -04:00
parent 75a7096636
commit 8dabedb0ba
3 changed files with 9 additions and 2 deletions
+5 -2
View File
@@ -256,8 +256,6 @@
<available file="${jdk.path.macosx}" property="macosx_jdk_found" />
<fail if="macosx" unless="macosx_jdk_found"
message="JDK ${jdk.short} required.${line.separator}To build on OS X, you must install Oracle's JDK ${jdk.short} from${line.separator}http://www.oracle.com/technetwork/java/javase/downloads${line.separator}Note that only ${jdk.short} (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.${line.separator}Or... type 'ant download-jdk-macosx' to download it to your Desktop." />
<!--
<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." />
@@ -293,6 +291,11 @@
</fileset>
<target name="build" description="Build Processing.">
<!-- Require that a JDK be installed, but call this on build, so that
the download-jdk-macosx target can be called. -->
<fail if="macosx" unless="macosx_jdk_found"
message="JDK ${jdk.short} required.${line.separator}To build on OS X, you must install Oracle's JDK ${jdk.short} from${line.separator}http://www.oracle.com/technetwork/java/javase/downloads${line.separator}Note that only ${jdk.short} (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.${line.separator}Or... type 'ant download-jdk-macosx' to download it to your Desktop." />
<antcall target="${platform}-build" />
</target>
+2
View File
@@ -21,6 +21,8 @@ _ update wiki/docs to say "don't override sketchXxxx() methods"
3.0 final
_ move blending calculations from PImage into PGraphics
_ tricky because that means moving blend_resize() as well
_ and should that live in PGraphics or be its own class or ??
_ move AWT image loading into PImageAWT
_ look into how GL and FX will handle from there
_ run only the necessary pieces on the EDT
+2
View File
@@ -1,4 +1,6 @@
0240 (3.0b2)
X make download-jdk-macosx target work properly
_ if no platforms selected in export, will still say "done exporting!"
_ maybe if none selected, should default select the current platform
_ why are none selected in the first place? not getting saved?