From 007d3fe205d8c29aa3788ae65172414729520226 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Tue, 17 Sep 2013 09:00:42 -0400 Subject: [PATCH] Remove units in parts of `compiler`, `dynext`, `setup` and create the `cext-lib` package. `cext-lib` contains much of the contents of `dynext`, which is no longer very widely used. Also moved the implementation of the `mzc` executable to a more appropriate package. Also, used `lazy-require` consistently for dynamically loading implementations. original commit: 9f2755116dcff2a2792916eab09c50cb39113e94 --- pkgs/compiler-lib/compiler/commands/info.rkt | 1 - pkgs/compiler-lib/compiler/commands/make.rkt | 2 +- pkgs/compiler-lib/compiler/compiler-unit.rkt | 5 +++++ .../compiler-lib}/compiler/embed-sig.rkt | 0 pkgs/compiler-lib/compiler/embed-unit.rkt | 9 +++++++++ pkgs/compiler-lib/compiler/option-unit.rkt | 7 +++++++ {racket/collects => pkgs/compiler-lib}/compiler/sig.rkt | 0 .../compiler-lib}/launcher/launcher-sig.rkt | 0 pkgs/compiler-lib/launcher/launcher-unit.rkt | 7 +++++++ .../collects => pkgs/compiler-lib}/setup/option-sig.rkt | 0 pkgs/compiler-lib/setup/option-unit.rkt | 6 ++++++ pkgs/compiler-lib/setup/setup-unit.rkt | 9 +++++++++ 12 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 pkgs/compiler-lib/compiler/compiler-unit.rkt rename {racket/collects => pkgs/compiler-lib}/compiler/embed-sig.rkt (100%) create mode 100644 pkgs/compiler-lib/compiler/embed-unit.rkt create mode 100644 pkgs/compiler-lib/compiler/option-unit.rkt rename {racket/collects => pkgs/compiler-lib}/compiler/sig.rkt (100%) rename {racket/collects => pkgs/compiler-lib}/launcher/launcher-sig.rkt (100%) create mode 100644 pkgs/compiler-lib/launcher/launcher-unit.rkt rename {racket/collects => pkgs/compiler-lib}/setup/option-sig.rkt (100%) create mode 100644 pkgs/compiler-lib/setup/option-unit.rkt create mode 100644 pkgs/compiler-lib/setup/setup-unit.rkt diff --git a/pkgs/compiler-lib/compiler/commands/info.rkt b/pkgs/compiler-lib/compiler/commands/info.rkt index a3f02f0725..1b766b6c9f 100644 --- a/pkgs/compiler-lib/compiler/commands/info.rkt +++ b/pkgs/compiler-lib/compiler/commands/info.rkt @@ -9,5 +9,4 @@ ("test" compiler/commands/test "run tests associated with files/directories" 15) ("expand" compiler/commands/expand "macro-expand source" #f) ("distribute" compiler/commands/exe-dir "prepare executable(s) in a directory for distribution" #f) - ("ctool" compiler/commands/ctool "compile and link C-based extensions" #f) ("demodularize" compiler/demodularizer/batch "produce a whole program from a single module" #f))) diff --git a/pkgs/compiler-lib/compiler/commands/make.rkt b/pkgs/compiler-lib/compiler/commands/make.rkt index 622353ac7b..b998b0e7c8 100644 --- a/pkgs/compiler-lib/compiler/commands/make.rkt +++ b/pkgs/compiler-lib/compiler/commands/make.rkt @@ -2,7 +2,7 @@ (require scheme/cmdline raco/command-name compiler/cm - "../compiler.rkt" + compiler/compiler dynext/file setup/parallel-build racket/match) diff --git a/pkgs/compiler-lib/compiler/compiler-unit.rkt b/pkgs/compiler-lib/compiler/compiler-unit.rkt new file mode 100644 index 0000000000..4f6b768420 --- /dev/null +++ b/pkgs/compiler-lib/compiler/compiler-unit.rkt @@ -0,0 +1,5 @@ +#lang racket/base + +(require compiler/compiler compiler/sig racket/unit) +(provide compiler@) +(define-unit-from-context compiler@ compiler^) \ No newline at end of file diff --git a/racket/collects/compiler/embed-sig.rkt b/pkgs/compiler-lib/compiler/embed-sig.rkt similarity index 100% rename from racket/collects/compiler/embed-sig.rkt rename to pkgs/compiler-lib/compiler/embed-sig.rkt diff --git a/pkgs/compiler-lib/compiler/embed-unit.rkt b/pkgs/compiler-lib/compiler/embed-unit.rkt new file mode 100644 index 0000000000..6361ca61cd --- /dev/null +++ b/pkgs/compiler-lib/compiler/embed-unit.rkt @@ -0,0 +1,9 @@ +#lang racket/base +(require racket/unit + racket/contract + "sig.rkt" + compiler/embed + "embed-sig.rkt") + +(define-unit-from-context compiler:embed@ compiler:embed^) +(provide compiler:embed@) diff --git a/pkgs/compiler-lib/compiler/option-unit.rkt b/pkgs/compiler-lib/compiler/option-unit.rkt new file mode 100644 index 0000000000..c0f42328b5 --- /dev/null +++ b/pkgs/compiler-lib/compiler/option-unit.rkt @@ -0,0 +1,7 @@ +#lang racket/base + +(require racket/unit compiler/sig compiler/option) + +(provide compiler:option@) + +(define-unit-from-context compiler:option@ compiler:option^) diff --git a/racket/collects/compiler/sig.rkt b/pkgs/compiler-lib/compiler/sig.rkt similarity index 100% rename from racket/collects/compiler/sig.rkt rename to pkgs/compiler-lib/compiler/sig.rkt diff --git a/racket/collects/launcher/launcher-sig.rkt b/pkgs/compiler-lib/launcher/launcher-sig.rkt similarity index 100% rename from racket/collects/launcher/launcher-sig.rkt rename to pkgs/compiler-lib/launcher/launcher-sig.rkt diff --git a/pkgs/compiler-lib/launcher/launcher-unit.rkt b/pkgs/compiler-lib/launcher/launcher-unit.rkt new file mode 100644 index 0000000000..165362229c --- /dev/null +++ b/pkgs/compiler-lib/launcher/launcher-unit.rkt @@ -0,0 +1,7 @@ +#lang racket/base + +(require racket/unit "launcher-sig.rkt" launcher/launcher) + +(provide launcher@) + +(define-unit-from-context launcher@ launcher^) diff --git a/racket/collects/setup/option-sig.rkt b/pkgs/compiler-lib/setup/option-sig.rkt similarity index 100% rename from racket/collects/setup/option-sig.rkt rename to pkgs/compiler-lib/setup/option-sig.rkt diff --git a/pkgs/compiler-lib/setup/option-unit.rkt b/pkgs/compiler-lib/setup/option-unit.rkt new file mode 100644 index 0000000000..1b36be3f1d --- /dev/null +++ b/pkgs/compiler-lib/setup/option-unit.rkt @@ -0,0 +1,6 @@ +#lang racket/base +(require racket/unit setup/option "option-sig.rkt") + +(provide setup:option@ set-flag-params) + +(define-unit-from-context setup:option@ setup-option^) \ No newline at end of file diff --git a/pkgs/compiler-lib/setup/setup-unit.rkt b/pkgs/compiler-lib/setup/setup-unit.rkt new file mode 100644 index 0000000000..addfd12088 --- /dev/null +++ b/pkgs/compiler-lib/setup/setup-unit.rkt @@ -0,0 +1,9 @@ +#lang racket/base + +(require racket/unit setup/setup-core) + +(provide setup@) +(define-unit setup@ + (import) + (export) + (setup-core))