move drscheme and tests/drscheme to drracket and tests/drracket

collects/drracket/drracket.creator

@@ -0,0 +1,2 @@
+DrSc
+(This code is registered with Apple.)

collects/drracket/drracket.rkt

@@ -0,0 +1,67 @@
+#lang racket/base
+(require scheme/gui/base "private/key.rkt")
+
+(define debugging? (getenv "PLTDRDEBUG"))
+(define profiling? (getenv "PLTDRPROFILE"))
+
+(define install-cm? (and (not debugging?)
+                         (getenv "PLTDRCM")))
+
+(define cm-trace? (or (equal? (getenv "PLTDRCM") "trace")
+                      (equal? (getenv "PLTDRDEBUG") "trace")))
+
+
+;; the flush is only here to ensure that the output is 
+;; appears when running in cygwin under windows.
+(define (flprintf fmt . args)
+  (apply printf fmt args)
+  (flush-output))
+
+(when debugging?
+  (flprintf "PLTDRDEBUG: installing CM to load/create errortrace zos\n")
+  (let-values ([(zo-compile
+                 make-compilation-manager-load/use-compiled-handler
+                 manager-trace-handler)
+                (parameterize ([current-namespace (make-base-empty-namespace)]
+                               [use-compiled-file-paths '()])
+                  (values
+                   (dynamic-require 'errortrace/zo-compile 'zo-compile)
+                   (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)
+                   (dynamic-require 'compiler/cm 'manager-trace-handler)))])
+    (current-compile zo-compile)
+    (use-compiled-file-paths (list (build-path "compiled" "errortrace")))
+    (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
+    (error-display-handler (dynamic-require 'errortrace/errortrace-lib
+                                            'errortrace-error-display-handler))
+    (when cm-trace?
+      (flprintf "PLTDRDEBUG: enabling CM tracing\n")
+      (manager-trace-handler
+       (λ (x) (display "1: ") (display x) (newline) (flush-output))))))
+
+(when install-cm?
+  (flprintf "PLTDRCM: installing compilation manager\n")
+  (let-values ([(make-compilation-manager-load/use-compiled-handler
+                 manager-trace-handler)
+                (parameterize ([current-namespace (make-base-empty-namespace)])
+                  (values
+                   (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)
+                   (dynamic-require 'compiler/cm 'manager-trace-handler)))])
+    (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
+    (when cm-trace?
+      (flprintf "PLTDRCM: enabling CM tracing\n")
+      (manager-trace-handler
+       (λ (x) (display "1: ") (display x) (newline) (flush-output))))))
+
+(when profiling?
+  (flprintf "PLTDRPROFILE: installing profiler\n")
+  ;; NOTE that this might not always work.
+  ;; it creates a new custodian and installs it, but the
+  ;; original eventspace was created on the original custodian
+  ;; and this code does not create a new eventspace. 
+  (let ([orig-cust (current-custodian)]
+        [orig-eventspace (current-eventspace)]
+        [new-cust (make-custodian)])
+    (current-custodian new-cust)
+    ((dynamic-require 'drracket/private/profile-drs 'start-profile) orig-cust)))
+
+(dynamic-require 'drracket/private/drracket-normal #f)

collects/drracket/info.rkt

@@ -0,0 +1,10 @@
+#lang setup/infotab
+
+;(define tools      '("sprof.rkt"))
+;(define tool-names '("Sampling Profiler"))
+
+(define drracket-tools      '("syncheck.rkt"))
+(define drracket-tool-names '("Check Syntax"))
+
+(define gracket-launcher-names     '("DrRacket"))
+(define gracket-launcher-libraries '("drracket.rkt"))

collects/drracket/installer.rkt

@@ -14,8 +14,8 @@
   (define (install-variation variant)
     (parameterize ([current-launcher-variant variant])
       (make-mred-launcher
-       (list "-ZmvqL" "drscheme.rkt" "drscheme")
+       (list "-ZmvqL" "drracket.rkt" "drracket")
        (mred-program-launcher-path "DrScheme")
        (cons
-        `(exe-name . "DrScheme")
-        (build-aux-from-path (build-path (collection-path "drscheme") "drscheme"))))))
+        `(exe-name . "DrRacket")
+        (build-aux-from-path (build-path (collection-path "drracket") "drracket"))))))

collects/drracket/main.rkt

@@ -0,0 +1,2 @@
+#lang racket/base
+(require "drracket.rkt")

collects/drracket/private/drracket-normal.rkt

@@ -100,8 +100,8 @@
  (cond
    [(or prince-kuhio-day? kamehameha-day?)
     (set-splash-progress-bar? #f)
-    (let ([size ((dynamic-require 'drscheme/private/palaka 'palaka-pattern-size) 4)])
-      (vector (dynamic-require 'drscheme/private/honu-logo 'draw-honu) 
+    (let ([size ((dynamic-require 'drracket/private/palaka 'palaka-pattern-size) 4)])
+      (vector (dynamic-require 'drracket/private/honu-logo 'draw-honu) 
               size 
               size))]
    [texas-independence-day?
@@ -134,10 +134,10 @@
                      (label "Break All Threads")
                      (callback
                       (λ (x y)
-                        ((dynamic-require 'drscheme/private/key 'break-threads))))
+                        ((dynamic-require 'drracket/private/key 'break-threads))))
                      (parent f))])
         (send f show #t)))))
 
-(dynamic-require 'drscheme/tool-lib #f)
+(dynamic-require 'drracket/tool-lib #f)
 (shutdown-splash)
 (close-splash)

collects/drracket/private/language-object-contract.rkt

@@ -85,7 +85,7 @@
                (define id (reconstitute #,ctc provide?))
                #,@(if (syntax-e #'provide?)
                       (list 
-                       #`(require/doc drscheme/private/recon)
+                       #`(require/doc drracket/private/recon)
                        #`(provide/doc
                           (thing-doc id
                                      contract?

collects/drracket/private/language.rkt

@@ -279,9 +279,7 @@
              [enable-fraction-style 
               (lambda ()
                 (let ([on? (member (send output-style get-selection) '(0 1))])
-                  (send fraction-style enable on?)
-                  (send show-sharing enable on?)
-                  (send insert-newlines enable on?)))]
+                  (send fraction-style enable on?)))]
              [show-sharing (make-object check-box%
                              (string-constant sharing-printing-label)
                              output-panel
@@ -1138,7 +1136,7 @@
       ((if gui? make-mred-launcher make-mzscheme-launcher)
        (list
         (path->string
-         (build-path (collection-path "drscheme" "private") 
+         (build-path (collection-path "drracket" "private") 
                      (if gui? 
                          "launcher-mred-bootstrap.rkt"
                          "launcher-mz-bootstrap.rkt")))

collects/drracket/private/module-language-tools.rkt

@@ -141,7 +141,7 @@
                            (if (vector? info-result)
                                'hash-lang-racket
                                (get-lang-name pos))
-                           'drscheme/private/module-language-tools)
+                           'drracket/private/module-language-tools)
                  ((if (vector? info-result)
                       (vector-ref info-result 0)
                       info-result)

collects/drracket/private/module-language.rkt

@@ -212,11 +212,11 @@
                (case annotations
                  [(none)
                   (use-compiled-file-paths
-                   (cons (build-path "compiled" "drscheme")
+                   (cons (build-path "compiled" "drracket")
                          (use-compiled-file-paths)))]
                  [(debug)
                   (use-compiled-file-paths
-                   (cons (build-path "compiled" "drscheme" "errortrace")
+                   (cons (build-path "compiled" "drracket" "errortrace")
                          (use-compiled-file-paths)))]))
              
              (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))

collects/drracket/private/number-snip.rkt

@@ -5,5 +5,5 @@
   
   (provide snip-class)
   (define snip-class (make-object number-snip:snip-class%))
-  (send snip-class set-classname (format "~s" `(lib "number-snip.ss" "drscheme" "private")))
+  (send snip-class set-classname (format "~s" `(lib "number-snip.ss" "drracket" "private")))
   (send (get-the-snip-class-list) add snip-class)

collects/drracket/private/tools-drs.rkt

@@ -42,7 +42,7 @@ This file sets up the right lexical environment to invoke the tools that want to
   (syntax-case stx ()
     [(_ body tool-name)
      (let ()
-       (define tool-lib-src (build-path (collection-path "drscheme") "tool-lib.rkt"))
+       (define tool-lib-src (build-path (collection-path "drracket") "tool-lib.rkt"))
        (define full-sexp
          (call-with-input-file tool-lib-src
            (λ (port)

collects/drracket/private/tools.rkt

@@ -323,7 +323,7 @@ string-constants)
   (syntax-case stx ()
     [(_ body tool-name)
      (let ()
-       (define tool-lib-src (build-path (collection-path "drscheme") "tool-lib.rkt"))
+       (define tool-lib-src (build-path (collection-path "drracket") "tool-lib.rkt"))
        
        (define full-sexp
          (call-with-input-file tool-lib-src

collects/drracket/syncheck.rkt

@@ -23,11 +23,11 @@ If the namespace does not, they are colored the unbound color.
          scheme/class
          scheme/list
          scheme/promise
-         drscheme/tool
+         drracket/tool
          syntax/toplevel
          syntax/boundmap
          mrlib/switchable-button
-         (prefix-in drracket:arrow: drscheme/arrow)
+         (prefix-in drracket:arrow: drracket/arrow)
          (prefix-in fw: framework/framework)
          mred
          framework

collects/drracket/tool.rkt

@@ -0,0 +1,6 @@
+#lang racket/base
+(require "private/drsig.ss")
+(provide drracket:tool^
+         drracket:tool-exports^
+         drscheme:tool^
+         (rename-out [drracket:tool-exports^ drscheme:tool-exports^]))

collects/drscheme/drscheme.rkt

@@ -1,67 +1,2 @@
 #lang racket/base
-(require scheme/gui/base "private/key.rkt")
-
-(define debugging? (getenv "PLTDRDEBUG"))
-(define profiling? (getenv "PLTDRPROFILE"))
-
-(define install-cm? (and (not debugging?)
-                         (getenv "PLTDRCM")))
-
-(define cm-trace? (or (equal? (getenv "PLTDRCM") "trace")
-                      (equal? (getenv "PLTDRDEBUG") "trace")))
-
-
-;; the flush is only here to ensure that the output is 
-;; appears when running in cygwin under windows.
-(define (flprintf fmt . args)
-  (apply printf fmt args)
-  (flush-output))
-
-(when debugging?
-  (flprintf "PLTDRDEBUG: installing CM to load/create errortrace zos\n")
-  (let-values ([(zo-compile
-                 make-compilation-manager-load/use-compiled-handler
-                 manager-trace-handler)
-                (parameterize ([current-namespace (make-base-empty-namespace)]
-                               [use-compiled-file-paths '()])
-                  (values
-                   (dynamic-require 'errortrace/zo-compile 'zo-compile)
-                   (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)
-                   (dynamic-require 'compiler/cm 'manager-trace-handler)))])
-    (current-compile zo-compile)
-    (use-compiled-file-paths (list (build-path "compiled" "errortrace")))
-    (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
-    (error-display-handler (dynamic-require 'errortrace/errortrace-lib
-                                            'errortrace-error-display-handler))
-    (when cm-trace?
-      (flprintf "PLTDRDEBUG: enabling CM tracing\n")
-      (manager-trace-handler
-       (λ (x) (display "1: ") (display x) (newline) (flush-output))))))
-
-(when install-cm?
-  (flprintf "PLTDRCM: installing compilation manager\n")
-  (let-values ([(make-compilation-manager-load/use-compiled-handler
-                 manager-trace-handler)
-                (parameterize ([current-namespace (make-base-empty-namespace)])
-                  (values
-                   (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)
-                   (dynamic-require 'compiler/cm 'manager-trace-handler)))])
-    (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
-    (when cm-trace?
-      (flprintf "PLTDRCM: enabling CM tracing\n")
-      (manager-trace-handler
-       (λ (x) (display "1: ") (display x) (newline) (flush-output))))))
-
-(when profiling?
-  (flprintf "PLTDRPROFILE: installing profiler\n")
-  ;; NOTE that this might not always work.
-  ;; it creates a new custodian and installs it, but the
-  ;; original eventspace was created on the original custodian
-  ;; and this code does not create a new eventspace. 
-  (let ([orig-cust (current-custodian)]
-        [orig-eventspace (current-eventspace)]
-        [new-cust (make-custodian)])
-    (current-custodian new-cust)
-    ((dynamic-require 'drscheme/private/profile-drs 'start-profile) orig-cust)))
-
-(dynamic-require 'drscheme/private/drscheme-normal #f)
+(require drracket/drracket)

collects/drscheme/info.rkt

@@ -1,13 +1,4 @@
 #lang setup/infotab
 
-;(define tools      '("sprof.rkt"))
-;(define tool-names '("Sampling Profiler"))
-
-(define drracket-tools      '("syncheck.rkt"))
-(define drracket-tool-names '("Check Syntax"))
-
-(define gracket-launcher-names     '("DrRacket"))
-(define gracket-launcher-libraries '("drscheme.rkt"))
-
 (define mred-launcher-names     '("DrScheme"))
 (define mred-launcher-libraries '("drscheme.rkt"))

collects/drscheme/tool.rkt

@@ -1,6 +1,3 @@
 #lang racket/base
-(require "private/drsig.ss")
-(provide drracket:tool^
-         drracket:tool-exports^
-         drscheme:tool^
-         (rename-out [drracket:tool-exports^ drscheme:tool-exports^]))
+(require drracket/tool)
+(provide (all-from-out drracket/tool))

collects/framework/private/scheme.rkt

@@ -1186,7 +1186,7 @@
            (values lexeme type paren start end backup-delta mode)))))
     
     (define/override (put-file text sup directory default-name)
-      (parameterize ([finder:default-extension "ss"]
+      (parameterize ([finder:default-extension "rkt"]
                      [finder:default-filters '(["Racket Sources" "*.rkt;*.ss;*.scm"]
                                                ["Any" "*.*"])])
         ;; don't call the surrogate's super, since it sets the default extension

collects/macro-debugger/syntax-browser/text.rkt

@@ -2,7 +2,7 @@
 (require scheme/list
          scheme/class
          scheme/gui
-         drscheme/arrow
+         drracket/arrow
          framework/framework
          unstable/interval-map
          unstable/gui/notify

collects/meta/dist-specs.rkt

@@ -353,7 +353,7 @@ mz-manuals := (scribblings: "main/") ; generates main pages (next line)
 mr-base := (package: "mred") (notes: "gracket") (bin: "mred-text") (collects: "afm/")
 mr-manuals := (doc+src: "gui/")
 
-dr-base := (package: "drscheme") (doc: "drracket") (notes: "drracket") (package: "framework")
+dr-base := (package: "drracket") (package: "drscheme") (package: "framework")
 dr-manuals := (doc+src: "tools/")
 
 ;; Misc hooks, to be added on by package rules below

collects/meta/props

@@ -564,53 +564,57 @@ path/s is either such a string or a list of them.
 "collects/deinprogramm/turtle.rkt" drdr:command-line "mred-text -t ~s"
 "collects/deinprogramm/world.rkt" drdr:command-line "mred-text -t ~s"
 "collects/drscheme" responsible (robby)
-"collects/drscheme/arrow.rkt" drdr:command-line "mred-text -t ~s"
 "collects/drscheme/drscheme.rkt" drdr:command-line "mzc ~s"
 "collects/drscheme/main.rkt" drdr:command-line "mzc ~s"
-"collects/drscheme/private/app.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/auto-language.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/bindings-browser.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/bitmap-message.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/debug.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/drscheme-normal.rkt" drdr:command-line "mzc ~s"
-"collects/drscheme/private/eb.rkt" drdr:command-line "mred-text ~s"
-"collects/drscheme/private/embedded-snip-utils.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/eval.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/font.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/frame.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/help-desk.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/honu-logo.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/init.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/insert-large-letters.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/label-frame-mred.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/language-configuration.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/language-object-contract.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/language.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/launcher-mred-bootstrap.rkt" drdr:command-line "mzc ~s"
-"collects/drscheme/private/launcher-mz-bootstrap.rkt" drdr:command-line "mzc ~s"
-"collects/drscheme/private/link.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/main.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/modes.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/module-browser.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/module-language-tools.rkt" drdr:command-line "mred-text ~s"
-"collects/drscheme/private/module-language.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/multi-file-search.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/number-snip.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/palaka.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/prefs-contract.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/profile-drs.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/rep.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/stick-figures.rkt" drdr:command-line "mzc ~s"
-"collects/drscheme/private/syncheck-debug.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/text.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/tools-drs.rkt" drdr:command-line "mred ~s"
-"collects/drscheme/private/tools.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/tracing.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/private/unit.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/sprof.rkt" drdr:command-line "mred-text -t ~s"
-"collects/drscheme/syncheck-drracket-button.rkt" drdr:command-line "mred-text ~s"
-"collects/drscheme/syncheck.rkt" drdr:command-line "mred-text -t ~s"
 "collects/drscheme/tool-lib.rkt" drdr:command-line "mzc ~s"
+"collects/drracket" responsible (robby)
+"collects/drracket/arrow.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/drracket.rkt" drdr:command-line "mzc ~s"
+"collects/drracket/main.rkt" drdr:command-line "mzc ~s"
+"collects/drracket/private/app.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/auto-language.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/bindings-browser.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/bitmap-message.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/debug.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/drracket-normal.rkt" drdr:command-line "mzc ~s"
+"collects/drracket/private/eb.rkt" drdr:command-line "mred-text ~s"
+"collects/drracket/private/embedded-snip-utils.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/eval.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/font.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/frame.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/help-desk.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/honu-logo.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/init.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/insert-large-letters.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/label-frame-mred.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/language-configuration.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/language-object-contract.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/language.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/launcher-mred-bootstrap.rkt" drdr:command-line "mzc ~s"
+"collects/drracket/private/launcher-mz-bootstrap.rkt" drdr:command-line "mzc ~s"
+"collects/drracket/private/link.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/main.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/modes.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/module-browser.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/module-language-tools.rkt" drdr:command-line "mred-text ~s"
+"collects/drracket/private/module-language.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/multi-file-search.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/number-snip.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/palaka.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/prefs-contract.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/profile-drs.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/rep.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/stick-figures.rkt" drdr:command-line "mzc ~s"
+"collects/drracket/private/syncheck-debug.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/text.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/tools-drs.rkt" drdr:command-line "mred ~s"
+"collects/drracket/private/tools.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/tracing.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/private/unit.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/sprof.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/syncheck-drracket-button.rkt" drdr:command-line "mred-text ~s"
+"collects/drracket/syncheck.rkt" drdr:command-line "mred-text -t ~s"
+"collects/drracket/tool-lib.rkt" drdr:command-line "mzc ~s"
 "collects/dynext" responsible (mflatt)
 "collects/dynext/private/macinc.rkt" drdr:command-line "mzscheme -f ~s"
 "collects/dynext/private/stdio.rkt" drdr:command-line ""
@@ -1332,22 +1336,22 @@ path/s is either such a string or a list of them.
 "collects/tests/deinprogramm" responsible (sperber)
 "collects/tests/deinprogramm/image.rkt" drdr:command-line "mred-text -t ~s"
 "collects/tests/deinprogramm/run-image-test.rkt" drdr:command-line "mred-text -t ~s"
-"collects/tests/drscheme" responsible (robby)
-"collects/tests/drscheme/drscheme-test-util.rkt" drdr:command-line "mred -t ~s"
-"collects/tests/drscheme/io.rkt" drdr:command-line "mred ~s"
-"collects/tests/drscheme/language-test.rkt" drdr:command-line "mred ~s" drdr:timeout 600
-"collects/tests/drscheme/module-lang-test-utils.rkt" drdr:command-line "mred-text -t ~s"
-"collects/tests/drscheme/module-lang-test.rkt" drdr:command-line "mred ~s" drdr:timeout 120
-"collects/tests/drscheme/randomly-click-language-dialog.rkt" drdr:command-line "mzc ~s"
-"collects/tests/drscheme/randomly-click-preferences.rkt" drdr:command-line "mzc ~s"
-"collects/tests/drscheme/randomly-click.rkt" drdr:command-line ""
-"collects/tests/drscheme/repl-test.rkt" drdr:command-line "mred ~s" drdr:timeout 600
-"collects/tests/drscheme/sample-solutions-one-window.rkt" drdr:command-line "mred-text -t ~s"
-"collects/tests/drscheme/save-teaching-lang-file.rkt" drdr:command-line "mred ~s"
-"collects/tests/drscheme/stepper-test.rkt" drdr:command-line "mred-text -t ~s"
-"collects/tests/drscheme/syncheck-test.rkt" drdr:command-line "mred ~s"
-"collects/tests/drscheme/teachpack.rkt" drdr:command-line "mred ~s"
-"collects/tests/drscheme/time-keystrokes.rkt" drdr:command-line "mred-text -t ~s"
+"collects/tests/drracket" responsible (robby)
+"collects/tests/drracket/drscheme-test-util.rkt" drdr:command-line "mred -t ~s"
+"collects/tests/drracket/io.rkt" drdr:command-line "mred ~s"
+"collects/tests/drracket/language-test.rkt" drdr:command-line "mred ~s" drdr:timeout 600
+"collects/tests/drracket/module-lang-test-utils.rkt" drdr:command-line "mred-text -t ~s"
+"collects/tests/drracket/module-lang-test.rkt" drdr:command-line "mred ~s" drdr:timeout 120
+"collects/tests/drracket/randomly-click-language-dialog.rkt" drdr:command-line "mzc ~s"
+"collects/tests/drracket/randomly-click-preferences.rkt" drdr:command-line "mzc ~s"
+"collects/tests/drracket/randomly-click.rkt" drdr:command-line ""
+"collects/tests/drracket/repl-test.rkt" drdr:command-line "mred ~s" drdr:timeout 600
+"collects/tests/drracket/sample-solutions-one-window.rkt" drdr:command-line "mred-text -t ~s"
+"collects/tests/drracket/save-teaching-lang-file.rkt" drdr:command-line "mred ~s"
+"collects/tests/drracket/stepper-test.rkt" drdr:command-line "mred-text -t ~s"
+"collects/tests/drracket/syncheck-test.rkt" drdr:command-line "mred ~s"
+"collects/tests/drracket/teachpack.rkt" drdr:command-line "mred ~s"
+"collects/tests/drracket/time-keystrokes.rkt" drdr:command-line "mred-text -t ~s"
 "collects/tests/framework" responsible (robby)
 "collects/tests/framework/canvas.rkt" drdr:command-line "mzc -k ~s"
 "collects/tests/framework/debug.rkt" drdr:command-line "mzc -k ~s"

collects/scribblings/drracket/keybindings.scrbl

@@ -205,7 +205,7 @@ s-exp framework/keybinding-lang
 
 The @racket[framework/keybinding-lang] languages provides all of the bindings
 from @racketmodname[racket], @racketmodname[racket/class], and
-@racketmodname[drscheme/tool-lib], 
+@racketmodname[drracket/tool-lib], 
 except that it adjusts @|mz-mod-begin| to
 introduce a @racketidfont{keybinding} form:
 

collects/scribblings/main/acks.scrbl

@@ -1,6 +1,6 @@
 #lang scribble/doc
 @(require scribble/manual
-          drscheme/acks
+          drracket/acks
           "private/utils.ss")
 
 @main-page['acks]

collects/scribblings/main/private/search.js

@@ -194,8 +194,8 @@ function InitializeSearch() {
         +'<ul style="padding: 0em; margin: 0.5em 1.5em;">'
         +MakeContextQueryItem("M:", "Bindings")
         +MakeContextQueryItem("T:reference", "Reference manual")
-        +MakeContextQueryItem("M:scheme", "{{scheme}} bindings")
-        +MakeContextQueryItem("M:scheme/base", "{{scheme/base}} bindings")
+        +MakeContextQueryItem("M:racket", "{{racket}} bindings")
+        +MakeContextQueryItem("M:racket/base", "{{racket/base}} bindings")
         +'</ul>'
       +'</div>'
       +MakeChevrons(1,

collects/scribblings/tools/tool-lib-extracts.rkt

@@ -2,4 +2,4 @@
 
 (require scribble/extract)
 
-(provide-extracted (lib "tool-lib.rkt" "drscheme"))
+(provide-extracted (lib "tool-lib.rkt" "drracket"))

collects/scribblings/tools/tools.scrbl

@@ -2,11 +2,11 @@
 @(begin
 (require scribble/manual
          (for-label scheme/gui/base)
-         (for-label drscheme/tool-lib)
+         (for-label drracket/tool-lib)
          (for-label scheme/unit scheme/contract scheme/class)
          (for-label scheme/base)
          (for-label framework/framework)
-         (for-label drscheme/syncheck-drracket-button))
+         (for-label drracket/syncheck-drracket-button))
 
 (define (File x) @tt[x])
 (define (FileFirst x) @tt[x]) ;; indexing missing
@@ -19,7 +19,7 @@
 
 @author["Robert Bruce Findler"]
 
-@(defmodule drscheme/tool-lib)
+@defmodule*[(drracket/tool-lib drscheme/tool-lib)]
 
 This manual describes DrRacket's tools interface. It assumes
 familiarity with 
@@ -30,6 +30,10 @@ DrRacket, as described in
 and the Framework, as described in
 @(other-manual '(lib "scribblings/framework/framework.scrbl")).
 
+The @racketmodname[drscheme/tool-lib] library is for backward
+compatibility; it exports all of the bindings of
+@racketmodname[drracket/tool-lib].
+
 @table-of-contents[]
 
 @bold{Thanks}
@@ -163,7 +167,7 @@ then the same collection would be expected to contain a
 @File{tool.rkt} file. It might contain something like this:
 @schememod[
 scheme/gui
-(require drscheme/tool)
+(require drracket/tool)
 
 (provide tool@)
 
@@ -477,7 +481,7 @@ for a list of the capabilities registered by default.
 
 Check Syntax is a part of the DrRacket collection, but is implemented via the tools API.
 
-@defmodule[drscheme/syncheck-drracket-button]
+@defmodule[drracket/syncheck-drracket-button]
 
 @defthing[syncheck-drracket-button
           (list/c 

collects/tests/drracket/io.rkt

@@ -12,7 +12,7 @@ add this test:
 
 |#
 
-(require "drscheme-test-util.ss"
+(require "drracket-test-util.ss"
          tests/utils/gui
          mzlib/class
          mzlib/pretty

collects/tests/drracket/language-test.rkt

@@ -14,7 +14,7 @@ the settings above should match r5rs
 |#
 
 
-(require "drscheme-test-util.ss"
+(require "drracket-test-util.ss"
          tests/utils/gui
          mred
          framework
@@ -86,7 +86,7 @@ the settings above should match r5rs
     (test-expression "true" "#t")
     (test-expression "mred^" "{stop-multi.png} {stop-22x22.png} reference to undefined identifier: mred^")
     (test-expression "(eq? 'a 'A)" "#f")
-    (test-expression "(set! x 1)" "{stop-multi.png} {stop-22x22.png} set!: cannot set undefined identifier: x")
+    (test-expression "(set! x 1)" "{stop-multi.png} {stop-22x22.png} set!: cannot set undefined variable: x")
     (test-expression "(define qqq 2) (set! qqq 1)" "")
     (test-expression "(cond [(= 1 2) 3])" "")
     (test-expression "(cons 1 2)" "(1 . 2)")
@@ -186,7 +186,7 @@ the settings above should match r5rs
     (test-expression "true" "{stop-multi.png} {stop-22x22.png} reference to undefined identifier: true")
     (test-expression "mred^" "{stop-multi.png} {stop-22x22.png} reference to undefined identifier: mred^")
     (test-expression "(eq? 'a 'A)" "#t")
-    (test-expression "(set! x 1)" "{stop-multi.png} {stop-22x22.png} set!: cannot set undefined identifier: x")
+    (test-expression "(set! x 1)" "{stop-multi.png} {stop-22x22.png} set!: cannot set undefined variable: x")
     (test-expression "(define qqq 2) (set! qqq 1)" "")
     (test-expression "(cond ((= 1 2) 3))" "")
     (test-expression "(cons 1 2)" "(1 . 2)")
@@ -938,7 +938,7 @@ the settings above should match r5rs
                      "false")
     (test-expression "(set! x 1)"
                      "x: name is not defined"
-                     "set!: cannot set identifier before its definition: x")
+                     "set!: cannot set variable before its definition: x")
     (test-expression "(define qqq 2) (set! qqq 1)" 
                      "(void)" 
                      "define: cannot redefine name: qqq\n(void)")

collects/tests/drracket/module-lang-test-utils.rkt

@@ -1,5 +1,5 @@
 #lang scheme/gui
-(require "drscheme-test-util.ss" mzlib/etc framework scheme/string)
+(require "drracket-test-util.ss" mzlib/etc framework scheme/string)
 
 (provide test t rx run-test in-here write-test-modules)
 
@@ -184,8 +184,8 @@
     (equal? (regexp-replace* #rx"[\n\t ]+" a " ")
             (regexp-replace* #rx"[\n\t ]+" b " ")))
   
-  (define drs/compiled/et (build-path "compiled" "drscheme" "errortrace"))
-  (define drs/compiled (build-path "compiled" "drscheme"))
+  (define drs/compiled/et (build-path "compiled" "drracket" "errortrace"))
+  (define drs/compiled (build-path "compiled" "drracket"))
   (define compiled/et (build-path "compiled" "errortrace"))
   (define compiled (build-path "compiled"))
   

collects/tests/drracket/module-lang-test.rkt

@@ -260,5 +260,5 @@
       "3")
 
 
-(require "drscheme-test-util.ss")
+(require "drracket-test-util.ss")
 (fire-up-drscheme-and-run-tests run-test)

collects/tests/drracket/repl-test.rkt

@@ -13,7 +13,7 @@ This produces an ACK message
 
 |#
 
-(require "drscheme-test-util.ss"
+(require "drracket-test-util.ss"
          mred
          framework)
 
@@ -59,7 +59,7 @@ This produces an ACK message
   (string-append
    (regexp-quote "#<syntax:")
    ".*"
-   (regexp-quote "tests/drscheme/repl-test-tmp")
+   (regexp-quote "tests/drracket/repl-test-tmp")
    "3?"
    (regexp-quote ".ss")))
 
@@ -1088,7 +1088,7 @@ This produces an ACK message
   #;
   (normal-case-path
    (normalize-path 
-    (collection-path "tests" "drscheme"))))
+    (collection-path "tests" "drracket"))))
 
 (define tmp-load-short-filename "repl-test-tmp.ss")
 (define tmp-load-filename (build-path tmp-load-directory tmp-load-short-filename))
@@ -1361,7 +1361,7 @@ This produces an ACK message
     (next-test)
     (clear-definitions drscheme-frame)
     (do-execute drscheme-frame)
-    (test:menu-select "Scheme" kill-menu-item)
+    (test:menu-select "Racket" kill-menu-item)
     (let ([win (wait-for-new-frame drscheme-frame)])
       (test:button-push "OK")
       (let ([drs2 (wait-for-new-frame win)])
@@ -1385,7 +1385,7 @@ This produces an ACK message
      "(define (f) (queue-callback f) (error 'ouch)) (f)")
     (do-execute drscheme-frame #f)
     (sleep 1/2)
-    (test:menu-select "Scheme" kill-menu-item)
+    (test:menu-select "Racket" kill-menu-item)
     (let ([win (wait-for-new-frame drscheme-frame null 360)])
       (test:button-push "OK")
       (let ([drs2 (wait-for-new-frame win)])

collects/tests/drracket/sample-solutions-one-window.rkt

@@ -1,6 +1,6 @@
 
 (module sample-solutions-one-window mzscheme
-  (require "drscheme-test-util.ss"
+  (require "drracket-test-util.ss"
            tests/utils/gui
            mzlib/class
            mzlib/list
@@ -29,7 +29,7 @@
   
   (define ((test-single-file labels sample-solutions-dir toc) filename)
     (let* ([sample-solutions-teachpack-filename
-            (build-path (collection-path "tests" "drscheme") "sample-solutions-testsuite-tp.scm")]
+            (build-path (collection-path "tests" "drracket") "sample-solutions-testsuite-tp.scm")]
            [toc-entry (let ([lookup (assoc (string->symbol filename) toc)])
                         (if lookup
                             (cdr lookup)

collects/tests/drracket/save-teaching-lang-file.rkt

@@ -5,7 +5,7 @@
          framework/test
          framework/preferences)
 
-(require tests/drscheme/drscheme-test-util)
+(require tests/drracket/drracket-test-util)
 
 (fire-up-drscheme-and-run-tests
  (λ ()

collects/tests/drracket/stepper-test.rkt

@@ -2,7 +2,7 @@
 (module stepper-test mzscheme
   (require mred
            mzlib/class
-           "drscheme-test-util.ss"
+           "drracket-test-util.ss"
            tests/utils/gui
            framework
            mzlib/pretty)

collects/tests/drracket/syncheck-test.rkt

@@ -7,7 +7,7 @@ trigger runtime errors in check syntax.
 |#
 #lang scheme/base
 
-  (require "drscheme-test-util.ss"
+  (require "drracket-test-util.ss"
            string-constants/string-constant
            tests/utils/gui
            scheme/path

collects/tests/drracket/teachpack.rkt

@@ -1,6 +1,6 @@
 #lang scheme/base
 
-(require "drscheme-test-util.ss"
+(require "drracket-test-util.ss"
          scheme/class
          scheme/path
          scheme/gui/base
@@ -21,7 +21,7 @@
   (let ([tp-names
          (let ([teachpack-path (normal-case-path
                                 (normalize-path
-                                 (collection-path "tests" "drscheme")))])
+                                 (collection-path "tests" "drracket")))])
            (let loop ([tp-exps tp-exps]
                       [n 0])
              (cond
@@ -63,7 +63,7 @@
   (let ([tp-name (normal-case-path
                   (normalize-path
                    (build-path
-                    (collection-path "tests" "drscheme")
+                    (collection-path "tests" "drracket")
                     "teachpack-tmp.ss")))])
     (call-with-output-file tp-name
       (lambda (port) (display tp-exp port))
@@ -93,7 +93,7 @@
   (let ([tp-name (normal-case-path
                   (normalize-path
                    (build-path
-                    (collection-path "tests" "drscheme")
+                    (collection-path "tests" "drracket")
                     "teachpack-tmp.ss")))])
     (call-with-output-file tp-name
       (lambda (port) (display tp-exp port))

collects/tests/info.rkt

@@ -1,7 +1,7 @@
 #lang setup/infotab
 
 (define name "Test Suites")
-(define tools '(("time-keystrokes.ss" "drscheme")))
+(define tools '(("time-keystrokes.ss" "drracket")))
 (define tool-names '("Time Keystrokes"))
 
 (define compile-omit-paths