more major work on megabucket, new package structure, etc

build/macosx/dist/Processing.app/Contents/Resources/MRJApp.properties

@@ -11,7 +11,9 @@ 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/antlr.jar:Contents/Resources/Java/oro.jar:Contents/Resources/Java/RXTXcomm.jar
+#com.apple.mrj.application.classpath=Contents/Resources/Java/core.jar:Contents/Resources/Java/pde.jar:Contents/Resources/Java/antlr.jar:Contents/Resources/Java/oro.jar:lib/build:Contents/Resources/Java/RXTXcomm.jar
+
+com.apple.mrj.application.classpath=Contents/Resources/Java/core.jar:Contents/Resources/Java/pde.jar:Contents/Resources/Java/antlr.jar:Contents/Resources/Java/oro.jar:lib/build
 
 
 com.apple.mrj.application.stdin=/dev/null

build/macosx/make.sh

@@ -4,21 +4,21 @@
 ### -- CHECK TO MAKE SURE BAGEL EXISTS -------------------------
 
 # move to base 'processing' directory
-cd ../..
+#cd ../..
 
 # make sure bagel exists, if not, check it out of cvs
-if test -d bagel
-then 
-  echo
-else
-  echo Doing CVS checkout of bagel...
-  cvs co bagel
-  cd bagel
-  cvs update -P
-  cd ..
-fi
+#if test -d bagel
+#then 
+#  echo
+#else
+#  echo Doing CVS checkout of bagel...
+#  cvs co bagel
+#  cd bagel
+#  cvs update -P
+#  cd ..
+#fi
 
-cd build/macosx
+#cd build/macosx
 
 
 ### -- SETUP WORK DIR -------------------------------------------
@@ -32,6 +32,7 @@ else
     echo
   else
     echo You need to install fink and fileutils
+    exit
   fi
 
   echo Setting up directories to build under Mac OS X
@@ -49,18 +50,17 @@ else
   rm reference.zip
   cd ..
 
-  mkdir work/lib/export
+#  mkdir work/lib/export
   mkdir work/lib/build
-
-  mkdir work/classes
+#  mkdir work/classes
 
   # get a copy of the mac-specific properties
   #cp dist/lib/pde_macosx.properties work/lib/
 
   # grab serial goodies
-  echo Copying serial support from bagel dir...
-  cp ../../bagel/serial/RXTXcomm.jar work/lib/
-  cp ../../bagel/serial/libSerial.jnilib work/
+#  echo Copying serial support from bagel dir...
+#  cp ../../bagel/serial/RXTXcomm.jar work/lib/
+#  cp ../../bagel/serial/libSerial.jnilib work/
 
   # copy gl4java libs and jar file
   # disabled till the next release when i can recompile for 1.4
@@ -103,7 +103,10 @@ cd ../..
 
 ### -- BUILD BAGEL ----------------------------------------------
 
-cd bagel
+#cd bagel
+cd core
+
+echo Building processing.core...
 
 # rxtx comm.jar will be included by the build script
 CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/MRJToolkit.jar
@@ -119,19 +122,22 @@ export CLASSPATH
 #perl make.pl JIKES=../build/macosx/work/jikes SONIC
 #cp classes/*.class ../build/macosx/work/lib/export/
 
-echo Building export classes for 1.1
-rm -f classes/*.class
-perl make.pl JIKES=../build/macosx/work/jikes
-cd classes
-zip -0q ../../build/macosx/work/lib/export11.jar *.class
-cd ..
+#echo Building export classes for 1.1
+#rm -f classes/*.class
+#perl make.pl JIKES=../build/macosx/work/jikes
+#cd classes
+#zip -0q ../../build/macosx/work/lib/export11.jar *.class
+#cd ..
 
-echo Building export classes for 1.3
-rm -f classes/*.class
-perl make.pl JIKES=../build/macosx/work/jikes
-cd classes
-zip -0q ../../build/macosx/work/lib/export13.jar *.class
-cd ..
+#echo Building export classes for 1.3
+#rm -f classes/*.class
+#perl make.pl JIKES=../build/macosx/work/jikes
+#cd classes
+#zip -0q ../../build/macosx/work/lib/export13.jar *.class
+#cd ..
+
+../build/macosx/work/jikes -d . +D -target 1.1 *.java
+zip -r0q ../build/macosx/work/lib/core.jar processing
 
 # head back to root "processing" dir
 cd ../app
@@ -164,12 +170,16 @@ fi
 
 ### -- BUILD PDE ------------------------------------------------
 
-echo Building PDE for JDK 1.3
+#echo Building PDE for JDK 1.3
+echo Building the PDE...
 
 # new rxtx
-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:$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:$CLASSPATH
+CLASSPATH=../build/macosx/work/lib/core.jar:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/oro.jar:$CLASSPATH
 
-perl ../bagel/buzz.pl "../build/macosx/work/jikes +D -classpath $CLASSPATH -d ../build/macosx/work/classes" -dJDK13 -dMACOS -dRXTX *.java jeditsyntax/*.java preprocessor/*.java
+../build/macosx/work/jikes +D -classpath $CLASSPATH -d ../build/macosx/work/classes *.java jeditsyntax/*.java preprocessor/*.java
+
+#perl ../bagel/buzz.pl "../build/macosx/work/jikes +D -classpath $CLASSPATH -d ../build/macosx/work/classes" -dJDK13 -dMACOS -dRXTX *.java jeditsyntax/*.java preprocessor/*.java
 #perl ../bagel/buzz.pl "javac -classpath $CLASSPATH -d ../build/macosx/work/classes" -dJDK13 -dMACOS -dRXTX *.java jeditsyntax/*.java preprocessor/*.java
 
 cd ../build/macosx/work/classes
@@ -179,3 +189,6 @@ cd ../..
 
 # get the libs
 cp work/lib/*.jar work/Processing.app/Contents/Resources/Java/
+
+
+echo Done.

build/shared/lib/pde.properties

@@ -196,7 +196,7 @@ compiler.output_parse_tree = false
 compiler.jdk_version = 1.1
 
 # base imports to include for java 1.1 (or higher)
-compiler.imports.jdk11 = java.applet,java.awt,java.awt.image,java.awt.event,java.io,java.net,java.text,java.util,java.util.zip,netscape.javascript
+compiler.imports.jdk11 = processing.core,java.applet,java.awt,java.awt.image,java.awt.event,java.io,java.net,java.text,java.util,java.util.zip,netscape.javascript
 
 # additional imports when exporting to java 1.3 or higher
 compiler.imports.jdk13 = javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi