From 8f539d994bdfa00fa060cdf5c12e3eba7363ce78 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Sat, 6 Jul 2013 11:43:02 -0500 Subject: [PATCH] adjust the collection sorting that 'raco setup' so that it works in our new pkgs world (and has a, hopefully, similar effect) --- racket/lib/collects/setup/setup-unit.rkt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/racket/lib/collects/setup/setup-unit.rkt b/racket/lib/collects/setup/setup-unit.rkt index bc9cd63f2f..1729a4e4b9 100644 --- a/racket/lib/collects/setup/setup-unit.rkt +++ b/racket/lib/collects/setup/setup-unit.rkt @@ -870,7 +870,7 @@ (define (make-zo-step) (define (partition-cct name cct) - (partition (lambda (x) (not (string=? (cc-name (car x)) name))) cct)) + (partition (lambda (x) (not (regexp-match? name (cc-name (car x))))) cct)) (define (move-to where names cct) (for/fold ([cct cct]) ([name (in-list (reverse names))]) (define-values [diff same] (partition-cct name cct)) @@ -891,8 +891,8 @@ (with-specified-mode (lambda () (define cct - (move-to 'beginning (list "compiler" "raco" "racket" "images") - (move-to 'end (list "drracket" "drscheme") + (move-to 'beginning (list #rx"/compiler$" #rx"/raco$" #rx"/racket$" #rx"/images/") + (move-to 'end (list #rx"/drracket") (sort-collections-tree (collection-tree-map top-level-plt-collects))))) (iterate-cct (lambda (cc)