From 72c91629893290cce4ea4082b08449b1a6914738 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 10 Jul 2013 09:34:34 -0600 Subject: [PATCH] move `mzscheme' and `mzlib/unit200' from core to "compatibility-lib" Also, move `mzlib/sandbox' to "compatibility-lib". --- pkgs/compatibility-pkgs/compatibility-lib/info.rkt | 4 +++- .../compatibility-lib}/lazy/mz-without-promises.rkt | 0 .../compatibility-lib}/mzlib/private/sigmatch.rkt | 0 .../compatibility-lib}/mzlib/private/sigutil.rkt | 0 .../compatibility-lib}/mzlib/private/unitidmap.rkt | 0 .../compatibility-lib}/mzlib/sandbox.rkt | 0 .../compatibility-pkgs/compatibility-lib}/mzlib/unit200.rkt | 0 .../compatibility-lib}/mzlib/unitsig200.rkt | 0 .../compatibility-lib}/mzscheme/lang/reader.rkt | 0 .../compatibility-pkgs/compatibility-lib}/mzscheme/main.rkt | 0 .../compatibility-lib}/mzscheme/private/old-ds.rkt | 0 .../compatibility-lib}/mzscheme/private/old-if.rkt | 0 .../compatibility-lib}/mzscheme/private/old-procs.rkt | 0 .../compatibility-lib}/mzscheme/private/old-rp.rkt | 0 .../compatibility-lib}/mzscheme/private/stxmz-body.rkt | 0 pkgs/errortrace-pkgs/errortrace-lib/errortrace/zo-compile.rkt | 2 +- pkgs/gui-pkgs/gui-test/info.rkt | 3 ++- pkgs/lazy/info.rkt | 3 ++- pkgs/srfi-pkgs/srfi-doc/info.rkt | 3 ++- 19 files changed, 10 insertions(+), 5 deletions(-) rename pkgs/{ => compatibility-pkgs/compatibility-lib}/lazy/mz-without-promises.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/mzlib/private/sigmatch.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/mzlib/private/sigutil.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/mzlib/private/unitidmap.rkt (100%) rename pkgs/{sandbox-lib => compatibility-pkgs/compatibility-lib}/mzlib/sandbox.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/mzlib/unit200.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/mzlib/unitsig200.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/mzscheme/lang/reader.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/mzscheme/main.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/mzscheme/private/old-ds.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/mzscheme/private/old-if.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/mzscheme/private/old-procs.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/mzscheme/private/old-rp.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-pkgs/compatibility-lib}/mzscheme/private/stxmz-body.rkt (100%) diff --git a/pkgs/compatibility-pkgs/compatibility-lib/info.rkt b/pkgs/compatibility-pkgs/compatibility-lib/info.rkt index 117849a284..c6da929d41 100644 --- a/pkgs/compatibility-pkgs/compatibility-lib/info.rkt +++ b/pkgs/compatibility-pkgs/compatibility-lib/info.rkt @@ -1,3 +1,5 @@ #lang info (define collection 'multi) -(define deps '("base" "net-lib")) +(define deps '("base" + "net-lib" + "sandbox-lib")) diff --git a/pkgs/lazy/mz-without-promises.rkt b/pkgs/compatibility-pkgs/compatibility-lib/lazy/mz-without-promises.rkt similarity index 100% rename from pkgs/lazy/mz-without-promises.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/lazy/mz-without-promises.rkt diff --git a/racket/lib/collects/mzlib/private/sigmatch.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigmatch.rkt similarity index 100% rename from racket/lib/collects/mzlib/private/sigmatch.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigmatch.rkt diff --git a/racket/lib/collects/mzlib/private/sigutil.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigutil.rkt similarity index 100% rename from racket/lib/collects/mzlib/private/sigutil.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigutil.rkt diff --git a/racket/lib/collects/mzlib/private/unitidmap.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/unitidmap.rkt similarity index 100% rename from racket/lib/collects/mzlib/private/unitidmap.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/unitidmap.rkt diff --git a/pkgs/sandbox-lib/mzlib/sandbox.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/sandbox.rkt similarity index 100% rename from pkgs/sandbox-lib/mzlib/sandbox.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzlib/sandbox.rkt diff --git a/racket/lib/collects/mzlib/unit200.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit200.rkt similarity index 100% rename from racket/lib/collects/mzlib/unit200.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit200.rkt diff --git a/racket/lib/collects/mzlib/unitsig200.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unitsig200.rkt similarity index 100% rename from racket/lib/collects/mzlib/unitsig200.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzlib/unitsig200.rkt diff --git a/racket/lib/collects/mzscheme/lang/reader.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/lang/reader.rkt similarity index 100% rename from racket/lib/collects/mzscheme/lang/reader.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzscheme/lang/reader.rkt diff --git a/racket/lib/collects/mzscheme/main.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/main.rkt similarity index 100% rename from racket/lib/collects/mzscheme/main.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzscheme/main.rkt diff --git a/racket/lib/collects/mzscheme/private/old-ds.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-ds.rkt similarity index 100% rename from racket/lib/collects/mzscheme/private/old-ds.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-ds.rkt diff --git a/racket/lib/collects/mzscheme/private/old-if.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-if.rkt similarity index 100% rename from racket/lib/collects/mzscheme/private/old-if.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-if.rkt diff --git a/racket/lib/collects/mzscheme/private/old-procs.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-procs.rkt similarity index 100% rename from racket/lib/collects/mzscheme/private/old-procs.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-procs.rkt diff --git a/racket/lib/collects/mzscheme/private/old-rp.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-rp.rkt similarity index 100% rename from racket/lib/collects/mzscheme/private/old-rp.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-rp.rkt diff --git a/racket/lib/collects/mzscheme/private/stxmz-body.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/stxmz-body.rkt similarity index 100% rename from racket/lib/collects/mzscheme/private/stxmz-body.rkt rename to pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/stxmz-body.rkt diff --git a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/zo-compile.rkt b/pkgs/errortrace-pkgs/errortrace-lib/errortrace/zo-compile.rkt index 58ccfbc19b..d654336d24 100644 --- a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/zo-compile.rkt +++ b/pkgs/errortrace-pkgs/errortrace-lib/errortrace/zo-compile.rkt @@ -1,4 +1,4 @@ -(module zo-compile mzscheme +(module zo-compile racket/base (require "errortrace-lib.rkt") (provide zo-compile) diff --git a/pkgs/gui-pkgs/gui-test/info.rkt b/pkgs/gui-pkgs/gui-test/info.rkt index 7969cc6c07..da96c24258 100644 --- a/pkgs/gui-pkgs/gui-test/info.rkt +++ b/pkgs/gui-pkgs/gui-test/info.rkt @@ -6,5 +6,6 @@ "gui-lib" "rackunit-lib" "scribble-lib" - "pconvert-lib")) + "pconvert-lib" + "compatibility-lib")) (define build-deps '()) diff --git a/pkgs/lazy/info.rkt b/pkgs/lazy/info.rkt index ce7593b7af..54cc149051 100644 --- a/pkgs/lazy/info.rkt +++ b/pkgs/lazy/info.rkt @@ -22,5 +22,6 @@ (define deps '("base" "drracket" "htdp" - "string-constants-lib")) + "string-constants-lib" + "compatibility-lib")) (define build-deps '("scribble-lib")) diff --git a/pkgs/srfi-pkgs/srfi-doc/info.rkt b/pkgs/srfi-pkgs/srfi-doc/info.rkt index 4e039efe9b..74e1c76d25 100644 --- a/pkgs/srfi-pkgs/srfi-doc/info.rkt +++ b/pkgs/srfi-pkgs/srfi-doc/info.rkt @@ -7,4 +7,5 @@ "srfi-lib" "racket-doc" "r5rs-doc" - "r6rs-doc")) + "r6rs-doc" + "compatibility-lib"))