suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change exports from the 'pkg' module so they are all prefixed with pkg-

Browse Source 
(the goal is to avoid shadowing 'remove')
This commit is contained in:
Robby Findler 2013-07-01 19:13:43 -05:00
parent 81f29602d0
commit dfafc9675e
8 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/distro-build/add-catalog.rkt
View File

@ -8,7 +8,7 @@
(define s (url->string url)) (define s (url->string url))
(define l (pkg-config-catalogs)) (define l (pkg-config-catalogs))
(unless (member s l) (unless (member s l)
(apply config #:set #t (apply pkg-config #:set #t
"catalogs" "catalogs"
(append l (list s))))) (append l (list s)))))

4
pkgs/drracket-pkgs/drracket/help/private/bug-report-controls.rkt
View File

@ -7,7 +7,7 @@
setup/dirs setup/dirs
setup/link setup/link
framework framework
(prefix-in pkg: pkg) pkg
(for-syntax racket/base (for-syntax racket/base
racket/list) racket/list)
"buginfo.rkt" "buginfo.rkt"
@ -450,7 +450,7 @@
(parameterize ([current-output-port pkg-info-sp]) (parameterize ([current-output-port pkg-info-sp])
(with-handlers ([exn:fail? (lambda (exn) (with-handlers ([exn:fail? (lambda (exn)
(printf "ERROR:\n~a" (exn-message exn)))]) (printf "ERROR:\n~a" (exn-message exn)))])
(pkg:show))) (pkg-show)))
(send (send pkg-info get-editor) (send (send pkg-info get-editor)
insert insert
(get-output-string pkg-info-sp)) (get-output-string pkg-info-sp))

6
pkgs/drracket-pkgs/drracket/pkg/gui/by-installed.rkt
View File

@ -3,7 +3,7 @@
racket/gui/base racket/gui/base
racket/format racket/format
pkg/lib pkg/lib
(prefix-in pkg: pkg) pkg
string-constants string-constants
"common.rkt") "common.rkt")
@ -87,7 +87,7 @@
(string-constant install-pkg-abort-remove) (string-constant install-pkg-abort-remove)
(lambda () (lambda ()
(apply (apply
pkg:remove pkg-remove
#:scope scope #:scope scope
names))) names)))
(reset-installed-list!)))])) (reset-installed-list!)))]))
@ -104,7 +104,7 @@
(string-constant install-pkg-abort-update) (string-constant install-pkg-abort-update)
(lambda () (lambda ()
(apply (apply
pkg:update pkg-update
#:scope scope #:scope scope
names))) names)))
(reset-installed-list!))])) (reset-installed-list!))]))

6
pkgs/drracket-pkgs/drracket/pkg/gui/by-list.rkt
View File

@ -7,7 +7,7 @@
string-constants string-constants
net/url net/url
pkg/lib pkg/lib
(prefix-in pkg: pkg) pkg
(prefix-in db: pkg/db) (prefix-in db: pkg/db)
"common.rkt") "common.rkt")
@ -180,7 +180,7 @@
(string-constant install-pkg-abort-install)) (string-constant install-pkg-abort-install))
(lambda () (lambda ()
(apply (apply
(if first-inst pkg:update pkg:install) (if first-inst pkg-update pkg-install)
#:scope (and first-inst #:scope (and first-inst
(car first-inst)) (car first-inst))
names))) names)))
@ -201,7 +201,7 @@
(string-constant install-pkg-abort-remove) (string-constant install-pkg-abort-remove)
(lambda () (lambda ()
(apply (apply
pkg:remove pkg-remove
#:scope scope #:scope scope
names))) names)))
(set-box! s #f) (set-box! s #f)

6
pkgs/drracket-pkgs/drracket/pkg/gui/by-source.rkt
View File

@ -120,8 +120,8 @@
[(update) (string-constant install-pkg-abort-update)]) [(update) (string-constant install-pkg-abort-update)])
(lambda () (lambda ()
(define action (case (car res) (define action (case (car res)
[(install) install] [(install) pkg-install]
[(update) update])) [(update) pkg-update]))
(apply action (cdr res)))) (apply action (cdr res))))
(reset-installed-pkgs!))])) (reset-installed-pkgs!))]))
@ -199,7 +199,7 @@
(in-terminal (in-terminal
(lambda () (lambda ()
(define scope (selected-scope)) (define scope (selected-scope))
(config #:scope 'installation #:set #t "default-scope" (~a scope)) (pkg-config #:scope 'installation #:set #t "default-scope" (~a scope))
(printf "Default scope successfully changed to ~a" scope))) (printf "Default scope successfully changed to ~a" scope)))
(adjust-all))])) (adjust-all))]))
(define inferred-scope-msg-parent (new horizontal-panel% (define inferred-scope-msg-parent (new horizontal-panel%

16
pkgs/racket-pkgs/racket-doc/pkg/scribblings/pkg.scrbl
View File

@ -521,14 +521,14 @@ The @racketmodname[pkg] module provides a programmatic interface
to the command sub-sub-commands. to the command sub-sub-commands.
@deftogether[ @deftogether[
(@defthing[install procedure?] (@defthing[pkg-install procedure?]
@defthing[update procedure?] @defthing[pkg-update procedure?]
@defthing[remove procedure?] @defthing[pkg-remove procedure?]
@defthing[show procedure?] @defthing[pkg-show procedure?]
@defthing[config procedure?] @defthing[pkg-config procedure?]
@defthing[create procedure?] @defthing[pkg-create procedure?]
@defthing[catalog-show procedure?] @defthing[pkg-catalog-show procedure?]
@defthing[catalog-copy procedure?]) @defthing[pkg-catalog-copy procedure?])
]{ ]{
Duplicates the @seclink["cmdline"]{command line interface}. Duplicates the @seclink["cmdline"]{command line interface}.

11
racket/lib/collects/pkg/commands.rkt
View File

@ -117,17 +117,22 @@
(define-syntax (commands stx) (define-syntax (commands stx)
(syntax-parse stx (syntax-parse stx
[(_ main-doc:expr c:command ...) [(_ main-doc:expr export-prefix:id c:command ...)
(with-syntax ([(export-names ...)
(map (λ (x) (string->symbol (format "~a~a"
(syntax-e #'export-prefix)
(syntax-e x))))
(syntax->list #'(c.name ...)))])
(syntax/loc stx (syntax/loc stx
(begin (begin
c.function ... c.function ...
(provide c.name ...) (provide export-names ...)
(module+ main (module+ main
c.variables ... c.variables ...
(svn-style-command-line (svn-style-command-line
#:program (short-program+command-name) #:program (short-program+command-name)
#:argv (current-command-line-arguments) #:argv (current-command-line-arguments)
main-doc main-doc
c.command-line ...))))])) c.command-line ...)))))]))
(provide commands) (provide commands)

1
racket/lib/collects/pkg/main.rkt
View File

@ -51,6 +51,7 @@
(commands (commands
"This tool is used for managing installed packages." "This tool is used for managing installed packages."
pkg-
[install [install
"Install packages" "Install packages"
#:once-each #:once-each