diff --git a/processing/build/macosx/dist/Processing.app/Contents/Resources/MRJApp.properties b/processing/build/macosx/dist/Processing.app/Contents/Resources/MRJApp.properties index 612cfb2e1..ae88d1317 100755 --- a/processing/build/macosx/dist/Processing.app/Contents/Resources/MRJApp.properties +++ b/processing/build/macosx/dist/Processing.app/Contents/Resources/MRJApp.properties @@ -11,7 +11,7 @@ com.apple.mrj.application.JVMVersion=1.3.1 # this will revert back to java 1.3, since 1.4 has some issues -com.apple.mrj.application.classpath=lib/build:Contents/Resources/Java/build:Contents/Resources/Java/pde.jar:Contents/Resources/Java/kjc.jar:Contents/Resources/Java/oro.jar:Contents/Resources/Java/RXTXcomm.jar +com.apple.mrj.application.classpath=lib/build:Contents/Resources/Java/build:Contents/Resources/Java/pde.jar:Contents/Resources/Java/kjc.jar:Contents/Resources/Java/antlr.jar:Contents/Resources/Java/oro.jar:Contents/Resources/Java/RXTXcomm.jar com.apple.mrj.application.stdin=/dev/null diff --git a/processing/build/macosx/make.sh b/processing/build/macosx/make.sh index eee3f07ae..38d62bf82 100755 --- a/processing/build/macosx/make.sh +++ b/processing/build/macosx/make.sh @@ -104,15 +104,29 @@ cd app #echo Building PDE for JDK 1.4 echo Building PDE for JDK 1.3 +cd preprocessor + +# first build the default java goop +java -cp ../../build/macosx/work/lib/antlr.jar antlr.Tool java.g +java -cp ../../build/macosx/work/lib/antlr.jar antlr.Tool java.tree.g + +# now build the pde stuff that extends the java classes +java -cp ../../build/macosx/work/lib/antlr.jar antlr.Tool \ + -glib java.g pde.g +java -cp ../../build/macosx/work/lib/antlr.jar antlr.Tool \ + -glib java.tree.g pde.tree.g + +cd .. + # new rxtx -CLASSPATH=../build/macosx/work/classes:../build/macosx/work/lib/kjc.jar:../build/macosx/work/lib/oro.jar:../build/macosx/work/lib/RXTXcomm.jar:$MACOSX_CLASSPATH +CLASSPATH=../build/macosx/work/classes:../build/macosx/work/lib/kjc.jar:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/oro.jar:../build/macosx/work/lib/RXTXcomm.jar:$MACOSX_CLASSPATH #perl ../bagel/buzz.pl "jikes +D -classpath $CLASSPATH -d ../build/macosx/work/classes" -dJDK13 -dJDK14 -dMACOS -dRXTX *.java jeditsyntax/*.java -perl ../bagel/buzz.pl "jikes +D -classpath $CLASSPATH -d ../build/macosx/work/classes" -dJDK13 -dMACOS -dRXTX *.java jeditsyntax/*.java +perl ../bagel/buzz.pl "jikes +D -classpath $CLASSPATH -d ../build/macosx/work/classes" -dJDK13 -dMACOS -dRXTX *.java jeditsyntax/*.java preprocessor/*.java cd ../build/macosx/work/classes rm -f ../lib/pde.jar -zip -0q ../lib/pde.jar *.class +zip -0rq ../lib/pde.jar . cd ../.. # get the libs diff --git a/processing/build/macosx/run.sh b/processing/build/macosx/run.sh index e86e455ff..c94cf347b 100755 --- a/processing/build/macosx/run.sh +++ b/processing/build/macosx/run.sh @@ -8,7 +8,7 @@ #CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Home/lib/ext/comm.jar:/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/oro.jar:lib/RXTXcomm.jar # is qt java already included tho? -CLASSPATH=/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/oro.jar:lib/RXTXcomm.jar +CLASSPATH=/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/antlr.jar:lib/oro.jar:lib/RXTXcomm.jar export CLASSPATH diff --git a/processing/build/macosx/run13.sh b/processing/build/macosx/run13.sh index f41f75bc0..acd376feb 100755 --- a/processing/build/macosx/run13.sh +++ b/processing/build/macosx/run13.sh @@ -1,6 +1,6 @@ #!/bin/sh -CLASSPATH=/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/oro.jar:lib/RXTXcomm.jar +CLASSPATH=/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/antlr.jar:lib/oro.jar:lib/RXTXcomm.jar #CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/ext/comm.jar:/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/oro.jar:../comm.jar export CLASSPATH diff --git a/processing/build/macosx/run14.sh b/processing/build/macosx/run14.sh index c3924d7a3..9bad01a98 100755 --- a/processing/build/macosx/run14.sh +++ b/processing/build/macosx/run14.sh @@ -1,6 +1,6 @@ #!/bin/sh -CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Versions/1.4/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.4/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.4/Home/lib/ext/comm.jar:/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/oro.jar:../comm.jar +CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Versions/1.4/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.4/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.4/Home/lib/ext/comm.jar:/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/kjc.jar:lib/antlr.jar:lib/oro.jar:../comm.jar export CLASSPATH cd work && /System/Library/Frameworks/JavaVM.framework/Versions/1.4/Commands/java PdeBase