mirror of
https://github.com/processing/processing4.git
synced 2026-02-03 21:59:20 +01:00
deal with Contents/Java/Classes issue
This commit is contained in:
@@ -100,7 +100,7 @@ public class Compiler {
|
||||
// System.arraycopy(sourceFiles, 0, command, baseCommand.length, sourceCount);
|
||||
String[] command = PApplet.concat(baseCommand, sourceFiles);
|
||||
|
||||
//PApplet.println(command);
|
||||
// PApplet.println(command);
|
||||
|
||||
try {
|
||||
// Load errors into a local StringBuffer
|
||||
|
||||
@@ -454,6 +454,12 @@ public class JavaBuild {
|
||||
javaClassPath = javaClassPath.substring(1, javaClassPath.length() - 1);
|
||||
}
|
||||
classPath += File.pathSeparator + javaClassPath;
|
||||
|
||||
// But make sure that there isn't anything in there that's missing,
|
||||
// otherwise ECJ will complain and die. For instance, Java 1.7 (or maybe
|
||||
// it's appbundler?) adds Java/Classes to the path, which kills us.
|
||||
//String[] classPieces = PApplet.split(classPath, File.pathSeparator);
|
||||
// Nah, nevermind... we'll just create the @!#$! folder until they fix it.
|
||||
|
||||
|
||||
// 3. then loop over the code[] and save each .java file
|
||||
|
||||
@@ -488,6 +488,10 @@
|
||||
<option value="-Xmx256M" />
|
||||
</bundleapp>
|
||||
|
||||
<!-- Work around auto-included folder (from appbundler? or Oracle Java?)
|
||||
that causes the p5 Compiler to crash if it doesn't exist. -->
|
||||
<mkdir dir="macosx/work/Processing.app/Contents/Java/Classes" />
|
||||
|
||||
<copy todir="macosx/work/Processing.app/Contents/Java">
|
||||
<fileset dir=".." includes="core/library/**" />
|
||||
<fileset dir="shared" includes="launch4j/**" />
|
||||
|
||||
3
todo.txt
3
todo.txt
@@ -803,6 +803,9 @@ _ 7u40 target release is "late August"
|
||||
_ http://openjdk.java.net/projects/jdk7u/releases/7u40.html
|
||||
_ but default menu bar is still broken
|
||||
_ http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=8007267
|
||||
_ Contents/Java/Classes folder is added to java.class.path
|
||||
_ so the folder must exist otherwise the ECJ compiler will crash
|
||||
_ once fixed, remove notes from JavaBuild.java
|
||||
_ blank sketch opened even if another opened by double-click
|
||||
_ add a 150 ms or more lag before opening the untitled window (on os x)
|
||||
_ https://github.com/processing/processing/issues/218
|
||||
|
||||
Reference in New Issue
Block a user