From e42590a27acaaa3057eb3896b19b83e22d0e9165 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Fri, 9 Jul 2004 23:48:53 +0000
Subject: [PATCH] fixed serial problems and tested on macosx

---
 processing/app/PdeSketchbook.java |  2 +-
 processing/build/macosx/make.sh   | 18 ++++++++++++++++--
 processing/build/macosx/run.sh    |  2 +-
 processing/todo.txt               |  6 ++++--
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/processing/app/PdeSketchbook.java b/processing/app/PdeSketchbook.java
index 79f0d3ea3..dbb25316e 100644
--- a/processing/app/PdeSketchbook.java
+++ b/processing/app/PdeSketchbook.java
@@ -248,7 +248,7 @@ public class PdeSketchbook {
     // TODO this doesn't seem to ever be used. AWESOME.
     fd.setFilenameFilter(new FilenameFilter() {
         public boolean accept(File dir, String name) {
-          System.out.println("check filter on " + dir + " " + name);
+          //System.out.println("check filter on " + dir + " " + name);
           return name.endsWith(".pde");
         }
       });
diff --git a/processing/build/macosx/make.sh b/processing/build/macosx/make.sh
index 8cae44a00..61b529495 100755
--- a/processing/build/macosx/make.sh
+++ b/processing/build/macosx/make.sh
@@ -175,9 +175,10 @@ 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/lib/core.jar:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/oro.jar:$CLASSPATH
 
-../build/macosx/work/jikes +D -classpath $CLASSPATH -d ../build/macosx/work/classes *.java jeditsyntax/*.java preprocessor/*.java
+#CLASSPATH=../build/macosx/work/lib/core.jar:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/oro.jar:$CLASSPATH
+
+../build/macosx/work/jikes +D -classpath ../build/macosx/work/lib/core.jar:../build/macosx/work/lib/antlr.jar:../build/macosx/work/lib/oro.jar:$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
@@ -191,4 +192,17 @@ cd ../..
 cp work/lib/*.jar work/Processing.app/Contents/Resources/Java/
 
 
+
+### -- BUILD LIBRARIES ------------------------------------------------
+
+#CLASSPATH=../../build/macosx/work/lib/core.jar
+
+#pwd
+cd ../../lib/serial
+../../build/macosx/work/jikes +D -classpath "RXTXcomm.jar:../../build/macosx/work/lib/core.jar:$CLASSPATH" -d . *.java 
+#../../build/windows/work/jikes +D -classpath "comm.jar;$CLASSPATH" -d . *.java 
+zip -r0q serial.jar processing
+rm -rf processing
+
+
 echo Done.
\ No newline at end of file
diff --git a/processing/build/macosx/run.sh b/processing/build/macosx/run.sh
index 3a3591f4c..80d9e2edb 100755
--- a/processing/build/macosx/run.sh
+++ b/processing/build/macosx/run.sh
@@ -10,7 +10,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/antlr.jar:lib/oro.jar:lib/RXTXcomm.jar
+CLASSPATH=/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:lib/core.jar:lib/antlr.jar:lib/oro.jar:lib/RXTXcomm.jar
 
 export CLASSPATH
 
diff --git a/processing/todo.txt b/processing/todo.txt
index 686bf511b..83c079b47 100644
--- a/processing/todo.txt
+++ b/processing/todo.txt
@@ -251,6 +251,9 @@ X working on serial library
 
 040709 
 X fight with serial library on windows all afternoon
+X finish and test on macosx as well
+X remove chatter in PdeSketchbook re: filenamefilter
+X   COM1 19200 for phone
 
 _ error in System.err stream coming from running external
 _   dies after a while or goes weird
@@ -261,8 +264,7 @@ _ String in apache classes and java.lang
 _   need to be able to select between which to include
 _   auto-resolve by saying java.* wins, others ask
 
-COM1 19200
-
+_ "add library" working
 
 _ get export working again
 _   make multiple jar files thing work.. blech