From ed20202df99380c6e2c0e6bfb592d5787ccc27cb Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Wed, 20 Nov 2002 17:36:38 +0000
Subject: [PATCH] tweaks for finishing 46

---
 app/PdeBase.java           | 14 ++++++++++++++
 app/PdeEditorConsole.java  |  7 +++++++
 build/shared/readme.txt    |  4 ++++
 build/shared/revisions.txt |  6 +++++-
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/PdeBase.java b/app/PdeBase.java
index 8f4f772d4..5da45a507 100644
--- a/app/PdeBase.java
+++ b/app/PdeBase.java
@@ -765,6 +765,20 @@ public class PdeBase extends Frame implements ActionListener {
       e.printStackTrace();
     }
 
+    // macosx fails on its own when trying to load the library
+    // so need to explicitly try here.. not sure if this is the 
+    // correct lib, but it's at least one that's loaded inside
+    // the javacomm solaris stuff, which is the .jar that's included
+    // with the osx release (and rxtx takes over)
+    if (platform == MACOSX) {
+	try {
+	    System.loadLibrary("SolarisSerialParallel");
+	} catch (UnsatisfiedLinkError e) {
+	    //e.printStackTrace();
+	    problem = true;
+	}
+    }
+
     // only warn them if this is the first time
     if (problem && firstTime) {
       JOptionPane.showMessageDialog(frame,
diff --git a/app/PdeEditorConsole.java b/app/PdeEditorConsole.java
index b6a2fb9ed..a46a62bb4 100644
--- a/app/PdeEditorConsole.java
+++ b/app/PdeEditorConsole.java
@@ -304,6 +304,13 @@ public class PdeEditorConsole extends Component {
   }
 
   public void message(String what, boolean err, boolean advance) {
+      // under osx, suppress the spew about the serial port
+      // to avoid an error every time someone loads their app
+      if (PdeBase.platform == PdeBase.MACOSX) {
+	  if (what.equals("Error loading SolarisSerial: java.lang.UnsatisfiedLinkError: no SolarisSerialParallel in java.library.path")) return;
+	  if (what.equals("Caught java.lang.UnsatisfiedLinkError: readRegistrySerial while loading driver com.sun.comm.SolarisDriver")) return;
+      }
+
     int currentLine = (firstLine + lineCount) % maxLineCount;
     lines[currentLine] = what;
     isError[currentLine] = err;
diff --git a/build/shared/readme.txt b/build/shared/readme.txt
index ead033389..958b71071 100644
--- a/build/shared/readme.txt
+++ b/build/shared/readme.txt
@@ -229,6 +229,10 @@ java applications on classic mac os are in a bad state, as apple has
 decided (rightfully so) to abandon further development of their java
 runtime under OS 9.
 
+the most recent release (revision 46), does not run under Mac OS 9. 
+this is due to a few issues that were found just before release, and
+i didn't want to hold up the release on the other platforms.
+
 speed: this version runs very slowly. the first time you hit the 'run'
 button, it might take a while to bring up the actual
 program. hopefully after that, things will improve.
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index f8c34b031..e0987f81f 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -49,8 +49,12 @@ ABOUT REV 0046 - 20 november 2002
 
 [ a few of the known issues ]
 
+- this release is not available for mac os 9. there were problems
+  just before release, and there was no point in holding up the 
+  more important platforms for another week.
+
 - download size for windows is getting enormous. in the future will
-- switch to having people download and install java 1.4 separately.
+  switch to having people download and install java 1.4 separately.
 
 - mouse wheel only works on windows, because jdk 1.4 
   is required for mouse wheel, and osx is behind the times.