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

fix `raco setup' "nothing to do" check w.r.t. Planet paths

Browse Source
This commit is contained in:
Matthew Flatt 2012-06-13 07:44:05 +08:00
parent 7fb38aff44
commit af9d11bfce
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
collects/setup/setup-unit.rkt
View File

@ -439,8 +439,9 @@
(define all-collections-closure (plt-collection-closure all-collections)) (define all-collections-closure (plt-collection-closure all-collections))
(define (check-against-all given-ccs) (define (check-against-all given-ccs nothing-else-to-do?)
(when (null? given-ccs) (when (and (null? given-ccs)
nothing-else-to-do?)
(setup-printf #f "nothing to do") (setup-printf #f "nothing to do")
(exit 1)) (exit 1))
(define (cc->name cc) (define (cc->name cc)
@ -488,6 +489,15 @@
(define (sort-collections-tree ccs) (define (sort-collections-tree ccs)
(sort ccs string<? #:key (lambda (x) (cc-name (first x))))) (sort ccs string<? #:key (lambda (x) (cc-name (first x)))))
(define planet-collects
(if (make-planet)
(filter-map (lambda (spec) (apply planet-cc! spec))
(if no-specific-collections?
(get-all-planet-packages)
(filter-map planet-spec->planet-list
x-specific-planet-dirs)))
null))
(define top-level-plt-collects (define top-level-plt-collects
(if no-specific-collections? (if no-specific-collections?
all-collections all-collections
@ -508,16 +518,8 @@
"nothing to compile in a given collection path: \"~a\"" "nothing to compile in a given collection path: \"~a\""
(string-join c "/"))) (string-join c "/")))
ccs) ccs)
x-specific-collections)))) x-specific-collections)
(null? planet-collects))))
(define planet-collects
(if (make-planet)
(filter-map (lambda (spec) (apply planet-cc! spec))
(if no-specific-collections?
(get-all-planet-packages)
(filter-map planet-spec->planet-list
x-specific-planet-dirs)))
null))
(define planet-dirs-to-compile (define planet-dirs-to-compile
(sort-collections (sort-collections