From 765d30f121ca2f298fe5994ae794274350fec5e0 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Wed, 10 Nov 2010 09:13:36 -0700 Subject: [PATCH] Switching to Racket --- collects/meta/drdr/analyze.rkt | 4 ++-- collects/meta/drdr/archive-test.rkt | 2 +- collects/meta/drdr/archive.rkt | 2 +- collects/meta/drdr/cache.rkt | 2 +- collects/meta/drdr/cc.rkt | 6 +++--- collects/meta/drdr/config.rkt | 2 +- collects/meta/drdr/diff.rkt | 2 +- collects/meta/drdr/diffcmd.rkt | 4 ++-- collects/meta/drdr/dirstruct.rkt | 2 +- collects/meta/drdr/formats.rkt | 2 +- collects/meta/drdr/good-init.sh | 2 +- collects/meta/drdr/graph.rkt | 4 ++-- collects/meta/drdr/graphs/build-graph.rkt | 2 +- collects/meta/drdr/graphs/constants.rkt | 2 +- collects/meta/drdr/graphs/mk-img.rkt | 2 +- collects/meta/drdr/list-count.rkt | 2 +- collects/meta/drdr/main.rkt | 8 ++++---- collects/meta/drdr/make-archive.rkt | 4 ++-- collects/meta/drdr/metadata.rkt | 2 +- collects/meta/drdr/monitor-scm.rkt | 2 +- collects/meta/drdr/notify.rkt | 2 +- collects/meta/drdr/path-utils.rkt | 4 ++-- collects/meta/drdr/plt-build.rkt | 20 ++++++++------------ collects/meta/drdr/render.rkt | 6 +++--- collects/meta/drdr/rendering.rkt | 2 +- collects/meta/drdr/replay-log.rkt | 2 +- collects/meta/drdr/replay.rkt | 6 +++--- collects/meta/drdr/retry.rkt | 2 +- collects/meta/drdr/rewriting.rkt | 2 +- collects/meta/drdr/run-collect.rkt | 2 +- collects/meta/drdr/scm.rkt | 4 ++-- collects/meta/drdr/sema.rkt | 2 +- collects/meta/drdr/set-browser.rkt | 2 +- collects/meta/drdr/status.rkt | 2 +- collects/meta/drdr/svn.rkt | 2 +- collects/meta/drdr/time-file.rkt | 2 +- collects/meta/drdr/time.rkt | 6 +++--- collects/meta/drdr/vdbm.rkt | 2 +- 38 files changed, 62 insertions(+), 66 deletions(-) diff --git a/collects/meta/drdr/analyze.rkt b/collects/meta/drdr/analyze.rkt index 945c01acab..2d1d8468a2 100644 --- a/collects/meta/drdr/analyze.rkt +++ b/collects/meta/drdr/analyze.rkt @@ -1,5 +1,5 @@ -#lang scheme -(require scheme/file +#lang racket +(require racket/file "diff.rkt" "scm.rkt" "list-count.rkt" diff --git a/collects/meta/drdr/archive-test.rkt b/collects/meta/drdr/archive-test.rkt index 7c3a1ee1db..d42acc14d7 100644 --- a/collects/meta/drdr/archive-test.rkt +++ b/collects/meta/drdr/archive-test.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "path-utils.rkt" "archive.rkt" tests/eli-tester) diff --git a/collects/meta/drdr/archive.rkt b/collects/meta/drdr/archive.rkt index 7f1fe9eebf..3c4e38984e 100644 --- a/collects/meta/drdr/archive.rkt +++ b/collects/meta/drdr/archive.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "path-utils.rkt") (define (value->bytes v) diff --git a/collects/meta/drdr/cache.rkt b/collects/meta/drdr/cache.rkt index 002f7eea60..f94c9c417b 100644 --- a/collects/meta/drdr/cache.rkt +++ b/collects/meta/drdr/cache.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "path-utils.rkt") ; (symbols 'always 'cache 'no-cache) diff --git a/collects/meta/drdr/cc.rkt b/collects/meta/drdr/cc.rkt index 386f8654b3..adb6a844ed 100644 --- a/collects/meta/drdr/cc.rkt +++ b/collects/meta/drdr/cc.rkt @@ -1,9 +1,9 @@ -#lang scheme +#lang racket (require "path-utils.rkt" "run-collect.rkt" "replay.rkt" - scheme/runtime-path - scheme/system) + racket/runtime-path + racket/system) (match-define (list* command real-args) diff --git a/collects/meta/drdr/config.rkt b/collects/meta/drdr/config.rkt index 81ba764f3a..074ea8198e 100644 --- a/collects/meta/drdr/config.rkt +++ b/collects/meta/drdr/config.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "cache.rkt" "dirstruct.rkt" diff --git a/collects/meta/drdr/diff.rkt b/collects/meta/drdr/diff.rkt index 041d464c12..f3c65efaa0 100644 --- a/collects/meta/drdr/diff.rkt +++ b/collects/meta/drdr/diff.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "status.rkt") (define (timing? bs) diff --git a/collects/meta/drdr/diffcmd.rkt b/collects/meta/drdr/diffcmd.rkt index cac49a5f0d..a39ae68f2f 100644 --- a/collects/meta/drdr/diffcmd.rkt +++ b/collects/meta/drdr/diffcmd.rkt @@ -1,5 +1,5 @@ -#lang scheme -(require scheme/system +#lang racket +(require racket/system "dirstruct.rkt" "status.rkt" (except-in "diff.rkt" diff --git a/collects/meta/drdr/dirstruct.rkt b/collects/meta/drdr/dirstruct.rkt index 24010875d6..3d182947f4 100644 --- a/collects/meta/drdr/dirstruct.rkt +++ b/collects/meta/drdr/dirstruct.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "path-utils.rkt") (define number-of-cpus diff --git a/collects/meta/drdr/formats.rkt b/collects/meta/drdr/formats.rkt index d64aae20d0..c8b35a96fa 100644 --- a/collects/meta/drdr/formats.rkt +++ b/collects/meta/drdr/formats.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (define (formats v u) (if (equal? v -inf.0) "ε" diff --git a/collects/meta/drdr/good-init.sh b/collects/meta/drdr/good-init.sh index 34cfe40c47..f0693a3321 100755 --- a/collects/meta/drdr/good-init.sh +++ b/collects/meta/drdr/good-init.sh @@ -2,7 +2,7 @@ export PLTSTDERR="info" PLTROOT="/opt/plt/plt" LOGS="/opt/plt/logs" -MZ="$PLTROOT/bin/racket" +R="$PLTROOT/bin/racket" DRDR="/opt/svn/drdr" cd "$DRDR" diff --git a/collects/meta/drdr/graph.rkt b/collects/meta/drdr/graph.rkt index a68f5d0c79..7612e6e6ea 100644 --- a/collects/meta/drdr/graph.rkt +++ b/collects/meta/drdr/graph.rkt @@ -1,5 +1,5 @@ -#lang scheme -(require scheme/system +#lang racket +(require racket/system "config.rkt" "path-utils.rkt" "dirstruct.rkt") diff --git a/collects/meta/drdr/graphs/build-graph.rkt b/collects/meta/drdr/graphs/build-graph.rkt index 7e69111279..61ba99cbee 100644 --- a/collects/meta/drdr/graphs/build-graph.rkt +++ b/collects/meta/drdr/graphs/build-graph.rkt @@ -1,4 +1,4 @@ -#lang scheme/gui +#lang racket/gui (require xml) (require "constants.rkt") diff --git a/collects/meta/drdr/graphs/constants.rkt b/collects/meta/drdr/graphs/constants.rkt index d30ccf9c32..ecb4d4aa5e 100644 --- a/collects/meta/drdr/graphs/constants.rkt +++ b/collects/meta/drdr/graphs/constants.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide (all-defined-out)) (define total-width 800) (define before-and-after-image-width 18) diff --git a/collects/meta/drdr/graphs/mk-img.rkt b/collects/meta/drdr/graphs/mk-img.rkt index 807e4d19ce..d5b212a807 100644 --- a/collects/meta/drdr/graphs/mk-img.rkt +++ b/collects/meta/drdr/graphs/mk-img.rkt @@ -1,4 +1,4 @@ -#lang scheme/gui +#lang racket/gui (require 2htdp/image "constants.rkt") diff --git a/collects/meta/drdr/list-count.rkt b/collects/meta/drdr/list-count.rkt index 068657cfab..9ac38ece10 100644 --- a/collects/meta/drdr/list-count.rkt +++ b/collects/meta/drdr/list-count.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (define list/count (or/c exact-nonnegative-integer? (listof bytes?))) diff --git a/collects/meta/drdr/main.rkt b/collects/meta/drdr/main.rkt index 6e1a626caf..740c6e2ecd 100644 --- a/collects/meta/drdr/main.rkt +++ b/collects/meta/drdr/main.rkt @@ -1,6 +1,6 @@ -#lang scheme +#lang racket -(require scheme/system +(require racket/system "dirstruct.rkt" "analyze.rkt" "monitor-scm.rkt" @@ -35,7 +35,7 @@ (lambda () (system*/exit-code (path->string - (build-path (plt-directory) "plt" "bin" "mzscheme")) + (build-path (plt-directory) "plt" "bin" "racket")) "-t" (path->string (build-path (drdr-directory) "time.rkt")) "--" @@ -47,7 +47,7 @@ (lambda () (system*/exit-code (path->string - (build-path (plt-directory) "plt" "bin" "mzscheme")) + (build-path (plt-directory) "plt" "bin" "racket")) "-t" (path->string (build-path (drdr-directory) "make-archive.rkt")) "--" diff --git a/collects/meta/drdr/make-archive.rkt b/collects/meta/drdr/make-archive.rkt index 78a5489860..47b0dea408 100644 --- a/collects/meta/drdr/make-archive.rkt +++ b/collects/meta/drdr/make-archive.rkt @@ -1,5 +1,5 @@ -#lang scheme -(require scheme/system +#lang racket +(require racket/system "config.rkt" "archive.rkt" "path-utils.rkt" diff --git a/collects/meta/drdr/metadata.rkt b/collects/meta/drdr/metadata.rkt index 4e0c4c4369..ecc1168544 100644 --- a/collects/meta/drdr/metadata.rkt +++ b/collects/meta/drdr/metadata.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "path-utils.rkt" "dirstruct.rkt" "scm.rkt") diff --git a/collects/meta/drdr/monitor-scm.rkt b/collects/meta/drdr/monitor-scm.rkt index 0f4a83eb48..5c6b5bd535 100644 --- a/collects/meta/drdr/monitor-scm.rkt +++ b/collects/meta/drdr/monitor-scm.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "scm.rkt" "retry.rkt") diff --git a/collects/meta/drdr/notify.rkt b/collects/meta/drdr/notify.rkt index d747717798..c5eee7390e 100644 --- a/collects/meta/drdr/notify.rkt +++ b/collects/meta/drdr/notify.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (define (notify! fmt . args) (log-info (format "[~a] ~a" (current-seconds) (apply format fmt args)))) diff --git a/collects/meta/drdr/path-utils.rkt b/collects/meta/drdr/path-utils.rkt index 7259f59eab..7768d29c73 100644 --- a/collects/meta/drdr/path-utils.rkt +++ b/collects/meta/drdr/path-utils.rkt @@ -1,5 +1,5 @@ -#lang scheme -(require scheme/file) +#lang racket +(require racket/file) (define current-temporary-directory (make-parameter #f)) diff --git a/collects/meta/drdr/plt-build.rkt b/collects/meta/drdr/plt-build.rkt index d46d5df48c..20ba7cbc1f 100644 --- a/collects/meta/drdr/plt-build.rkt +++ b/collects/meta/drdr/plt-build.rkt @@ -1,6 +1,6 @@ -#lang scheme -(require scheme/file - scheme/runtime-path +#lang racket +(require racket/file + racket/runtime-path (planet jaymccarthy/job-queue) "metadata.rkt" "run-collect.rkt" @@ -150,16 +150,12 @@ (rebase-path trunk-dir log-dir)) (define racket-path (path->string (build-path trunk-dir "bin" "racket"))) - ; XXX fix - (define mzc-path - (path->string (build-path trunk-dir "bin" "mzc"))) + (define raco-path + (path->string (build-path trunk-dir "bin" "raco"))) (define gracket-text-path (path->string (build-path trunk-dir "bin" "gracket-text"))) (define gracket-path (path->string (build-path trunk-dir "bin" "gracket"))) - ; XXX fix - (define planet-path - (path->string (build-path trunk-dir "bin" "planet"))) (define collects-pth (build-path trunk-dir "collects")) (define test-workers (make-job-queue (number-of-cpus))) @@ -192,7 +188,7 @@ [(list-rest (or 'mzscheme 'racket) rst) (lambda () (list* racket-path rst))] [(list-rest 'mzc rst) - (lambda () (list* mzc-path rst))] + (lambda () (list* raco-path "make" rst))] [(list-rest (or 'mred 'mred-text 'gracket 'gracket-text) rst) @@ -235,8 +231,8 @@ #:timeout (current-make-install-timeout-seconds) #:env (current-env) (build-path log-dir "planet" auth pkg maj min) - planet-path - (list "install" auth pkg maj min))])) + raco-path + (list "planet" "install" auth pkg maj min))])) (run/collect/wait/log #:timeout (current-subprocess-timeout-seconds) #:env (current-env) diff --git a/collects/meta/drdr/render.rkt b/collects/meta/drdr/render.rkt index 9eaabe0aa1..305054f3c9 100644 --- a/collects/meta/drdr/render.rkt +++ b/collects/meta/drdr/render.rkt @@ -1,6 +1,6 @@ -#lang at-exp scheme -(require scheme/date - scheme/runtime-path +#lang at-exp racket +(require racket/date + racket/runtime-path xml "config.rkt" "diff.rkt" diff --git a/collects/meta/drdr/rendering.rkt b/collects/meta/drdr/rendering.rkt index af90026e38..795d0a8253 100644 --- a/collects/meta/drdr/rendering.rkt +++ b/collects/meta/drdr/rendering.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "list-count.rkt") (define-struct rendering (start end duration timeout? unclean-exit? stderr? responsible changed?) #:prefab) diff --git a/collects/meta/drdr/replay-log.rkt b/collects/meta/drdr/replay-log.rkt index 7ba499d0ba..ebc90d3283 100644 --- a/collects/meta/drdr/replay-log.rkt +++ b/collects/meta/drdr/replay-log.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "replay.rkt" "cache.rkt" "status.rkt") diff --git a/collects/meta/drdr/replay.rkt b/collects/meta/drdr/replay.rkt index 3687244715..b3c122e16e 100644 --- a/collects/meta/drdr/replay.rkt +++ b/collects/meta/drdr/replay.rkt @@ -1,5 +1,5 @@ -#lang scheme -(require (prefix-in scheme: scheme) +#lang racket +(require (prefix-in racket: racket) "formats.rkt" "status.rkt") @@ -22,7 +22,7 @@ (define (replay-exit-code s) (when (exit? s) - (scheme:exit (exit-code s)))) + (racket:exit (exit-code s)))) (provide/contract [replay-exit-code (status? . -> . void)] diff --git a/collects/meta/drdr/retry.rkt b/collects/meta/drdr/retry.rkt index 2026f39a76..dac18cb12f 100644 --- a/collects/meta/drdr/retry.rkt +++ b/collects/meta/drdr/retry.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "notify.rkt") (define-syntax-rule (retry-until-success msg expr ...) diff --git a/collects/meta/drdr/rewriting.rkt b/collects/meta/drdr/rewriting.rkt index 2da68e2816..f5bb7bc404 100644 --- a/collects/meta/drdr/rewriting.rkt +++ b/collects/meta/drdr/rewriting.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "status.rkt") (define (rewrite-status #:rewrite rewrite-string s) diff --git a/collects/meta/drdr/run-collect.rkt b/collects/meta/drdr/run-collect.rkt index e1e35d2888..fa1aabfc35 100644 --- a/collects/meta/drdr/run-collect.rkt +++ b/collects/meta/drdr/run-collect.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "status.rkt" "notify.rkt" "rewriting.rkt" diff --git a/collects/meta/drdr/scm.rkt b/collects/meta/drdr/scm.rkt index f53c48ac74..10b2a18e96 100644 --- a/collects/meta/drdr/scm.rkt +++ b/collects/meta/drdr/scm.rkt @@ -1,9 +1,9 @@ -#lang scheme +#lang racket (require "svn.rkt" "path-utils.rkt" "dirstruct.rkt" net/url - scheme/system) + racket/system) (provide (all-from-out "svn.rkt")) diff --git a/collects/meta/drdr/sema.rkt b/collects/meta/drdr/sema.rkt index 5f76322a1a..5e1e620922 100644 --- a/collects/meta/drdr/sema.rkt +++ b/collects/meta/drdr/sema.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (define (semaphore-wait* sema how-many) (unless (zero? how-many) diff --git a/collects/meta/drdr/set-browser.rkt b/collects/meta/drdr/set-browser.rkt index 6290979c0c..6729375486 100644 --- a/collects/meta/drdr/set-browser.rkt +++ b/collects/meta/drdr/set-browser.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (printf "Setting the default browser to something safe...\n") diff --git a/collects/meta/drdr/status.rkt b/collects/meta/drdr/status.rkt index 9ebef94911..3b9449f446 100644 --- a/collects/meta/drdr/status.rkt +++ b/collects/meta/drdr/status.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (define-struct event () #:prefab) (define-struct (stdout event) (bytes) #:prefab) (define-struct (stderr event) (bytes) #:prefab) diff --git a/collects/meta/drdr/svn.rkt b/collects/meta/drdr/svn.rkt index 56ee231d07..1af7fe24a7 100644 --- a/collects/meta/drdr/svn.rkt +++ b/collects/meta/drdr/svn.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (define-struct svn-rev () #:prefab) (define-struct (svn-rev-nolog svn-rev) () #:prefab) diff --git a/collects/meta/drdr/time-file.rkt b/collects/meta/drdr/time-file.rkt index cfec7091dd..6a4667e139 100644 --- a/collects/meta/drdr/time-file.rkt +++ b/collects/meta/drdr/time-file.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require "config.rkt" "dirstruct.rkt" "cache.rkt" diff --git a/collects/meta/drdr/time.rkt b/collects/meta/drdr/time.rkt index 0889ba9f21..70de4e7465 100644 --- a/collects/meta/drdr/time.rkt +++ b/collects/meta/drdr/time.rkt @@ -1,6 +1,6 @@ -#lang scheme +#lang racket (require (planet jaymccarthy/job-queue) - scheme/system + racket/system (prefix-in graph-one: "graph.rkt") "config.rkt" "notify.rkt" @@ -39,7 +39,7 @@ (apply system*/exit-code (path->string - (build-path (plt-directory) "plt" "bin" "mzscheme")) + (build-path (plt-directory) "plt" "bin" "racket")) "-t" (path->string (build-path (drdr-directory) "time-file.rkt")) "--" diff --git a/collects/meta/drdr/vdbm.rkt b/collects/meta/drdr/vdbm.rkt index 82e06830d0..99c3a96a39 100644 --- a/collects/meta/drdr/vdbm.rkt +++ b/collects/meta/drdr/vdbm.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket (require (planet jaymccarthy/dbm) "wrap-dict.rkt")