diff --git a/collects/drscheme/private/drscheme-normal.ss b/collects/drscheme/private/drscheme-normal.ss index a797e2b001..8255ec6eec 100644 --- a/collects/drscheme/private/drscheme-normal.ss +++ b/collects/drscheme/private/drscheme-normal.ss @@ -275,4 +275,4 @@ (parent f))]) (send f show #t))))) - (dynamic-require '(lib "start.ss" "drscheme" "private") #f)) + (dynamic-require '(lib "tool-lib.ss" "drscheme") #f)) diff --git a/collects/drscheme/private/drsig.ss b/collects/drscheme/private/drsig.ss index bb5a886825..c9fa74332d 100644 --- a/collects/drscheme/private/drsig.ss +++ b/collects/drscheme/private/drsig.ss @@ -27,8 +27,7 @@ drscheme:font^ drscheme:modes^ drscheme:tool-exports^ - drscheme:tool^ - drscheme^) + drscheme:tool^) (define-signature drscheme:modes^ (add-mode @@ -278,8 +277,4 @@ (unit drscheme:help-desk : drscheme:help-desk^) (unit drscheme:eval : drscheme:eval^) (unit drscheme:teachpack : drscheme:teachpack^) - (unit drscheme:modes : drscheme:modes^))) - - (define-signature drscheme^ - ((unit drscheme:teachpack : drscheme:teachpack^) - (unit drscheme:language-configuration : drscheme:language-configuration/internal^)))) + (unit drscheme:modes : drscheme:modes^)))) diff --git a/collects/drscheme/private/link.ss b/collects/drscheme/private/link.ss index 855b9d397c..d4824bf170 100644 --- a/collects/drscheme/private/link.ss +++ b/collects/drscheme/private/link.ss @@ -65,5 +65,14 @@ modes help-desk)]) (export + (unit debug drscheme:debug) + (unit unit drscheme:unit) + (unit rep drscheme:rep) + (unit frame drscheme:frame) + (unit get/extend drscheme:get/extend) + (unit language-configuration drscheme:language-configuration) + (unit language drscheme:language) + (unit help-desk drscheme:help-desk) + (unit eval drscheme:eval) (unit teachpack drscheme:teachpack) - (unit language-configuration drscheme:language-configuration))))) + (unit modes drscheme:modes))))) diff --git a/collects/drscheme/private/start.ss b/collects/drscheme/private/start.ss deleted file mode 100644 index ff936d439c..0000000000 --- a/collects/drscheme/private/start.ss +++ /dev/null @@ -1,12 +0,0 @@ - -(module start mzscheme - (require "link.ss" - "drsig.ss" - (lib "class.ss") - (lib "unitsig.ss") - (lib "framework.ss" "framework") - (lib "splash.ss" "framework")) - - (shutdown-splash) - (define-values/invoke-unit/sig drscheme^ drscheme@) - (close-splash)) diff --git a/collects/drscheme/tool-lib.ss b/collects/drscheme/tool-lib.ss new file mode 100644 index 0000000000..0423e9a8e6 --- /dev/null +++ b/collects/drscheme/tool-lib.ss @@ -0,0 +1,21 @@ + +#| + +This first time this is loaded, it loads all of drscheme and invokes +the main unit, starting up drscheme. After that, it just provides +all of the names in the tools library, for use defining keybindings + +|# + +(module tool-lib mzscheme + (require "private/link.ss" + "private/drsig.ss" + (lib "class.ss") + (lib "unitsig.ss") + (lib "framework.ss" "framework") + (lib "splash.ss" "framework")) + + (shutdown-splash) + (define-values/invoke-unit/sig drscheme:tool^ drscheme@) + (close-splash) + (provide-signature-elements drscheme:tool^))