last part of 48

build/shared/lib/pde.properties

@@ -6,7 +6,6 @@
 # a pound sign at the beginning of a line is a comment
 # parameters need to be un-commented before they take effect
 
-
 # font size for editor
 #editor.program.font=Monospaced,plain,12
 
@@ -93,6 +92,9 @@ editor.program.operator.style=#000000,plain
 #editor.auto_indent=true
 #editor.balance_parens=false
 
+# how many lines to scroll for each tick on the wheel mouse
+#editor.wheelmouse.multiplier=3
+
 #serial.port     = COM1
 #serial.rate     = 9600
 #serial.parity   = N

build/shared/readme.txt

@@ -1,6 +1,6 @@
 PROCE55ING DEVELOPMENT ENVIRONMENT
 
-RELEASE 0048 - 6 JANUARY 2003
+RELEASE 0048 - 7 JANUARY 2003
 
 (c) 2001-03 Massachusetts Institute of Technology 
 and Interaction Design Institute Ivrea
@@ -97,7 +97,7 @@ a response. if you want to go straight to the bugs page, it's:
 http://proce55ing.net/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs
 
 when reporting this "bug" please include information about
-1. the revision number (i.e. 0047)
+1. the revision number (i.e. 0048)
 2. what operating system you're using, on what kind of hardware
 3. a copy of your code
 4. details of the error, which may be the last few lines from 
@@ -138,7 +138,9 @@ keep, but some of the larger ones that we know about:
   kill the java runtime and restart your app. this will slowly be
   ironed out. 
 
-- wheel mouse is disabled again in 47
+- there is a report of the blinking text caret disappearing on
+  windows xp.. hasn't been verified just yet.. 
+
 
 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
 

build/shared/revisions.txt

@@ -15,13 +15,15 @@ ABOUT REV 0048 - 7 january 2003
 
 [ windows ] 
 
-- the release is now split in two, using 'basic' and 'advanced' versions.
-  the basic release includes a working java vm, and is all set up and 
-  ready to go. the advanced version is for people who already have java
-  installed (and don't want to deal with the 20MB download), and know what 
-  they're doing enough that they can also install the serial port code by 
-  hand. instructions on installing the serial code are in the 'serial' 
-  folder inside the advanced release.
+- the release is now split in two, using 'standard' and 'advanced'
+  versions. the standard release includes a working java vm, and is
+  all set up and ready to go. the advanced version is for people who
+  already have java installed (and don't want to deal with the 20MB
+  download), and know what they're doing enough that they can also
+  install the serial port code by hand. instructions on installing the
+  serial code are in the 'serial' folder inside the advanced release.
+
+- wheel mouse works again
 
 - increased the default memory allocation to 64 MB. 
 

build/windows/dist.sh

@@ -5,6 +5,7 @@ REVISION=`head -c 4 ../../todo.txt`
 ./make.sh
 
 echo Creating P5 distribution for revision $REVISION...
+echo
 
 # remove any old boogers
 rm -rf processing
@@ -96,6 +97,7 @@ rm -rf processing/lib/export/CVS
 cp dist/Proce55ing.exe processing/
 cp dist/run.bat processing/
 cp dist/lib/pde_windows.properties processing/lib/
+cp dist/lib/comm.jar processing/lib/
 
 # convert notes.txt to windows LFs
 # the 2> is because the app is a little chatty
@@ -105,11 +107,21 @@ unix2dos processing/lib/pde.properties 2> /dev/null
 unix2dos processing/lib/pde_windows.properties 2> /dev/null
 
 # zip it all up for release
-echo Zipping and finishing...
+echo Packaging standard release...
+echo
 P5=processing-$REVISION
 mv processing $P5
 zip -rq $P5.zip $P5
 # nah, keep the new directory around
 #rm -rf $P5
 
-echo Done.
+# zip up another for experts
+echo Packaging expert release...
+echo
+cp -r dist/serial $P5/
+rm -rf $P5/serial/CVS
+# remove enormous java runtime
+rm -rf $P5/java
+zip -rq $P5-expert.zip $P5
+
+echo Done.

build/windows/dist/run.bat

@@ -3,4 +3,4 @@
 REM --- if you need more ram, change the 64m (which means 
 REM --- 64 megabytes) to something higher. 
 
-java -ms64m -mx64m -cp lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\oro.jar PdeBase
+java -ms64m -mx64m -cp lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\oro.jar;lib\comm.jar PdeBase

build/windows/dist/serial/javax.comm.properties

@@ -0,0 +1,17 @@
+#
+# Drivers loaded by the Java Communications API standard extension
+# at initialization time
+#
+# Format:
+#	Each line must contain ONE driver definition only
+#	Each line must be of the form:
+#			driver=<ClassName>
+#		No spaces or tabs in the line.
+#		ClassName must implement the interface javax.comm.CommDriver
+#			example: driver=Win32Serial
+#	
+#
+# The hash(#) character indicates comment till end of line.
+#
+# Windows Serial Driver
+Driver=com.sun.comm.Win32Driver

build/windows/dist/serial/readme.txt

@@ -0,0 +1,12 @@
+in order to use the serial port under this "expert" version of
+Proce55ing, you need to install the serial libraries yourself.
+
+1. figure out where your java runtime is installed
+   probably something like c:\Program Files\Java\jre-1.4.1_01
+
+2. move the 'javax.comm.properties' file to the 'lib' folder 
+   of the java installation
+
+3. move the 'win32com.dll' file to the 'bin' folder of the
+   java installation
+

build/windows/launcher/launcher.cpp

@@ -109,11 +109,14 @@ BOOL CLauncherApp::InitInstance()
 	strcpy(testpath, loaddir);
 	strcat(testpath, "\\java\\bin\\java.exe");
 	FILE *fp = fopen(testpath, "rb");
+	int localJreInstalled = (fp != NULL);
+	/*
 	if (fp == NULL) {
 		AfxMessageBox("no java runtime");
 	} else {
 		AfxMessageBox("found java runtime");
 	}
+	*/
 
     sprintf(cp, 
 		"-cp \""
@@ -122,15 +125,9 @@ BOOL CLauncherApp::InitInstance()
         "%s\\lib\\pde.jar;"
 	    "%s\\lib\\kjc.jar;"
 	    "%s\\lib\\oro.jar;"
-#ifdef LOCAL_JRE
-	    "%s\\java\\lib\\ext\\comm.jar"
-#endif
+	    "%s\\lib\\comm.jar;"
 		"\" ",
-#ifdef LOCAL_JRE
 	    loaddir, loaddir, loaddir, loaddir, loaddir, loaddir);
-#else		
-	    loaddir, loaddir, loaddir, loaddir, loaddir);
-#endif
 		
 	//sprintf(cp, "-cp ");
 	//strcat(cp, JAVA_CLASSPATH);
