From 383a23db77ed861a57deaa53acb326365b0025d7 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Thu, 1 Jun 2000 14:52:29 +0000
Subject: [PATCH] ..

original commit: a0cac4c457ff307cc0f23b86d2550509e863c803
---
 collects/framework/exit.ss                    |   5 +-
 collects/framework/frameworks.ss              |   3 +-
 collects/framework/standard-menus-items.ss    |   4 +-
 collects/mzlib/restartr.ss                    | 180 ++++++
 collects/mzlib/restarts.ss                    |   6 +
 collects/mzlib/restartu.ss                    |   7 +
 collects/tests/mzscheme/unit.ss               |  20 +
 collects/userspce/init-paramr.ss              |  12 +-
 collects/userspce/interface.ss                |  22 +-
 collects/userspce/launcher-bootstrap-mred.ss  |  60 ++
 .../userspce/launcher-bootstrap-mzscheme.ss   |  22 +
 collects/userspce/launcher-bootstrap.ss       |  50 +-
 collects/zodiac/doc.txt                       |  13 +-
 collects/zodiac/scm-hanc.ss                   |   5 +-
 collects/zodiac/scm-main.ss                   |  22 +-
 notes/drscheme/HISTORY                        |  11 +
 notes/mysterx/HISTORY                         |   1 +
 src/README                                    | 106 +++-
 src/configure                                 |   2 +-
 src/mred/mred.cxx                             |   9 +-
 src/mred/mredmsw.cxx                          |   6 +-
 src/mred/wxme/wx_madm.h                       |   1 +
 src/mred/wxme/wx_mbuf.cxx                     |  16 +
 src/mzcom/mzcom.cxx                           |  13 +-
 src/mzcom/mzobj.cxx                           |  13 +-
 src/mzcom/mzobj.h                             |   1 -
 src/mzscheme/README                           |  78 ---
 src/mzscheme/configure.in                     |   2 +-
 src/mzscheme/src/file.c                       |   5 +-
 src/worksp/mzcom/mzcom.h                      |   2 +-
 src/worksp/mzcom/mzcom.mak                    | 109 ++--
 src/worksp/starters/resource.h                |  15 -
 src/worksp/starters/start.rc                  |  71 ---
 src/worksp/wxs/wxs.dsp                        | 349 -----------
 src/worksp/wxs/wxs.dsw                        |  29 -
 src/worksp/wxs/wxs.mak                        | 578 ------------------
 36 files changed, 582 insertions(+), 1266 deletions(-)
 create mode 100644 collects/mzlib/restartr.ss
 create mode 100644 collects/mzlib/restarts.ss
 create mode 100644 collects/mzlib/restartu.ss
 create mode 100644 collects/userspce/launcher-bootstrap-mred.ss
 create mode 100644 collects/userspce/launcher-bootstrap-mzscheme.ss
 delete mode 100644 src/worksp/starters/resource.h
 delete mode 100644 src/worksp/starters/start.rc
 delete mode 100644 src/worksp/wxs/wxs.dsp
 delete mode 100644 src/worksp/wxs/wxs.dsw
 delete mode 100644 src/worksp/wxs/wxs.mak

diff --git a/collects/framework/exit.ss b/collects/framework/exit.ss
index d6e6b17e..729b48bf 100644
--- a/collects/framework/exit.ss
+++ b/collects/framework/exit.ss
@@ -4,6 +4,8 @@
 	  [gui-utils : framework:gui-utils^])
   (rename (-exit exit))
   
