mirror of
https://github.com/processing/processing4.git
synced 2026-06-16 04:26:26 +02:00
trying again with JDK 7u40 requirement on OS X
This commit is contained in:
+9
-3
@@ -140,9 +140,12 @@
|
||||
|
||||
<!-- 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. -->
|
||||
<!-- No longer necessary, because we only require a JRE. -->
|
||||
<!--
|
||||
<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"
|
||||
@@ -151,11 +154,14 @@
|
||||
|
||||
<!-- OS X gets a second chance that covers JDK 6,
|
||||
a necessity for building on OS X 10.6. -->
|
||||
<!--
|
||||
<available file="/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar" property="java_tools_found" />
|
||||
-->
|
||||
<available file="/Library/Java/JavaVirtualMachines/jdk1.7.0_40.jdk"
|
||||
property="macosx_jdk_found" />
|
||||
|
||||
<fail if="macosx" unless="java_tools_found"
|
||||
message="To build on OS X, you must install both Apple's Java 6 and Oracle's JDK 7 (not just the plugin). Then add this line: ${line.separator}export JAVA_HOME=`/usr/libexec/java_home`${line.separator}to ~/.profile and open a new Terminal window." />
|
||||
|
||||
<fail if="macosx" unless="macosx_jdk_found"
|
||||
message="To build on OS X, you must install Oracle's JDK 7u40. You can find it at http://www.oracle.com/technetwork/java/javase/downloads Note that only 7u40 (not a later or earlier version) will work. And it needs to be the JDK, not the JRE." />
|
||||
<!--
|
||||
<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." />
|
||||
|
||||
@@ -14,11 +14,11 @@ X https://github.com/processing/processing/pull/2093
|
||||
X cmd-left is bringing up the text area popup
|
||||
X https://github.com/processing/processing/issues/2103
|
||||
|
||||
add appbundler.jar, otherwise folks have to include Xcode
|
||||
if they want to build appbundler, they'll need Xcode
|
||||
and the command line tools, from Preferences > Downloads > Command Line Tools
|
||||
appbundler will have an NPE if the osx binary isn't built
|
||||
also need to have 10.8 version of the SDK (old Xcode won't work)
|
||||
X add appbundler.jar, otherwise folks have to include Xcode
|
||||
_ if they want to build appbundler, they'll need Xcode
|
||||
_ and the command line tools Preferences > Downloads > Command Line Tools
|
||||
_ appbundler will have an NPE if the osx binary isn't built
|
||||
_ also need to have 10.8 version of the SDK (old Xcode won't work)
|
||||
|
||||
_ fix console font on Windows and Linux with 7u40
|
||||
_ the message area text also looks ugly.. can we fix?
|
||||
@@ -55,8 +55,9 @@ X from /System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/
|
||||
X the javadoc includes java.io.* and java.lang.* prefixes.. why?
|
||||
X re-run and and check in
|
||||
X upload javadoc updates
|
||||
_ remove JAVA_HOME requirement from build.xml
|
||||
_ what's needed on OS X? just the JDK 7u40?
|
||||
X need to require JDK 7u40 to be installed on OS X
|
||||
X remove JAVA_HOME requirement from build.xml
|
||||
X what's needed on OS X? just the JDK 7u40?
|
||||
|
||||
jre work
|
||||
X remove Java FX from OS X build
|
||||
|
||||
Reference in New Issue
Block a user