@@ -152,14 +149,15 @@ BOOL CLauncherApp::InitInstance()
 
 	char *executable = (char *)malloc(256 * sizeof(char));
 	// loaddir is the name path to the current application
-#ifdef LOCAL_JRE
-	strcpy(executable, loaddir);
-	// copy in the path for jrew, relative to launcher.exe
-	//strcat(executable, "\\bin\\jrew");
-	strcat(executable, "\\java\\bin\\javaw");
-#else 
-	strcpy(executable, "java");
-#endif
+
+	if (localJreInstalled) {
+		strcpy(executable, loaddir);
+		// copy in the path for jrew, relative to launcher.exe
+		//strcat(executable, "\\bin\\jrew");
+		strcat(executable, "\\java\\bin\\javaw");
+	} else {
+		strcpy(executable, "javaw");
+	}
 
 	//AfxMessageBox(executable);
 

todo.txt

@@ -1,16 +1,5 @@
 0048
 
-pde
-_ re-enable wheel mouse
-System.getProperty("java.version") -> "1.4.1_01"
-
-windows
-_ remove built-in jre (!)
-X   modify run.bat, modify .exe file as well
-X add -Xmx128m -Xms128m because people running out of memory (pitaru)
-X   tried with a 3k x 1k image and things broke
-o   maybe command line read properties from a file in lib
-
 macosx
 X include note in the readme that 1.4 is not supported
 X is sketch.properties saving properly under macosx?
@@ -24,6 +13,22 @@ public void paint(Graphics g)
   super.paint(g2);       
 }
 
+pde
+X re-enable wheel mouse
+X   just uses #ifdef for JDK14
+o   System.getProperty("java.version") -> "1.4.1_01"
+
+windows
+X remove built-in jre (!)
+X   add folder and instructions for serial in expert
+X   modify run.bat, modify .exe file as well
+X add -Xmx128m -Xms128m because people running out of memory (pitaru)
+X   tried with a 3k x 1k image and things broke
+o   maybe command line read properties from a file in lib
+
+macos9 
+_ do some font tweaking (monaco 9 or 10 might be good)
+
 
 ................................................................