diff --git a/collects/compiler/commands/c-ext.ss b/collects/compiler/commands/c-ext.ss index 50dbbea93a..44456ab4f9 100644 --- a/collects/compiler/commands/c-ext.ss +++ b/collects/compiler/commands/c-ext.ss @@ -7,7 +7,7 @@ (require (prefix-in compiler:option: "../option.ss") "../compiler.ss" - rico/command-name + tool/command-name mzlib/cmdline dynext/file dynext/compile diff --git a/collects/compiler/commands/decompile.ss b/collects/compiler/commands/decompile.ss index ee5a4c9eeb..8b16b48434 100644 --- a/collects/compiler/commands/decompile.ss +++ b/collects/compiler/commands/decompile.ss @@ -1,6 +1,6 @@ #lang scheme/base (require scheme/cmdline - rico/command-name + tool/command-name compiler/zo-parse compiler/decompile scheme/pretty) diff --git a/collects/compiler/commands/exe-dir.ss b/collects/compiler/commands/exe-dir.ss index 3952d4d484..95f28d1aee 100644 --- a/collects/compiler/commands/exe-dir.ss +++ b/collects/compiler/commands/exe-dir.ss @@ -1,6 +1,6 @@ #lang scheme/base (require scheme/cmdline - rico/command-name + tool/command-name compiler/distribute) (define verbose (make-parameter #f)) diff --git a/collects/compiler/commands/exe.ss b/collects/compiler/commands/exe.ss index 0c5586ab6a..762df0ff2b 100644 --- a/collects/compiler/commands/exe.ss +++ b/collects/compiler/commands/exe.ss @@ -1,6 +1,6 @@ #lang scheme/base (require scheme/cmdline - rico/command-name + tool/command-name compiler/private/embed dynext/file) diff --git a/collects/compiler/commands/expand.ss b/collects/compiler/commands/expand.ss index 45f3539835..ed742087c1 100644 --- a/collects/compiler/commands/expand.ss +++ b/collects/compiler/commands/expand.ss @@ -1,6 +1,6 @@ #lang scheme/base (require scheme/cmdline - rico/command-name + tool/command-name scheme/pretty) (define source-files diff --git a/collects/compiler/commands/info.ss b/collects/compiler/commands/info.ss index 47ac1abd96..a2fef6dcbd 100644 --- a/collects/compiler/commands/info.ss +++ b/collects/compiler/commands/info.ss @@ -1,6 +1,6 @@ #lang setup/infotab -(define rico +(define racket-tools '(("make" compiler/commands/make "compile source to bytecode" 100) ("exe" compiler/commands/exe "create executable" 20) ("pack" compiler/commands/pack "pack files/collections into a .plt archive" 10) diff --git a/collects/compiler/commands/make.ss b/collects/compiler/commands/make.ss index 17d07381f6..61336ce1e4 100644 --- a/collects/compiler/commands/make.ss +++ b/collects/compiler/commands/make.ss @@ -1,6 +1,6 @@ #lang scheme/base (require scheme/cmdline - rico/command-name + tool/command-name compiler/cm "../compiler.ss" dynext/file) diff --git a/collects/compiler/commands/pack.ss b/collects/compiler/commands/pack.ss index 1605b88d99..add2f667b1 100644 --- a/collects/compiler/commands/pack.ss +++ b/collects/compiler/commands/pack.ss @@ -1,6 +1,6 @@ #lang scheme/base (require scheme/cmdline - rico/command-name + tool/command-name setup/pack setup/getinfo compiler/distribute) diff --git a/collects/help/info.ss b/collects/help/info.ss index 6228d554a8..8d3e9814ac 100644 --- a/collects/help/info.ss +++ b/collects/help/info.ss @@ -1,4 +1,4 @@ #lang setup/infotab (define post-install-collection "installer.ss") -(define rico '(("docs" help/help "search and view documentation" 100))) +(define racket-tools '(("docs" help/help "search and view documentation" 100))) diff --git a/collects/help/installer.ss b/collects/help/installer.ss index 1c89c7bf8b..cd1f5959ed 100644 --- a/collects/help/installer.ss +++ b/collects/help/installer.ss @@ -27,7 +27,7 @@ (parameterize ([current-launcher-variant variant]) (mk-launcher '("-l-" "help/help") (mk-path "plt-help") ;; change to "Racket Docs" - `([exe-name . "plt-help"] ;; get rid of this (in favor of 'rico docs') + `([exe-name . "plt-help"] ;; get rid of this (in favor of 'racket-tool docs') [relative? . #t] [framework-root . #f] [dll-dir . #f] diff --git a/collects/meta/dist-specs.ss b/collects/meta/dist-specs.ss index fbc0f2adbb..d1079e3539 100644 --- a/collects/meta/dist-specs.ss +++ b/collects/meta/dist-specs.ss @@ -431,8 +431,8 @@ platform-dependent := ; hook for package rules mz-extras :+= (- (package: "setup-plt" #:collection "setup/") (cond (not dr) => (srcfile: "plt-installer{|-sig|-unit}.ss"))) -;; -------------------- rico -mz-extras :+= (package: "rico") +;; -------------------- racket-tool +mz-extras :+= (package: "tool") ;; -------------------- launcher mz-extras :+= (- (collects: "launcher") diff --git a/collects/planet/info.ss b/collects/planet/info.ss index 403035ff6c..b39b69aa6a 100644 --- a/collects/planet/info.ss +++ b/collects/planet/info.ss @@ -5,4 +5,4 @@ (define mzscheme-launcher-libraries '("planet.ss")) (define scribblings '(("planet.scrbl" (multi-page) (tool)))) -(define rico '(("planet" planet/planet "manage Planet package installations" 80))) +(define racket-tools '(("planet" planet/planet "manage Planet package installations" 80))) diff --git a/collects/planet/planet.ss b/collects/planet/planet.ss index b04c0ab05c..c1b84adfe6 100644 --- a/collects/planet/planet.ss +++ b/collects/planet/planet.ss @@ -11,7 +11,7 @@ PLANNED FEATURES: (only mzlib/list sort) net/url mzlib/match - rico/command-name + tool/command-name "config.ss" "private/planet-shared.ss" diff --git a/collects/scribble/info.ss b/collects/scribble/info.ss index a135983ab8..5af4d4aaaf 100644 --- a/collects/scribble/info.ss +++ b/collects/scribble/info.ss @@ -3,3 +3,7 @@ (define mzscheme-launcher-names '("scribble")) (define mzscheme-launcher-libraries '("run.ss")) (define compile-omit-paths '("test-reader.ss")) + +(define racket-tools + '(("scribble" scribble/run "render scribble" #f))) + diff --git a/collects/scribble/run.ss b/collects/scribble/run.ss index e6dc70780e..c171c7b76c 100644 --- a/collects/scribble/run.ss +++ b/collects/scribble/run.ss @@ -6,6 +6,7 @@ scheme/cmdline scheme/file scheme/class + tool/command-name (prefix-in text: "text-render.ss") (prefix-in html: "html-render.ss") (prefix-in latex: "latex-render.ss") @@ -35,6 +36,7 @@ (define (run) (command-line + #:program (short-program+command-name) #:once-any [("--text") "generate text-format output (the default)" (void)] diff --git a/collects/scriblib/autobib.ss b/collects/scriblib/autobib.ss index 9c8de65ab8..367449b1e4 100644 --- a/collects/scriblib/autobib.ss +++ b/collects/scriblib/autobib.ss @@ -36,7 +36,7 @@ (lambda (renderer part ri) (let ([s (resolve-get part ri `(,which ,(auto-bib-key bib-entry)))]) (list (make-link-element #f - (list s (auto-bib-specific bib-entry)) + (list (or s "???") (auto-bib-specific bib-entry)) `(autobib ,(auto-bib-key bib-entry)))))) (lambda () "(???)") (lambda () "(???)"))) diff --git a/collects/setup/info.ss b/collects/setup/info.ss index b4d1799be4..d1e201b468 100644 --- a/collects/setup/info.ss +++ b/collects/setup/info.ss @@ -5,4 +5,4 @@ (define mzscheme-launcher-libraries '("main.ss")) (define mzscheme-launcher-names '("Setup PLT")) -(define rico '(("setup" setup/main "install and build libraries and documentation" 90))) +(define racket-tools '(("setup" setup/main "install and build libraries and documentation" 90))) diff --git a/collects/setup/setup-cmdline.ss b/collects/setup/setup-cmdline.ss index aca9af117b..a2081f17ce 100644 --- a/collects/setup/setup-cmdline.ss +++ b/collects/setup/setup-cmdline.ss @@ -6,7 +6,7 @@ #lang scheme/base (require scheme/cmdline - rico/command-name) + tool/command-name) (provide parse-cmdline) @@ -31,9 +31,9 @@ [(current-command-name) (values (format "~a ~a" name (current-command-name)) (program+command-name))] - ;; Hack for bootstrapping, if the program name is "rico", + ;; Hack for bootstrapping, if the program name is "racket-tool", ;; then claim to be the "setup" command: - [(equal? (path->string name) "rico") + [(equal? (path->string name) "racket-tool") (values (format "~a setup" name) (format "~a setup" p))] [else diff --git a/collects/rico/all-tools.ss b/collects/tool/all-tools.ss similarity index 85% rename from collects/rico/all-tools.ss rename to collects/tool/all-tools.ss index 5dff66d18e..d47ac7632e 100644 --- a/collects/rico/all-tools.ss +++ b/collects/tool/all-tools.ss @@ -4,11 +4,11 @@ (provide all-tools) (define (all-tools) - (let* ([dirs (find-relevant-directories '(rico))] + (let* ([dirs (find-relevant-directories '(racket-tools))] [tools (make-hash)]) (for ([i (in-list (map get-info/full dirs))] [d (in-list dirs)]) - (let ([entries (let ([l (i 'rico (lambda () null))]) + (let ([entries (let ([l (i 'racket-tools (lambda () null))]) (if (list? l) l (list l)))]) @@ -33,7 +33,7 @@ [else (fprintf (current-error-port) - "warning: ~s provided bad `rico' spec: ~e" + "warning: ~s provided bad `racket-tools' spec: ~e" d entry)])))) tools)) diff --git a/collects/rico/command-name.ss b/collects/tool/command-name.ss similarity index 100% rename from collects/rico/command-name.ss rename to collects/tool/command-name.ss diff --git a/collects/rico/info.ss b/collects/tool/info.ss similarity index 69% rename from collects/rico/info.ss rename to collects/tool/info.ss index 669d7d3cbc..d3177af88f 100644 --- a/collects/rico/info.ss +++ b/collects/tool/info.ss @@ -3,4 +3,4 @@ (define compile-omit-paths '("main.ss")) (define racket-launcher-libraries '("main.ss")) -(define racket-launcher-names '("Rico")) +(define racket-launcher-names '("racket-tool")) diff --git a/collects/rico/main.lch b/collects/tool/main.lch similarity index 100% rename from collects/rico/main.lch rename to collects/tool/main.lch diff --git a/collects/rico/main.ss b/collects/tool/main.ss similarity index 85% rename from collects/rico/main.ss rename to collects/tool/main.ss index b143beddce..6a95d0e59c 100644 --- a/collects/rico/main.ss +++ b/collects/tool/main.ss @@ -1,5 +1,5 @@ -;; Because `rico setup' is used to rebuild .zos, check for "setup" +;; Because `racket-tool setup' is used to rebuild .zos, check for "setup" ;; directly. ;; Note that this file is listed in "info.ss" so that it never gets a @@ -19,5 +19,4 @@ (cdr (vector->list cmdline)))]) (dynamic-require 'setup/main #f)) - (dynamic-require 'rico/rico #f)))) - + (dynamic-require 'tool/tool #f)))) diff --git a/collects/rico/rico.ss b/collects/tool/tool.ss similarity index 92% rename from collects/rico/rico.ss rename to collects/tool/tool.ss index 25ee0bf783..dca3d2c8d6 100644 --- a/collects/rico/rico.ss +++ b/collects/tool/tool.ss @@ -54,7 +54,7 @@ (find-system-path 'run-file) (car cmdline)) #f])]) - (fprintf (current-error-port) "Usage: rico