+  (define frame-exiting (make-parameter #f))
+
   (define can?-callbacks '())
   (define on-callbacks '())
   
@@ -45,7 +47,8 @@
 		       (string-append "Are you sure you want to "
 				      w
 				      "?")]
-		      [(user-says) (gui-utils:get-choice message capw "Cancel" "Warning" #f)])
+		      [(user-says) (gui-utils:get-choice message capw "Cancel" "Warning" #f
+							 (frame-exiting))])
 	  user-says)
 	#t))
 
diff --git a/collects/framework/frameworks.ss b/collects/framework/frameworks.ss
index ed1e5151..aff205ed 100644
--- a/collects/framework/frameworks.ss
+++ b/collects/framework/frameworks.ss
@@ -61,7 +61,8 @@
   (register))
 
 (define-signature framework:exit^
-  (insert-on-callback
+  (frame-exiting
+   insert-on-callback
    insert-can?-callback
    can-exit?
    on-exit
diff --git a/collects/framework/standard-menus-items.ss b/collects/framework/standard-menus-items.ss
index 279c251c..70113c8c 100644
--- a/collects/framework/standard-menus-items.ss
+++ b/collects/framework/standard-menus-items.ss
@@ -131,7 +131,7 @@
 	(make-between 'file-menu 'close 'quit 'nothing)
 	(make-an-item 'file-menu 'quit
 		      "Quit"
-		      '(lambda (item control) (exit:exit))
+		      '(lambda (item control) (parameterize ([exit:frame-exiting this]) (exit:exit)))
 		      #\q
 		      '(if (eq? (system-type) 'windows) "E&xit" "Quit")
 		      "")
@@ -169,7 +169,7 @@
                       #\a "Select A&ll" "")
 	(make-between 'edit-menu 'select-all 'find 'separator)
 	(make-an-item 'edit-menu 'find "Search for a string in the window" #f
-		      #\f "Find..." "")
+		      #\f "Find" "...")
 	(make-an-item 'edit-menu 'find-again "Search for the same string as before" #f
 		      #\g "Find Again" "")
 	(make-an-item 'edit-menu 'replace-and-find-again 
diff --git a/collects/mzlib/restartr.ss b/collects/mzlib/restartr.ss
new file mode 100644
index 00000000..26009455
--- /dev/null
+++ b/collects/mzlib/restartr.ss
@@ -0,0 +1,180 @@
+
+(unit/sig mzlib:restart^
+  (import mzlib:command-line^)
+
+  (define (restart-mzscheme init-argv adjust-flag-table argv init-namespace)
+    (let* ([result #t]
+	   [args #f]
+	   [mute-banner? #f]
+	   [no-rep? #f]
+	   [no-coll-paths? #f]
+	   [no-init-file? #f]
+	   [case-sensitive? #f]
+	   [esc-cont-only? #f]
+	   [allow-set!-undefined? #t]
+	   [no-auto-else? #f]
+	   [no-enforce-keywords? #f]
+	   [hp-only? #f]
+	   [print-error
+	    (lambda (e)
+	      (if (exn? e)
+		  (fprintf (current-error-port) "~a~n" (exn-message e))
+		  (fprintf (current-error-port) "Exception in init file: ~e~n" e)))]
+	   [table
+	    `([multi
+	       [("-e")
+		,(lambda (f expr) expr)
+		("Evaluates <expr>" "expr")]
+	       [("-f")
+		,(lambda (f file) (format "(load ~s)" file))
+		("Loads <file>" "file")]
+	       [("-f")
+		,(lambda (f file) (format "(load/cd ~s)" file))
+		("Load/cds <file>" "file")]
+	       [("-F")
+		,(lambda (f . files) (map (lambda (file)
+					    (format "(load ~s)" file))
+					  files))
+		("Loads all <file>s" "file")]
+	       [("-D")
+		,(lambda (f . files) (map (lambda (file)
+					    (format "(load/cd ~s)" file))
+					  files))
+		("Load/cds all <file>s" "file")]
+	       [("-l")
+		,(lambda (f file) (format "(require-library ~s)" file))
+		("Requires library <file>" "file")]
+	       [("-L")
+		,(lambda (f file collection) (format "(require-library ~s ~s)" file collection))
+		("Requires library <file> in <collection>" "file" "collection")]
+	       [("-r" "--script")
+		,(lambda (f file . rest) 
+		   (format "(load ~s)" file)
+		   (set! mute-banner? #t)
+		   (set! no-rep? #t)
+		   (set! args rest))
+		("Same as -fmv-" "file" "arg")]
+	       [("-i" "--script-cd")
+		,(lambda (f file . rest) 
+		   (format "(load/cd ~s)" file)
+		   (set! mute-banner? #t)
+		   (set! no-rep? #t)
+		   (set! args rest))
+		("Same as -dmv-" "file" "arg")]
+	       [("-w" "--awk")
+		,(lambda (f) "(require-library \"awk.ss\")")
+		("Same as -l awk.ss")]
+	       [("-x" "--no-init-path")
+		,(lambda (f) (set! no-coll-paths? #t))
+		("Don't set current-library-collection-paths")]
+	       [("-q" "--no-init-file")
+		,(lambda (f) (set! no-init-file? #t))
+		("Don't load \"~/.mzschemerc\" or \"mzscheme.rc\"")]
+	       [("-g" "--case-sens")
+		,(lambda (f) (set! case-sensitive? #t))
+		("Identifiers and symbols are initially case-sensitive")]
+	       [("-c" "--esc-cont")
+		,(lambda (f) (set! esc-cont-only? #t))
+		("Call/cc is replaced with call/ec")]
+	       [("-s" "--set-undef")
+		,(lambda (f) (set! allow-set!-undefined? #t))
+		("Set! works on undefined identifiers")]
+	       [("-a" "--no-auto-else")
+		,(lambda (f) (set! no-auto-else? #t))
+		("Fall-through cond or case is an error")]
+	       [("-n" "--no-key")
+		,(lambda (f) (set! no-enforce-keywords? #t))
+		("Keywords are not enforced")]
+	       [("-y" "--hash-percent-syntax")
+		,(lambda (f) (set! hp-only? #t))
+		("Only #% syntactic forms are present")]
+	       [("-m" "--mute-banner")
+		,(lambda (f) (set! mute-banner? #t))
+		("Suppresses the startup banner text")]
+	       [("-v" "--version")
+		,(lambda (f) (set! no-rep? #t))
+		("Suppresses the read-eval-print loop")]
+	       [("--restore")
+		,(lambda (f) (error 'mzscheme "The --restore flag is not supported in this mode"))
+		("Not supported")]])])
+      (parse-command-line
+       "mzscheme"
+       argv
+       table
+       void
+       '("ignored"))
+      (set! args #f)
+      (parse-command-line
+       "mzscheme"
+       argv
+       (adjust-flag-table table)
+       (lambda (exprs . rest)
+	 (unless (null? rest)
+	   (set! args rest))
+	 ;(when args (set! rest args))
+	 (let ([n (make-namespace
+		   (if no-enforce-keywords? 'no-keywords 'keywords)
+		   (if esc-cont-only? 'call/cc=call/ec 'call/cc!=call/ec)
+		   (if hp-only? 'hash-percent-syntax 'all-syntax))])
+	   (thread-wait
+	    (thread
+	     (lambda ()
+	       (current-namespace n)
+	       (let ([program (find-system-path 'exec-file)])
+		 (read-case-sensitive case-sensitive?)
+		 (compile-allow-set!-undefined allow-set!-undefined?)
+		 (compile-allow-cond-fallthrough (not no-auto-else?))
+		 
+		 (unless mute-banner? (display (banner)))
+		 
+		 (eval `(#%define-values (argv) (#%quote ,(if args (list->vector args) (vector)))))
+		 (eval `(#%define-values (program) (#%quote ,program)))
+		 
+		 (current-library-collection-paths
+		  (if no-coll-paths?
+		      #f
+		      (path-list-string->path-list 
+		       (or (getenv "PLTCOLLECTS") "")
+		       (or
+			(ormap
+			 (lambda (f) (let ([p (f)]) (and p (directory-exists? p) (list p))))
+			 (list
+			  (lambda () (let ((v (getenv "PLTHOME")))
+				       (and v (build-path v "collects"))))
+			  (lambda () (find-executable-path program "collects"))
+			  (lambda ()
+			    (case (system-type)
+			      [(unix beos) "/usr/local/lib/plt/collects"]
+			      [(windows) "c:\\plt\\collects"]
+			      [else #f]))))
+			null)))))
+	       
+	       (init-namespace)
+	       
+	       (unless no-init-file?
+		 (let ([f (case (system-type)
+			    [(unix beos) "~/.mzschemerc"]
+			    [else "mzscheme.rc"])])
+		   (when (file-exists? f)
+		     (with-handlers ([void print-error])
+		       (load f)))))
+	       
+	       (let/ec k
+		 (exit-handler
+		  (lambda (status)
+		    (set! result status)
+		    (k #f)))
+		 (let/ec escape
+		   (for-each
+		    (lambda (e)
+		      (with-handlers ([void (lambda (e) 
+					      (print-error e) 
+					      (set! result #f)
+					      (escape #f))])
+			(eval (read (open-input-string e)))))
+		    exprs))
+		 (unless no-rep? 
+		   (read-eval-print-loop)
+		   (set! result #t))))))))
+       `("arg"))
+      result)))
diff --git a/collects/mzlib/restarts.ss b/collects/mzlib/restarts.ss
new file mode 100644
index 00000000..b6e719e1
--- /dev/null
+++ b/collects/mzlib/restarts.ss
@@ -0,0 +1,6 @@
+
+(begin-elaboration-time
+ (require-library "cmdlines.ss"))
+
+(define-signature mzlib:restart^
+  (restart-mzscheme))
diff --git a/collects/mzlib/restartu.ss b/collects/mzlib/restartu.ss
new file mode 100644
index 00000000..13d025bb
--- /dev/null
+++ b/collects/mzlib/restartu.ss
@@ -0,0 +1,7 @@
+
+(require-library "restarts.ss")
+
+(begin-elaboration-time
+ (require-library "refer.ss"))
+
+(define mzlib:restart@ (require-library-unit/sig "restartr.ss"))
diff --git a/collects/tests/mzscheme/unit.ss b/collects/tests/mzscheme/unit.ss
index 1dd3b8d6..5de6b918 100644
--- a/collects/tests/mzscheme/unit.ss
+++ b/collects/tests/mzscheme/unit.ss
@@ -411,6 +411,26 @@
 	   (define define-values 10)
 	   define-values))))
 	
+; Check set! of shadowed variable:
+(test #t unit? (unit 
+		 (import x)
+		 (export)
+		 (let ([x 10])
+		   (set! x 5))))
+(test #t unit? (unit 
+		 (import x)
+		 (export)
+		 (class object% ()
+		   (public
+		     [x 10])
+		   (sequence
+		     (set! x 5)))))
+(syntax-test '(let ([x 10])
+		(unit 
+		  (import x)
+		  (export)
+		  (set! x 5))))
+
 ; Especially for zodiac:
 (test '(b c 10 b a (c a b) (c b a) (c . c) (a) #t
 	  (nested-b a b c) (a 2 b) (10 b c) (cl-unit-a 12 c))
diff --git a/collects/userspce/init-paramr.ss b/collects/userspce/init-paramr.ss
index b4358c67..980b076f 100644
--- a/collects/userspce/init-paramr.ss
+++ b/collects/userspce/init-paramr.ss
@@ -533,7 +533,17 @@
 			(recur)])))])
            (apply values (process-file/zodiac filename process-sexps #t)))]
         [else
-         (primitive-load filename)])))
+	 (call-with-input-file filename
+	   (lambda (port)
+	     (let loop ([last-vals (list (void))])
+	       (let ([r (read port)])
+		 (if (eof-object? r)
+		     (apply values last-vals)
+		     (call-with-values
+		      (lambda () (eval r))
+		      (lambda x
+			(apply (intermediate-values-during-load) x)
+			(loop x))))))))])))
   
   ;; drscheme-eval : sexp ->* TST
   (define (drscheme-eval-handler sexp)
diff --git a/collects/userspce/interface.ss b/collects/userspce/interface.ss
index e320ea0b..6ed06e7e 100644
--- a/collects/userspce/interface.ss
+++ b/collects/userspce/interface.ss
@@ -27,24 +27,16 @@
      (with-continuation-mark 
       aries:w-c-m-key
       (aries:make-zodiac-mark object)
-      (let ([kwd? (init-substring? "kwd:" (symbol->string link-tag))])
 	(case zodiac-phase
 	  [(expander)
-	   (if kwd?
-	       (make-exn:zodiac-syntax string
-				       (current-continuation-marks)
-				       #f
-				       link-tag)
-	       (make-exn:syntax string
-				(current-continuation-marks)
-				#f))]
+	   (make-exn:zodiac-syntax string
+				   (current-continuation-marks)
+				   #f
+				   link-tag)]
 	  [(reader)
-	   (if kwd?
-	       (make-exn:zodiac-read
-		string (current-continuation-marks) #f link-tag)
-	       (make-exn:read
-		string (current-continuation-marks) #f))]
-	  [else (make-exn:user string (current-continuation-marks))])))))
+	   (make-exn:zodiac-read
+	    string (current-continuation-marks) #f link-tag)]
+	  [else (make-exn:user string (current-continuation-marks))]))))
   
   ;; report-error : symbol -> (+ zodiac:zodiac zodiac:eof zodiac:period) string (listof TST) ->* ALPHA
   ;; escapes
diff --git a/collects/userspce/launcher-bootstrap-mred.ss b/collects/userspce/launcher-bootstrap-mred.ss
new file mode 100644
index 00000000..278bf1a0
--- /dev/null
+++ b/collects/userspce/launcher-bootstrap-mred.ss
@@ -0,0 +1,60 @@
+(let* ([main-unit
+	(let ([settings settings]
+	      [teachpacks teachpacks]
+	      [filename filename]
+	      [mred@ mred@])
+	  (unit/sig drscheme-jr:settings^
+	    (import [prims : prims^]
+		    [basis : plt:basis^]
+		    [mzlib : mzlib:core^]
+		    mred^)
+	    
+	    (basis:teachpack-changed teachpacks)
+
+	    (define show-banner? #f)
+	    (define repl? #f)
+
+	    (define user-eventspace #f)
+
+	    (define (run-in-new-user-thread thunk)
+	      (set! user-eventspace (make-eventspace))
+	      (parameterize ([current-eventspace user-eventspace])
+		(let ([thread #f]
+		      [sema (make-semaphore 0)])
+		  (queue-callback (lambda ()
+				    (set! thread (current-thread))
+				    (semaphore-post sema)))
+		  (semaphore-wait sema)
+		  (queue-callback
+		   (lambda ()
+		     (thunk)))
+		  thread)))
+	    
+	    (define (number-open-windows)
+	      (parameterize ([current-eventspace user-eventspace])
+		(length (get-top-level-windows))))
+
+	    (define (load-and-repl-done)
+	      (if (= 0 (number-open-windows))
+		  (exit)
+		  (thread
+		   (rec f
+			(lambda ()
+			  (sleep 1/2)
+			  (if (= 0 (number-open-windows))
+			      (exit)
+			      (f)))))))
+
+	    (define (initialize-userspace)
+	      ;; add mred to the namespace
+	      (global-define-values/invoke-unit/sig mred^ mred@))
+
+	    (define setting (apply basis:make-setting (cdr (vector->list settings))))
+	    (define startup-file filename)))])
+  (compound-unit/sig
+    (import [prims : prims^]
+	    [basis : plt:basis^]
+	    [mzlib : mzlib:core^])
+    (link [mred : mred^ (mred@)]
+	  [main : drscheme-jr:settings^ (main-unit prims basis mzlib mred)])
+    (export (open main))))
diff --git a/collects/userspce/launcher-bootstrap-mzscheme.ss b/collects/userspce/launcher-bootstrap-mzscheme.ss
new file mode 100644
index 00000000..a27bef40
--- /dev/null
+++ b/collects/userspce/launcher-bootstrap-mzscheme.ss
@@ -0,0 +1,22 @@
+(let ([settings settings]
+      [teachpacks teachpacks]
+      [filename filename])
+  (unit/sig drscheme-jr:settings^
+    (import [prims : prims^]
+	    [basis : plt:basis^]
+	    [mzlib : mzlib:core^])
+    
+    (basis:teachpack-changed teachpacks)
+
+    (define show-banner? #f)
+    (define repl? #f)
+    (define (run-in-new-user-thread thunk)
+      (thread thunk))
+    
+    (define (load-and-repl-done)
+      (exit))
+
+    (define (initialize-userspace) (void))
+
+    (define setting (apply basis:make-setting (cdr (vector->list settings))))
+    (define startup-file filename)))
diff --git a/collects/userspce/launcher-bootstrap.ss b/collects/userspce/launcher-bootstrap.ss
index 80531a7c..73892a47 100644
--- a/collects/userspce/launcher-bootstrap.ss
+++ b/collects/userspce/launcher-bootstrap.ss
@@ -2,51 +2,9 @@
 ;; a text when the file begins with WXME so that mred saved
 ;; files still load properly.
 
-(require-library "errortrace.ss" "errortrace")
 (require-library "core.ss" "drscheme-jr")
 
-(define main-unit
-  (let ([settings settings]
-	[teachpacks teachpacks]
-	[filename filename]
-	[mred@ mred@])
-    (unit/sig drscheme-jr:settings^
-      (import [prims : prims^]
-	      [basis : plt:basis^]
-	      [mzlib : mzlib:core^]
-	      mred^)
-      
-      (basis:teachpack-changed teachpacks)
-
-      (define show-banner? #f)
-      (define repl? #f)
-      (define (run-in-new-user-thread thunk)
-	(parameterize ([current-eventspace (make-eventspace)])
-	  (let ([thread #f]
-		[sema (make-semaphore 0)])
-	    (queue-callback (lambda ()
-			      (set! thread (current-thread))
-			      (semaphore-post sema)))
-	    (semaphore-wait sema)
-	    (queue-callback
-	     thunk)
-	    thread)))
-      (define (initialize-userspace)
-
-        ;; add mred to the namespace
-	(global-define-values/invoke-unit/sig mred^ mred@))
-
-      (define setting (apply basis:make-setting (cdr (vector->list settings))))
-      (define startup-file filename))))
-
-(define go 
-  (make-go
-   (compound-unit/sig
-     (import [prims : prims^]
-	     [basis : plt:basis^]
-	     [mzlib : mzlib:core^])
-     (link [mred : mred^ (mred@)]
-	   [main : drscheme-jr:settings^ (main-unit prims basis mzlib mred)])
-     (export (open main)))))
-
-(go)
+((make-go
+  (if (defined? 'mred@)
+      (load-relative "launcher-bootstrap-mred.ss")
+      (load-relative "launcher-bootstrap-mzscheme.ss"))))
diff --git a/collects/zodiac/doc.txt b/collects/zodiac/doc.txt
index 7b551421..50f8e0c8 100644
--- a/collects/zodiac/doc.txt
+++ b/collects/zodiac/doc.txt
@@ -620,13 +620,24 @@ Tags and Language Levels
 
 This documents the language level at which each tag can appear.
 
+Misc Tags
+----------
+
+These tags can appear at any language level:
+|#(
+
+  read:syntax-error
+  scan:syntax-error
+
+#|
+
 kwd: Tags
 ---------
 
 If these are inserted at some language level, they are automatically
 present at all subsequent language levels.
 
-common:          |#(
+    common:         |#
 
   kwd:define-macro
   kwd:let-macro
diff --git a/collects/zodiac/scm-hanc.ss b/collects/zodiac/scm-hanc.ss
index 5482338f..e0439ab1 100644
--- a/collects/zodiac/scm-hanc.ss
+++ b/collects/zodiac/scm-hanc.ss
@@ -1,4 +1,4 @@
-; $Id: scm-hanc.ss,v 1.64 1999/05/23 17:31:24 mflatt Exp $
+; $Id: scm-hanc.ss,v 1.65 2000/05/28 03:47:31 shriram Exp $
 
 (define-struct signature-element (source))
 (define-struct (name-element struct:signature-element) (name))
@@ -37,7 +37,8 @@
 		      (signs sign:names))
 	    (unless (null? in)
 	      (if (memq (car signs) (cdr signs))
-		(static-error 'term:unit-double-export (car in)
+		(static-error
+		  "unit" 'term:unit-double-export (car in)
 		  "name \"~s\" is exported twice" (car signs))
 		(loop (cdr in) (cdr signs))))))
 	(let ((in (car in:all)) (sign (car sign:all)))
diff --git a/collects/zodiac/scm-main.ss b/collects/zodiac/scm-main.ss
index 2af727a8..88b833fb 100644
--- a/collects/zodiac/scm-main.ss
+++ b/collects/zodiac/scm-main.ss
@@ -1,4 +1,4 @@
-; $Id: scm-main.ss,v 1.206 2000/05/28 03:47:31 shriram Exp $
+; $Id: scm-main.ss,v 1.208 2000/05/31 18:55:21 shriram Exp $
 
 (unit/sig zodiac:scheme-main^
   (import zodiac:misc^ zodiac:structures^
@@ -430,8 +430,8 @@
 		  vars)
 		(make-internal-definition vars val))))
 	  (else
-	    (static-error expr
-	      "internal definition" 'kwd:define
+	    (static-error
+	      "internal definition" 'kwd:define expr
 	      "malformed definition"))))))
 
   (add-primitivized-micro-form 'begin internal-define-vocab-delta
@@ -1961,9 +1961,19 @@
 	      (let* ((params (pat:pexpand '(param ...) p-env kwd))
 		     (vals (pat:pexpand '(value ...) p-env kwd))
 		     (body (pat:pexpand body p-env kwd))
-		     (pzs (map generate-name params))
-		     (saves (map generate-name params))
-		     (swap (generate-name (structurize-syntax 'swap expr '(-1)))))
+		      ;; The following two have this strange code
+		      ;; because generate-name expects a z:symbol,
+		      ;; but the param can be an arbitrary expression,
+		      ;; not just the name of a parameter
+		     (pzs (map generate-name
+			    (map (lambda (param)
+				   (structurize-syntax 'pz param '(-1)))
+			      params)))
+		      (saves (map generate-name
+			      (map (lambda (param)
+				     (structurize-syntax 'save param '(-1)))
+				params)))
+		      (swap (generate-name (structurize-syntax 'swap expr '(-1)))))
 		(expand-expr
 		 (structurize-syntax
 		  (if (null? params)
diff --git a/notes/drscheme/HISTORY b/notes/drscheme/HISTORY
index 783ff5d8..da3871d0 100644
--- a/notes/drscheme/HISTORY
+++ b/notes/drscheme/HISTORY
@@ -11,6 +11,17 @@ Version 102:
 
  MINOR CHANGES AND BUG FIXES
 
+ - added parents for these dialogs:
+
+     Keybindings 
+     Choose Language...
+     Add Teachpack...
+     Create Launcher -> "you must save before creating a launcher" message box
+     "The thread has been killed" message box
+     "Uncaught Error"
+     Break, Break -> "do you want to kill it?" message box
+     Click unbound id in DrScheme -> "nothing found for <id>" message box
+
  - Only the platform-specific dialogs are used in drscheme now, on
    all platforms. The preference has been removed from the dialog.
 
diff --git a/notes/mysterx/HISTORY b/notes/mysterx/HISTORY
index cb3834f1..01b73e92 100644
--- a/notes/mysterx/HISTORY
+++ b/notes/mysterx/HISTORY
@@ -35,6 +35,7 @@ fixed GC-related problems with COM
  event handlers
 fixed error text formatting bug when 
  COM methods returned an error code
+improved Makefiles
 DHTML test code added, 
  plt/tests/mysterx/dhtmltests.ss
 
diff --git a/src/README b/src/README
index 69dc93c1..0887f2a6 100644
--- a/src/README
+++ b/src/README
@@ -40,8 +40,8 @@ below.
  Compiling for MacOS
 ========================================================================
 
-Unpack the Compactor archive plt:src:cw.cpt to plt:src:cw and then
-see `ABOUT MzScheme' and `ABOUT MrEd' in that folder.
+Unpack the Stuffit archive plt:src:cw.sit.hqz to plt:src:cw, and then
+see `README' in that folder.
 
 ========================================================================
  Compiling for Unix (including Linux), Cygwin, or BeOS
@@ -131,3 +131,105 @@ see `ABOUT MzScheme' and `ABOUT MrEd' in that folder.
     the .zo files, too, but add -n to the end of the command to skip
     the .zo-compiling step. Afterwards, `plt/Setup PLT.exe' and
     `plt/mzc.exe' work.
+
+========================================================================
+ Compiling the OSKit-based kernel
+========================================================================
+
+To build the OSKit-based MzScheme kernel, run the configure script
+with the --enable-oskit or --enable-smalloskit flag. The result of
+compiling will be `mzscheme.multiboot' in the `mzscheme' build
+directory. It is a kernel in multiboot format.
+
+Before building the MzScheme kernel, you must first install OSKit,
+which is available from the Flux Research Group at Utah:
+     http://www.cs.utah.edu/projects/flux/oskit/
+
+By default, configure assumes that OSKit is installed in
+/usr/local. To specify a different location for OSKit, define the
+OSKHOME environment variable.
+
+For simplicity, the MzScheme kernel uses SGC rather than Boehm's
+conservative garbage collector.
+
+The --enable-smalloskit configuration produces a kernel without
+networking or filesystem support. The kernel created by
+--enable--oskit accepts filesystem and networking configuration
+information on its multiboot command line via the --fs and --net
+flags:
+
+  --fs <drive> <partition> : mounts the given partition as the root
+   directory. For example, to mount the seventh parition on main disk,
+   supply: --fs hda f. Many filesystem formats are supported,
+   including EXT2, MSDOS, and VFAT (all of the ones supported by
+   Linux; see OSKit for details). The standard kernel can only mount
+   one filesystem per run; hack main.c to get more.
+
+  --net <address> <netmask> <gateway> : initializes ethernet support
+   for MzScheme's TCP primitives. Example: --net 128.42.6.101
+   255.255.255.0 128.42.6.254. Many types of ethernet cards are
+   supported (the ones supported by FreeBSD; see OSKit for details).
+
+Each of --fs and --net should be used once at most. The --fs and --net
+flags must appear before any other command-line arguments, which are
+handled by MzScheme in the usual way.
+
+To access a filesystem or the network from non-multiboot kernels
+(e.g., a LILO-compatible kernel), you must hardwire filesystem and
+networking parameters in oskglue.inc when compiling the kernel; see
+oskglue.inc for details (grep for `hardwire').
+
+========================================================================
+ Additional Compilation Notes
+========================================================================
+
+Garbage Collector
+-----------------
+
+The conservative garbage collector distributed with MzScheme (in the
+gc directory) has been modified slightly from Boehm's standard
+distribution. Mostly, the change modify the way that object
+finalization is handled.
+
+Precise GC
+----------
+
+MzScheme and MrEd can be compiled to an experimental form that uses
+precise garbage collection (as opposed to "conservation garbage
+collection") on some Unix platforms, including Linux, FreeBSD, and
+Solaris. The precisely-collected forms are called MzScheme2k and
+MrEd2k, repsectively.
+
+To build MzScheme2k and MrEd2k, run `gnumake 2k'. Building MzScheme2k
+and MrEd2k first builds the normal MzScheme and MrEd executables, and
+uses them to build the 2k versions.
+
+Configuration Options
+---------------------
+
+By default, MzScheme is compiled:
+
+ * without image dumps (since the application will probably be linked
+   dynamically);
+
+ * without using any OS-specific threads; and
+
+ * without support for single-precision floating point numbers.
+
+These options can be modified by setting flags in mzscheme/sconfig.h.
+MrEd works only *without* OS-specific threads.
+
+Modifying MzScheme
+------------------
+
+If you modify MzScheme and change any primitive syntax or the
+collection of built-in identifers, be sure to turn off
+USE_COMPILED_MACROS in schminc.h. Otherwise, MzScheme won't start.
+See schminc.h for details.
+
+Guile Compatibility Library
+---------------------------
+
+In the mzscheme/ directory, `make libguile' produces a libguile.a
+library that implements the high-level guile interface. See
+mzscheme/libguile/README.
diff --git a/src/configure b/src/configure
index 43b1f7b0..2a7680f6 100755
--- a/src/configure
+++ b/src/configure
@@ -2073,7 +2073,7 @@ if test "${enable_wbuild}" = "yes" ; then
   WBUILD="$WBUILD -p . \$(srcdir)/x/wbuild/wbuild.cfg"
 else
   MAKE_WBUILD=
-  WBUILD="bash \$(PLTSRCDIR)/wxxt/src/XWidgets/dummy.wbuild"
+  WBUILD="sh \$(PLTSRCDIR)/wxxt/src/XWidgets/dummy.wbuild"
 fi
 
 ############## platform tests ################
diff --git a/src/mred/mred.cxx b/src/mred/mred.cxx
index dfd02f81..07b5ac28 100644
--- a/src/mred/mred.cxx
+++ b/src/mred/mred.cxx
@@ -1809,16 +1809,17 @@ static void MrEdSchemeMessages(char *msg, ...)
 #if WINDOW_STDIO
   if (!msg) {
     char *s;
-    long l;
+    long d, l;
     
     s = va_arg(args, char*);
+    d = va_arg(args, long);
     l = va_arg(args, long);
 
     if (!ioFrame->beginEditSeq) {
       ioFrame->media->BeginEditSequence();
       ioFrame->beginEditSeq = 1;
     }
-    ioFrame->media->Insert(l, s, ioFrame->endpos);
+    ioFrame->media->Insert(l, s + d, ioFrame->endpos);
     ioFrame->endpos += l;
 
     if (l != 1 || s[0] == '\n') {
@@ -1862,7 +1863,7 @@ static void MrEdSchemeMessages(char *msg, ...)
 
 static void MrEdSchemeMessagesOutput(char *s, long l)
 {
-  MrEdSchemeMessages(NULL, s, l);
+  MrEdSchemeMessages(NULL, s, 0, l);
 }
 #endif
 
@@ -1919,7 +1920,7 @@ static Scheme_Object *MrEdMakeStdIn(void)
 static void stdout_write(char *s, long d, long l, Scheme_Output_Port*)
 {
 #if WINDOW_STDIO || WCONSOLE_STDIO
-  MrEdSchemeMessages(NULL, s, l);
+  MrEdSchemeMessages(NULL, s, d, l);
 #else
   static FILE *out = NULL;
 
diff --git a/src/mred/mredmsw.cxx b/src/mred/mredmsw.cxx
index bedf2c5a..ad15100e 100644
--- a/src/mred/mredmsw.cxx
+++ b/src/mred/mredmsw.cxx
@@ -38,6 +38,8 @@ typedef struct LeaveEvent {
   struct LeaveEvent *next;
 } LeaveEvent;
 
+# define WM_MRED_LEAVE (WM_USER + 0x111)
+
 void MrEdInitFirstContext(MrEdContext *c)
 {
 }
@@ -157,7 +159,7 @@ static BOOL CALLBACK CheckWindow(HWND wnd, LPARAM param)
       if (info->remove) {
 	info->wnd = wnd;
 	info->c_return = c;
-	info->msg->message = WM_USER + 1;
+	info->msg->message = WM_MRED_LEAVE;
 	info->msg->lParam = (long)c->queued_leaves;
 	c->queued_leaves = c->queued_leaves->next;
       }
@@ -221,7 +223,7 @@ int MrEdGetNextEvent(int check_only, int current_only,
 
 void MrEdDispatchEvent(MSG *msg)
 {
-  if (msg->message == WM_USER + 1) {
+  if (msg->message == WM_MRED_LEAVE) {
     /* Queued leave event */
     LeaveEvent *e = (LeaveEvent *)msg->lParam;
     wxDoLeaveEvent(e->wnd, e->x, e->y, e->flags);
diff --git a/src/mred/wxme/wx_madm.h b/src/mred/wxme/wx_madm.h
index 4abd68a7..82805e39 100644
--- a/src/mred/wxme/wx_madm.h
+++ b/src/mred/wxme/wx_madm.h
@@ -15,6 +15,7 @@ class wxMediaAdmin : public wxObject
  private:
   friend class wxMediaCanvas;
   friend class wxMediaEdit;
+  friend class wxMediaBuffer;
   friend class wxCanvasMediaAdmin;
   int standard; /* Used to recognize standard display. Hack. */
   
diff --git a/src/mred/wxme/wx_mbuf.cxx b/src/mred/wxme/wx_mbuf.cxx
index 75fe3888..e1e44174 100644
--- a/src/mred/wxme/wx_mbuf.cxx
+++ b/src/mred/wxme/wx_mbuf.cxx
@@ -29,6 +29,9 @@
 # include "wx_cmdlg.h"
 #endif
 #include "wx_print.h"
+#ifdef wx_xt
+# include "wx_types.h"
+#endif
 
 #include "wx_media.h"
 #ifndef OLD_WXWINDOWS
@@ -1268,6 +1271,19 @@ void wxMediaBuffer::Print(Bool interactive, Bool fitToPage, int WXUNUSED_X(outpu
   ps = 1;
 #endif
 
+  if (!parent) {
+    if (admin && (admin->standard > 0)) {
+      wxWindow *w = ((wxCanvasMediaAdmin *)admin)->GetCanvas();
+
+      while (w && !wxSubType(w->__type, wxTYPE_FRAME)
+	     && !wxSubType(w->__type, wxTYPE_DIALOG_BOX))
+	w = w->GetParent();
+
+      if (w)
+	parent = w;
+    }
+  }
+
   if (ps) {
     wxDC *dc;
     void *data;
diff --git a/src/mzcom/mzcom.cxx b/src/mzcom/mzcom.cxx
index 069f4977..568ae2f0 100644
--- a/src/mzcom/mzcom.cxx
+++ b/src/mzcom/mzcom.cxx
@@ -1,16 +1,11 @@
-// MzCOM.cpp : Implementation of WinMain
-
-
-// Note: Proxy/Stub Information
-//      To build a separate proxy/stub DLL, 
-//      run nmake -f MzCOMps.mk in the project directory.
+// mzcom.cxx : Implementation of WinMain
 
 #include "stdafx.h"
 #include "resource.h"
 #include <initguid.h>
 #include "mzcom.h"
 
-#include "MzCOM_i.c"
+#include "mzcom_i.c"
 #include "mzobj.h"
 
 // time for EXE to be idle before shutting down
@@ -34,12 +29,12 @@ LONG CExeModule::Unlock()
     if (l == 0)
     {
         bActivity = true;
-        SetEvent(hEventShutdown); // tell monitor that we transitioned to zero
+        SetEvent(hEventShutdown);
     }
     return l;
 }
 
-//Monitors the shutdown event
+// Monitors the shutdown event
 void CExeModule::MonitorShutdown()
 {
     while (1)
diff --git a/src/mzcom/mzobj.cxx b/src/mzcom/mzobj.cxx
index 8e074118..e19df075 100644
--- a/src/mzcom/mzobj.cxx
+++ b/src/mzcom/mzobj.cxx
@@ -239,7 +239,6 @@ void CMzObj::startMzThread(void) {
 
 
 CMzObj::CMzObj(void) {
-  lastOutput = NULL;
   inputMutex = NULL;
   readSem = NULL;
   threadId = NULL;
@@ -312,10 +311,6 @@ void CMzObj::killMzThread(void) {
 
 CMzObj::~CMzObj(void) {
 
-  if (lastOutput) {
-    SysFreeString(lastOutput); 
-  }
-
   killMzThread();
 
   if (readSem) {
@@ -366,17 +361,11 @@ BOOL CMzObj::testThread(void) {
 // CMzObj
 
 STDMETHODIMP CMzObj::Eval(BSTR input, BSTR *output) {
-
   if (!testThread()) {
     return E_ABORT;
   }
 
   WaitForSingleObject(inputMutex,INFINITE);
-  if (lastOutput) {
-    SysFreeString(lastOutput);
-    lastOutput = NULL;
-  }
-
   globInput = &input;
   // allow evaluator to read
   ReleaseSemaphore(readSem,1,NULL);
@@ -388,7 +377,7 @@ STDMETHODIMP CMzObj::Eval(BSTR input, BSTR *output) {
     return E_FAIL;
   }
 
-  lastOutput = *output = globOutput;
+  *output = globOutput;
   ReleaseSemaphore(inputMutex,1,NULL);
 
   if (errorState) {
diff --git a/src/mzcom/mzobj.h b/src/mzcom/mzobj.h
index ca4fd9ba..1e9bc2cb 100644
--- a/src/mzcom/mzobj.h
+++ b/src/mzcom/mzobj.h
@@ -43,7 +43,6 @@ class ATL_NO_VTABLE CMzObj :
     HANDLE evalDoneSems[2];
     BSTR *globInput;
     BSTR globOutput;
-    BSTR lastOutput;
     DWORD threadId;
     HANDLE threadHandle;
     BOOL errorState;
diff --git a/src/mzscheme/README b/src/mzscheme/README
index 20264692..2f4ffade 100644
--- a/src/mzscheme/README
+++ b/src/mzscheme/README
@@ -5,81 +5,3 @@ information on compiling it.
 Compiled binaries, documentation, and up-to-date information about
 MzScheme are at:
  http://www.cs.rice.edu/CS/PLT/packages/mzscheme/
-
-========================================================================
- Compiling the OSKit-based kernel
-========================================================================
-
-To build the OSKit-based MzScheme kernel, run the configure script
-with the --enable-oskit or --enable-smalloskit flag. The result will
-be `mzscheme.multiboot' in the `mzscheme' build directory. It is a
-kernel in multiboot format.
-
-Before building the MzScheme kernel, you must first install OSKit,
-which is available from the Flux Research Group at Utah:
-     http://www.cs.utah.edu/projects/flux/oskit/
-
-By default, configure assumes that OSKit is installed in
-/usr/local. To specify a different location for OSKit, define the
-OSKHOME environment variable.
-
-For simplicity, the MzScheme kernel uses SGC rather than Boehm's
-conservative garbage collector.
-
-The --enable-smalloskit configuration produces a kernel without
-networking or filesystem support. The kernel created by
---enable--oskit accepts filesystem and networking configuration
-information on its multiboot command line via the --fs and --net
-flags:
-
-  --fs <drive> <partition> : mounts the given partition as the root
-   directory. For example, to mount the seventh parition on main disk,
-   supply: --fs hda f. Many filesystem formats are supported,
-   including EXT2, MSDOS, and VFAT (all of the ones supported by
-   Linux; see OSKit for details). The standard kernel can only mount
-   one filesystem per run; hack main.c to get more.
-
-  --net <address> <netmask> <gateway> : initializes ethernet support
-   for MzScheme's TCP primitives. Example: --net 128.42.6.101
-   255.255.255.0 128.42.6.254. Many types of ethernet cards are
-   supported (the ones supported by FreeBSD; see OSKit for details).
-
-Each of --fs and --net should be used once at most. The --fs and --net
-flags must appear before any other command-line arguments, which are
-handled by MzScheme in the usual way.
-
-To access a filesystem or the network from non-multiboot kernels
-(e.g., a LILO-compatible kernel), you must hardwire filesystem and
-networking parameters in oskglue.inc when compiling the kernel; see
-oskglue.inc for details (grep for `hardwire').
-
-========================================================================
- General Compilation Notes
-========================================================================
-
-By default, MzScheme is compiled:
-
- * without image dumps (since the application will probably be linked
-   dynamically);
-
- * without using any OS-specific threads; and
-
- * without support for single-precision floating point numbers.
-
-The conservative garbage collector distributed with MzScheme (in the
-gc directory) has been modified slightly from Boehm's standard
-distribution.
-
-If you modify MzScheme and change any primitive syntax or the
-collection of built-in identifers, be sure to turn off
-USE_COMPILED_MACROS in schminc.h. Otherwise, MzScheme won't start.
-See schminc.h for details.
-
-========================================================================
- Miscellaneous
-========================================================================
-
-See plt/collects/mzscheme/examples/ for some example extensions.
-
-`make libguile' produces a libguile.a library that implements the
-high-level guile interface. See libguile/README.
diff --git a/src/mzscheme/configure.in b/src/mzscheme/configure.in
index a1d4d35a..6ae8c6fe 100644
--- a/src/mzscheme/configure.in
+++ b/src/mzscheme/configure.in
@@ -150,7 +150,7 @@ if test "${enable_wbuild}" = "yes" ; then
   WBUILD="$WBUILD -p . \$(srcdir)/x/wbuild/wbuild.cfg"
 else
   MAKE_WBUILD=
-  WBUILD="bash \$(PLTSRCDIR)/wxxt/src/XWidgets/dummy.wbuild"
+  WBUILD="sh \$(PLTSRCDIR)/wxxt/src/XWidgets/dummy.wbuild"
 fi
 
 ############## platform tests ################
diff --git a/src/mzscheme/src/file.c b/src/mzscheme/src/file.c
index d3d5a730..7837ef3b 100644
--- a/src/mzscheme/src/file.c
+++ b/src/mzscheme/src/file.c
@@ -3448,6 +3448,9 @@ static Scheme_Object *collpaths_gen_p(int argc, Scheme_Object **argv, int rel)
     if (rel && !scheme_is_relative_path(SCHEME_STR_VAL(s),
 					SCHEME_STRTAG_VAL(s)))
       return NULL;
+    if (!rel && !scheme_is_complete_path(SCHEME_STR_VAL(s),
+					 SCHEME_STRTAG_VAL(s)))
+      return NULL;
     v = SCHEME_CDR(v);
   }
 
@@ -3491,7 +3494,7 @@ static Scheme_Object *current_library_collection_paths(int argc, Scheme_Object *
   return scheme_param_config("current-library-collection-paths", 
 			     scheme_make_integer(MZCONFIG_COLLECTION_PATHS),
 			     argc, argv,
-			     -1, collpaths_p, "list of strings", 1);
+			     -1, collpaths_p, "list of complete path strings", 1);
 }
 
 static Scheme_Object *collpaths_rel_p(int argc, Scheme_Object **argv)
diff --git a/src/worksp/mzcom/mzcom.h b/src/worksp/mzcom/mzcom.h
index 30effdf3..81959798 100644
--- a/src/worksp/mzcom/mzcom.h
+++ b/src/worksp/mzcom/mzcom.h
@@ -2,7 +2,7 @@
 
 
 /* File created by MIDL compiler version 5.01.0164 */
-/* at Thu May 25 13:43:33 2000
+/* at Wed May 31 11:50:51 2000
  */
 /* Compiler settings for D:\plt\src\mzcom\mzcom.idl:
     Os (OptLev=s), W1, Zp8, env=Win32, ms_ext, c_ext
diff --git a/src/worksp/mzcom/mzcom.mak b/src/worksp/mzcom/mzcom.mak
index fbe88aa8..765602a4 100644
--- a/src/worksp/mzcom/mzcom.mak
+++ b/src/worksp/mzcom/mzcom.mak
@@ -25,16 +25,12 @@ NULL=
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "MzCOM - Win32 Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
 
-ALL : "..\..\..\collects\mzcom\mzcom.exe" ".\Debug\regsvr32.trg"
+ALL : "..\..\..\collects\mzcom\mzcom.exe" ".\mzcom.tlb" ".\Debug\regsvr32.trg"
 
 
 CLEAN :
@@ -52,7 +48,42 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /MTd /W3 /Gm /ZI /Od /I "..\..\..\collects\mzscheme\include" /I "..\..\mzcom" /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /Fp"$(INTDIR)\MzCOM.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=
+RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mzcom.res" /i ".\..\mzcom" /d "_DEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\MzCOM.bsc" 
@@ -104,7 +135,42 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /MT /W3 /O1 /I "..\..\mzcom" /I "." /I "..\..\..\collects\mzscheme\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /Fp"$(INTDIR)\MzCOM.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=
+RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mzcom.res" /i "..\..\mzcom" /d "NDEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\MzCOM.bsc" 
@@ -138,37 +204,6 @@ SOURCE="$(InputPath)"
 
 !ENDIF 
 
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL_PROJ=
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("MzCOM.dep")
@@ -248,7 +283,7 @@ SOURCE=..\..\mzcom\mzobj.cxx
 
 SOURCE=.\mzcom.rc
 
-"$(INTDIR)\mzcom.res" : $(SOURCE) "$(INTDIR)" ".\mzcom.tlb"
+"$(INTDIR)\mzcom.res" : $(SOURCE) "$(INTDIR)"
 	$(RSC) $(RSC_PROJ) $(SOURCE)
 
 
diff --git a/src/worksp/starters/resource.h b/src/worksp/starters/resource.h
deleted file mode 100644
index fac80ca2..00000000
--- a/src/worksp/starters/resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by Script2.rc
-//
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/src/worksp/starters/start.rc b/src/worksp/starters/start.rc
deleted file mode 100644
index a580ea53..00000000
--- a/src/worksp/starters/start.rc
+++ /dev/null
@@ -1,71 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-#ifdef MRSTART
-APPLICATION             ICON    DISCARDABLE     "mrstart.ico"
-#endif
-#ifdef MZSTART
-APPLICATION             ICON    DISCARDABLE     "mzstart.ico"
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Rice University\0"
-#ifdef MRSTART
-            VALUE "FileDescription", "MrEd Launcher\0"
-#endif
-#ifdef MZSTART
-            VALUE "FileDescription", "MzScheme Launcher\0"
-#endif
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-#ifdef MRSTART
-            VALUE "InternalName", "mrstart\0"
-#endif
-#ifdef MZSTART
-            VALUE "InternalName", "mzstart\0"
-#endif
-            VALUE "LegalCopyright", "Copyright © 1996-99\0"
-#ifdef MRSTART
-            VALUE "OriginalFilename", "MrStart.exe\0"
-            VALUE "ProductName", "Rice University MrEd Launcher\0"
-#endif
-#ifdef MZSTART
-            VALUE "OriginalFilename", "MzStart.exe\0"
-            VALUE "ProductName", "Rice University MzScheme Launcher\0"
-#endif
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/src/worksp/wxs/wxs.dsp b/src/worksp/wxs/wxs.dsp
deleted file mode 100644
index 4b96084a..00000000
--- a/src/worksp/wxs/wxs.dsp
+++ /dev/null
@@ -1,349 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wxs" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=wxs - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "wxs.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wxs.mak" CFG="wxs - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxs - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxs - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxs - Win32 SGC" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "wxs - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\Release"
-# PROP Intermediate_Dir ".\Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MT /W3 /Zi /O2 /I "..\..\mzscheme\gc" /I "..\..\wxwindow\include\base" /I "..\..\wxwindow\include\msw" /I "..\..\mzscheme\include" /I "..\..\mred\wxme" /I "..\..\mzscheme\utils" /I "..\..\wxwindow\contrib\fafa" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /YX"wx.h" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "wxs - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\Debug"
-# PROP Intermediate_Dir ".\Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\..\mzscheme\gc" /I "..\..\wxwindow\include\base" /I "..\..\wxwindow\include\msw" /I "..\..\mzscheme\include" /I "..\..\mred\wxme" /I "..\..\mzscheme\utils" /I "..\..\wxwindow\contrib\fafa" /D "__DEBUG" /D "__STDC__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /YX"wx.h" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "wxs - Win32 SGC"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\wxs___Wi"
-# PROP BASE Intermediate_Dir ".\wxs___Wi"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\SGC"
-# PROP Intermediate_Dir ".\SGC"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /Zi /Od /I "..\..\wxwindow\include\base" /I "..\..\wxwindow\include\msw" /I "..\..\mzscheme\include" /I "..\..\mzscheme\gc" /I "..\..\mred\wxme" /I "..\..\mzscheme\utils" /D "__DEBUG" /D "__STDC__" /D "WIN32" /D "_WINDOWS" /D "WXS_CANT_ASSIGN_STRUCTURES" /D "WINNT" /D "__WINDOWS__" /D "WXME_FOR_MRED" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\..\mzscheme\sgc" /I "..\..\wxwindow\include\base" /I "..\..\wxwindow\include\msw" /I "..\..\mzscheme\include" /I "..\..\mred\wxme" /I "..\..\mzscheme\utils" /I "..\..\wxwindow\contrib\fafa" /D "__DEBUG" /D "__STDC__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "USE_SENORA_GC" /YX"wx.h" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "wxs - Win32 Release"
-# Name "wxs - Win32 Debug"
-# Name "wxs - Win32 SGC"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_BMAP.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_BUTN.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_CHCE.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_CKBX.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_CNVS.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_DC.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_EVNT.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_FRAM.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_GAGE.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_GDI.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_GLOB.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_ITEM.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_LBOX.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_MADM.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_MEDE.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_MEDI.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_MENU.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_MIO.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_MISC.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_MPB.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_OBJ.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_PANL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_RADO.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_SLID.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_SNIP.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_STYL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXS_WIN.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\WXSCHEME.cxx
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_bmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_butn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_chce.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_ckbx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_cnvs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_dc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_evnt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_fram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_gage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_gdi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_glob.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_item.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_lbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_madm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_mede.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_medi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_menu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_mio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_mpb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_obj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_panl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_rado.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_slid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_snip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_styl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_text.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxs_win.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mred\Wxs\wxscheme.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/src/worksp/wxs/wxs.dsw b/src/worksp/wxs/wxs.dsw
deleted file mode 100644
index 8127dafc..00000000
--- a/src/worksp/wxs/wxs.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "wxs"=.\wxs.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/src/worksp/wxs/wxs.mak b/src/worksp/wxs/wxs.mak
deleted file mode 100644
index 7760cb7d..00000000
--- a/src/worksp/wxs/wxs.mak
+++ /dev/null
@@ -1,578 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on wxs.dsp
-!IF "$(CFG)" == ""
-CFG=wxs - Win32 Release
-!MESSAGE No configuration specified. Defaulting to wxs - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "wxs - Win32 Release" && "$(CFG)" != "wxs - Win32 Debug" && "$(CFG)" != "wxs - Win32 SGC"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wxs.mak" CFG="wxs - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxs - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxs - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxs - Win32 SGC" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "wxs - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-ALL : "$(OUTDIR)\wxs.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(INTDIR)\WXS_BMAP.obj"
-	-@erase "$(INTDIR)\WXS_BUTN.obj"
-	-@erase "$(INTDIR)\WXS_CHCE.obj"
-	-@erase "$(INTDIR)\WXS_CKBX.obj"
-	-@erase "$(INTDIR)\WXS_CNVS.obj"
-	-@erase "$(INTDIR)\WXS_DC.obj"
-	-@erase "$(INTDIR)\WXS_EVNT.obj"
-	-@erase "$(INTDIR)\WXS_FRAM.obj"
-	-@erase "$(INTDIR)\WXS_GAGE.obj"
-	-@erase "$(INTDIR)\WXS_GDI.obj"
-	-@erase "$(INTDIR)\WXS_GLOB.obj"
-	-@erase "$(INTDIR)\WXS_ITEM.obj"
-	-@erase "$(INTDIR)\WXS_LBOX.obj"
-	-@erase "$(INTDIR)\WXS_MADM.obj"
-	-@erase "$(INTDIR)\WXS_MEDE.obj"
-	-@erase "$(INTDIR)\WXS_MEDI.obj"
-	-@erase "$(INTDIR)\WXS_MENU.obj"
-	-@erase "$(INTDIR)\WXS_MIO.obj"
-	-@erase "$(INTDIR)\WXS_MISC.obj"
-	-@erase "$(INTDIR)\WXS_MPB.obj"
-	-@erase "$(INTDIR)\WXS_OBJ.obj"
-	-@erase "$(INTDIR)\WXS_PANL.obj"
-	-@erase "$(INTDIR)\WXS_RADO.obj"
-	-@erase "$(INTDIR)\WXS_SLID.obj"
-	-@erase "$(INTDIR)\WXS_SNIP.obj"
-	-@erase "$(INTDIR)\WXS_STYL.obj"
-	-@erase "$(INTDIR)\WXS_WIN.obj"
-	-@erase "$(INTDIR)\WXSCHEME.obj"
-	-@erase "$(OUTDIR)\wxs.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MT /W3 /Zi /O2 /I "..\..\mzscheme\gc" /I "..\..\wxwindow\include\base" /I "..\..\wxwindow\include\msw" /I "..\..\mzscheme\include" /I "..\..\mred\wxme" /I "..\..\mzscheme\utils" /I "..\..\wxwindow\contrib\fafa" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /Fp"$(INTDIR)\wxs.pch" /YX"wx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\wxs.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\wxs.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\WXS_BMAP.obj" \
-	"$(INTDIR)\WXS_BUTN.obj" \
-	"$(INTDIR)\WXS_CHCE.obj" \
-	"$(INTDIR)\WXS_CKBX.obj" \
-	"$(INTDIR)\WXS_CNVS.obj" \
-	"$(INTDIR)\WXS_DC.obj" \
-	"$(INTDIR)\WXS_EVNT.obj" \
-	"$(INTDIR)\WXS_FRAM.obj" \
-	"$(INTDIR)\WXS_GAGE.obj" \
-	"$(INTDIR)\WXS_GDI.obj" \
-	"$(INTDIR)\WXS_GLOB.obj" \
-	"$(INTDIR)\WXS_ITEM.obj" \
-	"$(INTDIR)\WXS_LBOX.obj" \
-	"$(INTDIR)\WXS_MADM.obj" \
-	"$(INTDIR)\WXS_MEDE.obj" \
-	"$(INTDIR)\WXS_MEDI.obj" \
-	"$(INTDIR)\WXS_MENU.obj" \
-	"$(INTDIR)\WXS_MIO.obj" \
-	"$(INTDIR)\WXS_MISC.obj" \
-	"$(INTDIR)\WXS_MPB.obj" \
-	"$(INTDIR)\WXS_OBJ.obj" \
-	"$(INTDIR)\WXS_PANL.obj" \
-	"$(INTDIR)\WXS_RADO.obj" \
-	"$(INTDIR)\WXS_SLID.obj" \
-	"$(INTDIR)\WXS_SNIP.obj" \
-	"$(INTDIR)\WXS_STYL.obj" \
-	"$(INTDIR)\WXS_WIN.obj" \
-	"$(INTDIR)\WXSCHEME.obj"
-
-"$(OUTDIR)\wxs.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "wxs - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-ALL : "$(OUTDIR)\wxs.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(INTDIR)\WXS_BMAP.obj"
-	-@erase "$(INTDIR)\WXS_BUTN.obj"
-	-@erase "$(INTDIR)\WXS_CHCE.obj"
-	-@erase "$(INTDIR)\WXS_CKBX.obj"
-	-@erase "$(INTDIR)\WXS_CNVS.obj"
-	-@erase "$(INTDIR)\WXS_DC.obj"
-	-@erase "$(INTDIR)\WXS_EVNT.obj"
-	-@erase "$(INTDIR)\WXS_FRAM.obj"
-	-@erase "$(INTDIR)\WXS_GAGE.obj"
-	-@erase "$(INTDIR)\WXS_GDI.obj"
-	-@erase "$(INTDIR)\WXS_GLOB.obj"
-	-@erase "$(INTDIR)\WXS_ITEM.obj"
-	-@erase "$(INTDIR)\WXS_LBOX.obj"
-	-@erase "$(INTDIR)\WXS_MADM.obj"
-	-@erase "$(INTDIR)\WXS_MEDE.obj"
-	-@erase "$(INTDIR)\WXS_MEDI.obj"
-	-@erase "$(INTDIR)\WXS_MENU.obj"
-	-@erase "$(INTDIR)\WXS_MIO.obj"
-	-@erase "$(INTDIR)\WXS_MISC.obj"
-	-@erase "$(INTDIR)\WXS_MPB.obj"
-	-@erase "$(INTDIR)\WXS_OBJ.obj"
-	-@erase "$(INTDIR)\WXS_PANL.obj"
-	-@erase "$(INTDIR)\WXS_RADO.obj"
-	-@erase "$(INTDIR)\WXS_SLID.obj"
-	-@erase "$(INTDIR)\WXS_SNIP.obj"
-	-@erase "$(INTDIR)\WXS_STYL.obj"
-	-@erase "$(INTDIR)\WXS_WIN.obj"
-	-@erase "$(INTDIR)\WXSCHEME.obj"
-	-@erase "$(OUTDIR)\wxs.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MTd /W3 /Gm /ZI /Od /I "..\..\mzscheme\gc" /I "..\..\wxwindow\include\base" /I "..\..\wxwindow\include\msw" /I "..\..\mzscheme\include" /I "..\..\mred\wxme" /I "..\..\mzscheme\utils" /I "..\..\wxwindow\contrib\fafa" /D "__DEBUG" /D "__STDC__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /Fp"$(INTDIR)\wxs.pch" /YX"wx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\wxs.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\wxs.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\WXS_BMAP.obj" \
-	"$(INTDIR)\WXS_BUTN.obj" \
-	"$(INTDIR)\WXS_CHCE.obj" \
-	"$(INTDIR)\WXS_CKBX.obj" \
-	"$(INTDIR)\WXS_CNVS.obj" \
-	"$(INTDIR)\WXS_DC.obj" \
-	"$(INTDIR)\WXS_EVNT.obj" \
-	"$(INTDIR)\WXS_FRAM.obj" \
-	"$(INTDIR)\WXS_GAGE.obj" \
-	"$(INTDIR)\WXS_GDI.obj" \
-	"$(INTDIR)\WXS_GLOB.obj" \
-	"$(INTDIR)\WXS_ITEM.obj" \
-	"$(INTDIR)\WXS_LBOX.obj" \
-	"$(INTDIR)\WXS_MADM.obj" \
-	"$(INTDIR)\WXS_MEDE.obj" \
-	"$(INTDIR)\WXS_MEDI.obj" \
-	"$(INTDIR)\WXS_MENU.obj" \
-	"$(INTDIR)\WXS_MIO.obj" \
-	"$(INTDIR)\WXS_MISC.obj" \
-	"$(INTDIR)\WXS_MPB.obj" \
-	"$(INTDIR)\WXS_OBJ.obj" \
-	"$(INTDIR)\WXS_PANL.obj" \
-	"$(INTDIR)\WXS_RADO.obj" \
-	"$(INTDIR)\WXS_SLID.obj" \
-	"$(INTDIR)\WXS_SNIP.obj" \
-	"$(INTDIR)\WXS_STYL.obj" \
-	"$(INTDIR)\WXS_WIN.obj" \
-	"$(INTDIR)\WXSCHEME.obj"
-
-"$(OUTDIR)\wxs.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "wxs - Win32 SGC"
-
-OUTDIR=.\SGC
-INTDIR=.\SGC
-# Begin Custom Macros
-OutDir=.\SGC
-# End Custom Macros
-
-ALL : "$(OUTDIR)\wxs.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(INTDIR)\WXS_BMAP.obj"
-	-@erase "$(INTDIR)\WXS_BUTN.obj"
-	-@erase "$(INTDIR)\WXS_CHCE.obj"
-	-@erase "$(INTDIR)\WXS_CKBX.obj"
-	-@erase "$(INTDIR)\WXS_CNVS.obj"
-	-@erase "$(INTDIR)\WXS_DC.obj"
-	-@erase "$(INTDIR)\WXS_EVNT.obj"
-	-@erase "$(INTDIR)\WXS_FRAM.obj"
-	-@erase "$(INTDIR)\WXS_GAGE.obj"
-	-@erase "$(INTDIR)\WXS_GDI.obj"
-	-@erase "$(INTDIR)\WXS_GLOB.obj"
-	-@erase "$(INTDIR)\WXS_ITEM.obj"
-	-@erase "$(INTDIR)\WXS_LBOX.obj"
-	-@erase "$(INTDIR)\WXS_MADM.obj"
-	-@erase "$(INTDIR)\WXS_MEDE.obj"
-	-@erase "$(INTDIR)\WXS_MEDI.obj"
-	-@erase "$(INTDIR)\WXS_MENU.obj"
-	-@erase "$(INTDIR)\WXS_MIO.obj"
-	-@erase "$(INTDIR)\WXS_MISC.obj"
-	-@erase "$(INTDIR)\WXS_MPB.obj"
-	-@erase "$(INTDIR)\WXS_OBJ.obj"
-	-@erase "$(INTDIR)\WXS_PANL.obj"
-	-@erase "$(INTDIR)\WXS_RADO.obj"
-	-@erase "$(INTDIR)\WXS_SLID.obj"
-	-@erase "$(INTDIR)\WXS_SNIP.obj"
-	-@erase "$(INTDIR)\WXS_STYL.obj"
-	-@erase "$(INTDIR)\WXS_WIN.obj"
-	-@erase "$(INTDIR)\WXSCHEME.obj"
-	-@erase "$(OUTDIR)\wxs.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MTd /W3 /Gm /ZI /Od /I "..\..\mzscheme\sgc" /I "..\..\wxwindow\include\base" /I "..\..\wxwindow\include\msw" /I "..\..\mzscheme\include" /I "..\..\mred\wxme" /I "..\..\mzscheme\utils" /I "..\..\wxwindow\contrib\fafa" /D "__DEBUG" /D "__STDC__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "USE_SENORA_GC" /Fp"$(INTDIR)\wxs.pch" /YX"wx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\wxs.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\wxs.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\WXS_BMAP.obj" \
-	"$(INTDIR)\WXS_BUTN.obj" \
-	"$(INTDIR)\WXS_CHCE.obj" \
-	"$(INTDIR)\WXS_CKBX.obj" \
-	"$(INTDIR)\WXS_CNVS.obj" \
-	"$(INTDIR)\WXS_DC.obj" \
-	"$(INTDIR)\WXS_EVNT.obj" \
-	"$(INTDIR)\WXS_FRAM.obj" \
-	"$(INTDIR)\WXS_GAGE.obj" \
-	"$(INTDIR)\WXS_GDI.obj" \
-	"$(INTDIR)\WXS_GLOB.obj" \
-	"$(INTDIR)\WXS_ITEM.obj" \
-	"$(INTDIR)\WXS_LBOX.obj" \
-	"$(INTDIR)\WXS_MADM.obj" \
-	"$(INTDIR)\WXS_MEDE.obj" \
-	"$(INTDIR)\WXS_MEDI.obj" \
-	"$(INTDIR)\WXS_MENU.obj" \
-	"$(INTDIR)\WXS_MIO.obj" \
-	"$(INTDIR)\WXS_MISC.obj" \
-	"$(INTDIR)\WXS_MPB.obj" \
-	"$(INTDIR)\WXS_OBJ.obj" \
-	"$(INTDIR)\WXS_PANL.obj" \
-	"$(INTDIR)\WXS_RADO.obj" \
-	"$(INTDIR)\WXS_SLID.obj" \
-	"$(INTDIR)\WXS_SNIP.obj" \
-	"$(INTDIR)\WXS_STYL.obj" \
-	"$(INTDIR)\WXS_WIN.obj" \
-	"$(INTDIR)\WXSCHEME.obj"
-
-"$(OUTDIR)\wxs.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("wxs.dep")
-!INCLUDE "wxs.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "wxs.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "wxs - Win32 Release" || "$(CFG)" == "wxs - Win32 Debug" || "$(CFG)" == "wxs - Win32 SGC"
-SOURCE=..\..\mred\Wxs\WXS_BMAP.cxx
-
-"$(INTDIR)\WXS_BMAP.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_BUTN.cxx
-
-"$(INTDIR)\WXS_BUTN.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_CHCE.cxx
-
-"$(INTDIR)\WXS_CHCE.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_CKBX.cxx
-
-"$(INTDIR)\WXS_CKBX.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_CNVS.cxx
-
-"$(INTDIR)\WXS_CNVS.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_DC.cxx
-
-"$(INTDIR)\WXS_DC.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_EVNT.cxx
-
-"$(INTDIR)\WXS_EVNT.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_FRAM.cxx
-
-"$(INTDIR)\WXS_FRAM.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_GAGE.cxx
-
-"$(INTDIR)\WXS_GAGE.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_GDI.cxx
-
-"$(INTDIR)\WXS_GDI.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_GLOB.cxx
-
-"$(INTDIR)\WXS_GLOB.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_ITEM.cxx
-
-"$(INTDIR)\WXS_ITEM.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_LBOX.cxx
-
-"$(INTDIR)\WXS_LBOX.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_MADM.cxx
-
-"$(INTDIR)\WXS_MADM.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_MEDE.cxx
-
-"$(INTDIR)\WXS_MEDE.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_MEDI.cxx
-
-"$(INTDIR)\WXS_MEDI.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_MENU.cxx
-
-"$(INTDIR)\WXS_MENU.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_MIO.cxx
-
-"$(INTDIR)\WXS_MIO.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_MISC.cxx
-
-"$(INTDIR)\WXS_MISC.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_MPB.cxx
-
-"$(INTDIR)\WXS_MPB.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_OBJ.cxx
-
-"$(INTDIR)\WXS_OBJ.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_PANL.cxx
-
-"$(INTDIR)\WXS_PANL.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_RADO.cxx
-
-"$(INTDIR)\WXS_RADO.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_SLID.cxx
-
-"$(INTDIR)\WXS_SLID.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_SNIP.cxx
-
-"$(INTDIR)\WXS_SNIP.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_STYL.cxx
-
-"$(INTDIR)\WXS_STYL.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXS_WIN.cxx
-
-"$(INTDIR)\WXS_WIN.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=..\..\mred\Wxs\WXSCHEME.cxx
-
-"$(INTDIR)\WXSCHEME.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-