finish the cm move: change all requires, leave stub files in mzlib

svn: r11314

collects/compiler/cm-accomplice.ss

@@ -1,19 +1,16 @@
-(module cm-accomplice mzscheme
+#lang scheme/base
-  (provide register-external-file)
-
-  (define (register-external-file f)
-    (unless (and (path? f)
-		 (complete-path? f))
-      (raise-type-error 'register-external-file "complete path" f))
-    (let ([param (lambda () void)])
-      ;; Load the code in a separate thread, so that the dynamic
-      ;; extent of this one (likely a phase-sensitive macro expansion)
-      ;; doesn't pollute the load:
-      (thread-wait
-       (thread (lambda ()
-		 (set! param
-		       (dynamic-require 'compiler/private/cm-ctime
-					'current-external-file-registrar)))))
-      ((param) f))))
-
 
+(provide register-external-file)
+(define (register-external-file f)
+  (unless (and (path? f) (complete-path? f))
+    (raise-type-error 'register-external-file "complete path" f))
+  (let ([param (lambda () void)])
+    ;; Load the code in a separate thread, so that the dynamic
+    ;; extent of this one (likely a phase-sensitive macro expansion)
+    ;; doesn't pollute the load:
+    (thread-wait
+     (thread (lambda ()
+               (set! param
+                     (dynamic-require 'compiler/private/cm-ctime
+                                      'current-external-file-registrar)))))
+    ((param) f)))

collects/compiler/compiler-unit.ss

@@ -22,7 +22,7 @@
 
          scheme/file
          mzlib/compile ; gets compile-file
-         mzlib/cm
+         compiler/cm
          setup/getinfo
          setup/main-collects)
 

collects/compiler/main.ss

@@ -462,8 +462,8 @@
                   (zo-parse in))))))))))]
   [(make-zo)
    (let ([n (make-base-empty-namespace)]
-         [mc (dynamic-require 'mzlib/cm 'managed-compile-zo)]
+         [mc (dynamic-require 'compiler/cm 'managed-compile-zo)]
-         [cnh (dynamic-require 'mzlib/cm 'manager-compile-notify-handler)]
+         [cnh (dynamic-require 'compiler/cm 'manager-compile-notify-handler)]
          [did-one? #f])
      (parameterize ([current-namespace n]
                     [cnh (lambda (p)

collects/drscheme/drscheme.ss

@@ -18,8 +18,8 @@
                                  [use-compiled-file-paths '()])
                     (values
                      (dynamic-require 'errortrace/zo-compile 'zo-compile)
-                     (dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler)
+                     (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)
-                     (dynamic-require 'mzlib/cm 'manager-trace-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))
@@ -36,8 +36,8 @@
                    manager-trace-handler)
                   (parameterize ([current-namespace (make-namespace)])
                     (values
-                     (dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler)
+                     (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)
-                     (dynamic-require 'mzlib/cm 'manager-trace-handler)))])
+                     (dynamic-require 'compiler/cm 'manager-trace-handler)))])
       (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
       (when cm-trace?
         (printf "PLTDRCM: enabling CM tracing\n")

collects/framework/splash.ss

@@ -127,8 +127,8 @@
                         (getenv "PLTDRDEBUG"))
                     (parameterize ([current-namespace (make-namespace)])
                       (values
-                       (dynamic-require 'mzlib/cm 'make-compilation-manager-load/use-compiled-handler)
+                       (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)
-                       (dynamic-require 'mzlib/cm 'manager-trace-handler)))
+                       (dynamic-require 'compiler/cm 'manager-trace-handler)))
                     (values #f #f))])
     
     (current-load

collects/mrlib/include-bitmap.ss

@@ -4,7 +4,7 @@
 	   mzlib/file
            setup/main-collects)
   (require-for-syntax syntax/path-spec
-		      mzlib/cm-accomplice
+		      compiler/cm-accomplice
                       setup/main-collects)
 
   (provide include-bitmap

collects/mzlib/cm-accomplice.ss

@@ -0,0 +1,4 @@
+#lang scheme/base
+
+(require compiler/cm-accomplice)
+(provide (all-from-out compiler/cm-accomplice))

collects/mzlib/cm.ss

@@ -0,0 +1,4 @@
+#lang scheme/base
+
+(require compiler/cm)
+(provide (all-from-out compiler/cm))

collects/scheme/include.ss

@@ -4,7 +4,7 @@
                      syntax/stx
                      syntax/path-spec
                      mzlib/private/increader
-                     mzlib/cm-accomplice))
+                     compiler/cm-accomplice))
 
 (provide include
          include-at/relative-to

collects/setup/main.ss

@@ -110,10 +110,10 @@
                                                   (lambda () (loop #t)))))])
 			     ;; Here's the main dynamic load of "cm.ss":
 			     (let ([mk
-				    (dynamic-require 'mzlib/cm
+				    (dynamic-require 'compiler/cm
 						     'make-compilation-manager-load/use-compiled-handler)]
 				   [trust-zos
-				    (dynamic-require 'mzlib/cm 'trust-existing-zos)])
+				    (dynamic-require 'compiler/cm 'trust-existing-zos)])
 			       ;; Return the two extracted functions:
 			       (lambda () (values mk trust-zos)))))))))])
 	(when (on? 'trust-existing-zos values)

collects/setup/setup-go.ss

@@ -6,7 +6,7 @@
 	    "option-sig.ss"
 	    "setup-unit.ss"
 	    "option-unit.ss"
-	    mzlib/cm)
+	    compiler/cm)
 
   (define-values/invoke-unit/infer setup:option@)
 

collects/setup/setup-unit.ss

@@ -4,13 +4,13 @@
 #lang scheme/base
 
 (require scheme/unit
-         mzlib/cm
          scheme/path
          scheme/file
          scheme/port
          scheme/match
          scheme/system
          scheme/list
+         compiler/cm
          planet/planet-archives
          planet/private/planet-shared