diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000000..c579c5e4b2 --- /dev/null +++ b/.mailmap @@ -0,0 +1,3 @@ +Eli Barzilay +Kevin Tew +Sam Tobin-Hochstadt diff --git a/collects/2htdp/private/syn-aux.ss b/collects/2htdp/private/syn-aux.ss index b72537a49b..ef78916ece 100644 --- a/collects/2htdp/private/syn-aux.ss +++ b/collects/2htdp/private/syn-aux.ss @@ -53,6 +53,8 @@ transform the clauses into the initial arguments specification for a new expression that instantiates the appropriate class + ensure that the initial state (state0) is not in the shape of a clause + ensure that all clauses mention only keywords specified in AllSpec or PartSpec move the contracts from AppSpecl and PartSpec to the clauses @@ -60,12 +62,13 @@ if anything fails, use the legal keyword to specialize the error message |# -(define (->args tag stx clauses AllSpec PartSpec ->rec? legal) +(define (->args tag stx state0 clauses AllSpec PartSpec ->rec? legal) (define msg (format "not a legal clause in a ~a description" legal)) (define Spec (append AllSpec PartSpec)) (define kwds (map (compose (curry datum->syntax stx) car) Spec)) (define spec (clauses-use-kwd (syntax->list clauses) ->rec? msg kwds)) (duplicates? tag spec) + (not-a-clause tag stx state0 kwds) (map (lambda (x) (define kw (car x)) (define-values (key coercion) @@ -78,6 +81,15 @@ (list key (coercion (cdr x)))) spec)) +;; Symbol Syntax Syntax [Listof Kw] -> true +;; effect: if state0 looks like a clause, raise special error +(define (not-a-clause tag stx state0 kwds) + (syntax-case state0 () + [(kw . E) + ((->kwds-in kwds) #'kw) + (raise-syntax-error tag "missing initial state" stx)] + [_ #t])) + ;; Symbol [Listof kw] -> true ;; effect: raise syntax error about duplicated clause (define (duplicates? tag lox) diff --git a/collects/2htdp/tests/on-tick-defined.ss b/collects/2htdp/tests/on-tick-defined.ss index f9a3efb3d3..2946379b5f 100644 --- a/collects/2htdp/tests/on-tick-defined.ss +++ b/collects/2htdp/tests/on-tick-defined.ss @@ -37,4 +37,23 @@ (raise e))))) (eval '(module a scheme (require 2htdp/universe) - (big-bang 0 (on-tick add1) stop-when)))) \ No newline at end of file + (big-bang 0 (on-tick add1) stop-when)))) + +;; ----------------------------------------------------------------------------- +;; purpose: catch illegal big-bang use w/o world expression + +(with-handlers ((exn:fail:syntax? + (lambda (x) + (unless (string=? (exn-message x) "big-bang: missing initial state") + (raise x))))) + (eval '(module a scheme + (require 2htdp/universe) + (big-bang (on-key add1))))) + +(with-handlers ((exn:fail:syntax? + (lambda (x) + (unless (string=? (exn-message x) "universe: missing initial state") + (raise x))))) + (eval '(module a scheme + (require 2htdp/universe) + (universe (on-msg sub1) (on-new add1))))) diff --git a/collects/2htdp/universe.ss b/collects/2htdp/universe.ss index 31caf74d13..4e71f1a4c2 100644 --- a/collects/2htdp/universe.ss +++ b/collects/2htdp/universe.ss @@ -179,7 +179,7 @@ [(V) (set! rec? #'V)] [_ (err '#'record? stx)])))] [args - (->args 'big-bang stx (syntax (clause ...)) AllSpec WldSpec ->rec? "world")]) + (->args 'big-bang stx (syntax w) (syntax (clause ...)) AllSpec WldSpec ->rec? "world")]) #`(let* ([esp (make-eventspace)] [thd (eventspace-handler-thread esp)]) (with-handlers ((exn:break? (lambda (x) (break-thread thd)))) @@ -276,7 +276,7 @@ [(universe u) (raise-syntax-error #f "not a legal universe description" stx)] [(universe u bind ...) (let* - ([args (->args 'universe stx (syntax (bind ...)) AllSpec UniSpec void "universe")] + ([args (->args 'universe stx (syntax u) (syntax (bind ...)) AllSpec UniSpec void "universe")] [domain (map (compose syntax-e car) args)]) (cond [(not (memq 'on-new domain)) diff --git a/collects/compiler/compiler-unit.ss b/collects/compiler/compiler-unit.ss index 473974c5a9..9ff5b08921 100644 --- a/collects/compiler/compiler-unit.ss +++ b/collects/compiler/compiler-unit.ss @@ -173,7 +173,7 @@ (bytes=? (subbytes b 0 len) skip-path))) -inf.0))]) (let* ([sses (append - ;; Find all .ss/.scm files: + ;; Find all .rkt/.ss/.scm files: (filter extract-base-filename/ss (directory-list)) ;; Add specified doc sources: (if skip-docs? diff --git a/collects/compiler/private/mach-o.ss b/collects/compiler/private/mach-o.ss index 530c2b9b94..284661bec1 100644 --- a/collects/compiler/private/mach-o.ss +++ b/collects/compiler/private/mach-o.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide add-plt-segment get/set-dylib-path) diff --git a/collects/compiler/private/winutf16.ss b/collects/compiler/private/winutf16.ss index 3985a4fa40..82e03b6048 100644 --- a/collects/compiler/private/winutf16.ss +++ b/collects/compiler/private/winutf16.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide bytes->utf-16-bytes utf-16-bytes->bytes) diff --git a/collects/config/main.ss b/collects/config/main.ss index f0dc71125f..535316ba27 100644 --- a/collects/config/main.ss +++ b/collects/config/main.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "config.ss") (provide (all-from-out "config.ss")) diff --git a/collects/dynext/file-unit.ss b/collects/dynext/file-unit.ss index f790473347..2385df0047 100644 --- a/collects/dynext/file-unit.ss +++ b/collects/dynext/file-unit.ss @@ -48,7 +48,7 @@ [else #f])) extract-base-filename)]) (values - (mk 'extract-base-filename/ss #"ss|scm" "Scheme" #f) + (mk 'extract-base-filename/ss #"rkt|ss|scm" "Racket" #f) (mk 'extract-base-filename/c #"c|cc|cxx|cpp|c[+][+]|m" "C" ".c, .cc, .cxx, .cpp, .c++, or .m") (mk 'extract-base-filename/kp #"kp" "constant pool" ".kp") diff --git a/collects/gui-debugger/load-sandbox.ss b/collects/gui-debugger/load-sandbox.ss index 0d18ab360c..3112a22146 100644 --- a/collects/gui-debugger/load-sandbox.ss +++ b/collects/gui-debugger/load-sandbox.ss @@ -2,7 +2,7 @@ (require syntax/moddep mzlib/class - scheme/private/namespace + racket/private/namespace mred) (provide eval/annotations diff --git a/collects/htdp/matrix.ss b/collects/htdp/matrix.ss index ef6f4d800b..a289ca3737 100644 --- a/collects/htdp/matrix.ss +++ b/collects/htdp/matrix.ss @@ -2,6 +2,52 @@ ;; 4. integrate with snips +#| + +From: Mark Engelberg + + +In a flash of inspiration, I searched on matrix, and turned up the +matrix teachpack.  I really like it!  I especially like: +* the ease of converting back and forth between "rectangles" and "matrices" +* the multiple ways of constructing matrices +* the ability to set cells non-destructively or destructively + +Two questions: +1. The documentation warns that the teachpack is experimental.  Are +there any major problems I need to be aware of, or is the warning just +an indicator that the API is likely to continue to be revised? +2. Are there other similar built-in PLT Scheme libraries that I should +be aware of, or is this the main one I should be considering? + +A few API comments and suggestions: + +matrix-render is a nice low-level function for extracting information +from the matrix in preparation for displaying or printing, but perhaps +there could also be a higher-level matrix->string function. +For example, +(define (matrix->string m col-separator row-separator) + (string-join (map (λ (row) (string-join row col-separator)) +(matrix-render m)) row-separator)) + +Since matrix-ref returns an error with a bogus row,column, it would be +nice to be able to easily test for that in advance: +(define (matrix-within-bounds? m i j) + (and (<= 0 i) (< i (matrix-rows m)) (<= 0 j) (< j (matrix-cols m)))) +or alternatively adjust matrix-ref to take an optional argument to +return if the entry is invalid (like hash-ref). + +Since matrix-where? returns a list of posn structures, it would be +ideal if the other matrix functions (e.g., matrix-ref, matrix-set) +could optionally consume a single posn rather than a separate i and j. + +Speaking of which, shouldn't the matrix teachpack automatically +provide lang/posn so that you can call posn-x and posn-y on the +position structures returned by matrix-where? + +|# + + (require htdp/matrix-sig htdp/matrix-render-sig htdp/matrix-unit diff --git a/collects/lang/private/beginner-funs.ss b/collects/lang/private/beginner-funs.ss index 6b8313f0a0..2de47bccff 100644 --- a/collects/lang/private/beginner-funs.ss +++ b/collects/lang/private/beginner-funs.ss @@ -297,6 +297,9 @@ " if so, it produces the suffix of the list that starts with x" " if not, it produces false." " (it compares values with the eqv? predicate.)") + ((beginner-member member?) (any (listof any) -> boolean) + "to determine whether some value is on the list" + " (comparing values with equal?)") ((beginner-member member) (any (listof any) -> boolean) "to determine whether some value is on the list" " (comparing values with equal?)") diff --git a/collects/macro-debugger/model/deriv-util.ss b/collects/macro-debugger/model/deriv-util.ss index ee8afd2c60..0a3c2a3049 100644 --- a/collects/macro-debugger/model/deriv-util.ss +++ b/collects/macro-debugger/model/deriv-util.ss @@ -1,7 +1,7 @@ #lang scheme/base (require (for-syntax scheme/base) - (for-syntax scheme/private/struct-info) + (for-syntax racket/private/struct-info) scheme/list scheme/match unstable/struct diff --git a/collects/meta/dist-specs.ss b/collects/meta/dist-specs.ss index 8eba91b2f9..fbc0f2adbb 100644 --- a/collects/meta/dist-specs.ss +++ b/collects/meta/dist-specs.ss @@ -156,9 +156,10 @@ docsrc-filter := (+ (collects: "setup/scribble.ss") ; only with doc sources std-docs) man-filter := (man: "*") tests-filter := (+ (collects: "**/tests/") (srcfile: "tests.ss")) -gui-filter := (- (+ (collects: "**/gui/") (srcfile: "gui.ss")) +gui-filter := (- (+ (collects: "**/gui/") (srcfile: "gui.rkt")) ;; for use in mz code that works in mr too - (srcfile: "scheme/gui/dynamic.ss")) + (srcfile: "scheme/gui/dynamic.rkt") + (srcfile: "racket/gui/dynamic.rkt")) tools-filter := (+ (collects: "**/tools/") (srcfile: "tools.ss")) ;; these are in the doc directory, but are comitted in svn and should be diff --git a/collects/meta/drdr/plt-build.ss b/collects/meta/drdr/plt-build.ss index ab206f4d65..d8d93cef3b 100644 --- a/collects/meta/drdr/plt-build.ss +++ b/collects/meta/drdr/plt-build.ss @@ -197,9 +197,7 @@ (lambda () (define l (pth-cmd)) (with-env (["DISPLAY" (format ":~a" (+ XSERVER-OFFSET (current-worker)))] - ["HOME" (home-dir (current-worker))]) - ; XXX Maybe this should destroy the old home and copy in a new one - ; Otherwise it is a source of randomness + ["HOME" (make-fresh-home-dir)]) (with-temporary-directory (run/collect/wait/log log-pth #:timeout pth-timeout @@ -234,14 +232,6 @@ (build-path log-dir "src" "build" "set-browser.ss") mzscheme-path (list "-t" (path->string* (build-path (drdr-directory) "set-browser.ss")))) - ; Make home directories - (cache/file/timestamp - (build-path rev-dir "homedir-dup") - (lambda () - (notify! "Copying home directory for each worker") - (for ([i (in-range (number-of-cpus))]) - (with-handlers ([exn:fail? void]) - (copy-directory/files (hash-ref (current-env) "HOME") (home-dir i)))))) ; And go (notify! "Starting testing") (test-directory collects-pth top-sema) @@ -250,10 +240,11 @@ (notify! "Stopping testing") (stop-job-queue! test-workers)) -(define (home-dir i) - (format "~a~a" - (hash-ref (current-env) "HOME") - i)) +(define (make-fresh-home-dir) + (define new-dir (make-temporary-file "home~a" 'directory)) + (with-handlers ([exn:fail? void]) + (copy-directory/files (hash-ref (current-env) "HOME") new-dir)) + (path->string new-dir)) (define (recur-many i r f) (if (zero? i) diff --git a/collects/meta/drdr/render.ss b/collects/meta/drdr/render.ss index acc1699f80..4f1ca701ae 100644 --- a/collects/meta/drdr/render.ss +++ b/collects/meta/drdr/render.ss @@ -557,7 +557,8 @@ (define name (path->string rev-pth)) (define url (format "~a/" name)) (define rev (string->number name)) - (define log (read-cache (revision-commit-msg rev))) + (define log-pth (revision-commit-msg rev)) + (define log (read-cache log-pth)) (define committer (svn-rev-log-author log)) (define commit-msg (string-first-line (svn-rev-log-msg log))) (define title @@ -566,7 +567,7 @@ commit-msg)) (define (no-rendering-row) (define mtime - (file-or-directory-modify-seconds (build-path builds-pth rev-pth))) + (file-or-directory-modify-seconds log-pth)) `(tr ([class "dir"] [title ,title]) diff --git a/collects/meta/drdr/rewriting.ss b/collects/meta/drdr/rewriting.ss index 01f482d1f0..f0ba0e6a18 100644 --- a/collects/meta/drdr/rewriting.ss +++ b/collects/meta/drdr/rewriting.ss @@ -1,30 +1,31 @@ #lang scheme -(require "dirstruct.ss" - "status.ss") +(require "status.ss") -(define (rewrite-status s) - (if (current-rev) - (local [(define from (number->string (current-rev)))] - (match s - [(struct exit (start end command-line output-log code)) - (make-exit start end (rewrite-strings from command-line) (rewrite-events from output-log) code)] - [(struct timeout (start end command-line output-log)) - (make-timeout start end (rewrite-strings from command-line) (rewrite-events from output-log))])) - s)) +(define (rewrite-status #:rewrite rewrite-string s) + (match s + [(struct exit (start end command-line output-log code)) + (make-exit start end + (rewrite-strings #:rewrite rewrite-string command-line) + (rewrite-events #:rewrite rewrite-string output-log) + code)] + [(struct timeout (start end command-line output-log)) + (make-timeout start end + (rewrite-strings #:rewrite rewrite-string command-line) + (rewrite-events #:rewrite rewrite-string output-log))])) -(define (rewrite-strings from los) - (map (curry rewrite-string from) los)) -(define (rewrite-events from loe) - (map (rewrite-event from) loe)) -(define (rewrite-event from) +(define (rewrite-strings #:rewrite rewrite-string los) + (map rewrite-string los)) +(define (rewrite-events #:rewrite rewrite-string loe) + (map (rewrite-event #:rewrite rewrite-string) loe)) +(define (rewrite-event #:rewrite rewrite-bytes) (match-lambda - [(struct stdout (b)) (make-stdout (rewrite-bytes from b))] - [(struct stderr (b)) (make-stderr (rewrite-bytes from b))])) + [(struct stdout (b)) (make-stdout (rewrite-bytes b))] + [(struct stderr (b)) (make-stderr (rewrite-bytes b))])) -(define (rewrite-string from s) - (regexp-replace* from s "")) -(define rewrite-bytes rewrite-string) +(define rewrite-string/c + ((or/c string? bytes?) . -> . (or/c string? bytes?))) (provide/contract - [rewrite-status (status? . -> . status?)]) \ No newline at end of file + [rewrite-string/c contract?] + [rewrite-status (#:rewrite rewrite-string/c status? . -> . status?)]) \ No newline at end of file diff --git a/collects/meta/drdr/run-collect.ss b/collects/meta/drdr/run-collect.ss index 93792bac56..c4aaa3d221 100644 --- a/collects/meta/drdr/run-collect.ss +++ b/collects/meta/drdr/run-collect.ss @@ -2,6 +2,7 @@ (require "status.ss" "notify.ss" "rewriting.ss" + "dirstruct.ss" "cache.ss") (define (command+args+env->command+args @@ -97,6 +98,17 @@ final-status)) +(define-syntax regexp-replace** + (syntax-rules () + [(_ () s) s] + [(_ ([pat0 subst0] + [pat subst] + ...) + s) + (regexp-replace* pat0 + (regexp-replace** ([pat subst] ...) s) + subst0)])) + (define (run/collect/wait/log log-path command #:timeout timeout #:env env @@ -105,8 +117,20 @@ (cache/file log-path (lambda () + (define rev (number->string (current-rev))) + (define home (hash-ref env "HOME")) + (define tmp (hash-ref env "TMPDIR")) + (define cwd (path->string (current-directory))) + (define (rewrite s) + (regexp-replace** ([rev ""] + [home ""] + [tmp ""] + [cwd ""]) + s)) + (set! ran? #t) (rewrite-status + #:rewrite rewrite (run/collect/wait #:timeout timeout #:env env diff --git a/collects/mzlib/class-traced.ss b/collects/mzlib/class-traced.ss index 737a06cbe0..cb26623a2f 100644 --- a/collects/mzlib/class-traced.ss +++ b/collects/mzlib/class-traced.ss @@ -2,7 +2,7 @@ ;; All of the implementation is actually in private/class-internal.ss, ;; which provides extra (private) functionality to contract.ss. - (require scheme/private/class-internal) + (require racket/private/class-internal) (provide (rename class-traced class) (rename class*-traced class*) diff --git a/collects/mzlib/class.ss b/collects/mzlib/class.ss index 55e0f0d6ae..4e2e272723 100644 --- a/collects/mzlib/class.ss +++ b/collects/mzlib/class.ss @@ -1,3 +1,3 @@ (module class mzscheme - (require scheme/private/class-internal) + (require racket/private/class-internal) (provide-public-names)) diff --git a/collects/mzlib/contract.ss b/collects/mzlib/contract.ss index 3c6ef88c97..8516d28e81 100644 --- a/collects/mzlib/contract.ss +++ b/collects/mzlib/contract.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; @@ -25,37 +25,37 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; -;; provide everything from the scheme/ implementation +;; provide everything from the racket/ implementation ;; except the arrow contracts ;; -(require scheme/contract/private/base - scheme/contract/private/misc - scheme/contract/private/provide - scheme/contract/private/guts - scheme/contract/private/ds - scheme/contract/private/opt - scheme/contract/private/basic-opters) +(require racket/contract/private/base + racket/contract/private/misc + racket/contract/private/provide + racket/contract/private/guts + racket/contract/private/ds + racket/contract/private/opt + racket/contract/private/basic-opters) (provide opt/c define-opt/c ;(all-from "private/contract-opt.ss") - (except-out (all-from-out scheme/contract/private/ds) + (except-out (all-from-out racket/contract/private/ds) lazy-depth-to-look) - (all-from-out scheme/contract/private/base) - (all-from-out scheme/contract/private/provide) - (except-out (all-from-out scheme/contract/private/misc) + (all-from-out racket/contract/private/base) + (all-from-out racket/contract/private/provide) + (except-out (all-from-out racket/contract/private/misc) check-between/c string-len/c check-unary-between/c) (rename-out [or/c union]) (rename-out [string-len/c string/len]) - (except-out (all-from-out scheme/contract/private/guts) + (except-out (all-from-out racket/contract/private/guts) check-flat-contract check-flat-named-contract)) -;; copied here because not provided by scheme/contract anymore +;; copied here because not provided by racket/contract anymore (define (flat-contract/predicate? pred) (or (flat-contract? pred) (and (procedure? pred) diff --git a/collects/mzlib/etc.ss b/collects/mzlib/etc.ss index c9b28bb194..9add9b9fdc 100644 --- a/collects/mzlib/etc.ss +++ b/collects/mzlib/etc.ss @@ -1,8 +1,8 @@ #lang mzscheme (require setup/main-collects - scheme/local - scheme/bool + racket/local + racket/bool (only scheme/base build-string build-list diff --git a/collects/mzlib/list.ss b/collects/mzlib/list.ss index c8b3a4d086..ed658ee04e 100644 --- a/collects/mzlib/list.ss +++ b/collects/mzlib/list.ss @@ -1,31 +1,13 @@ -#lang mzscheme +#lang scheme/base ;; The `first', etc. operations in this library ;; work on pairs, not lists. -(require (only scheme/base - foldl - foldr - - remv - remq - remove - remv* - remq* - remove* - - findf - memf - assf - - filter - - sort) - (only scheme/list - cons? - empty? - empty - last-pair)) +(require (only-in scheme/list + cons? + empty? + empty + last-pair)) (provide first second diff --git a/collects/mzlib/match.ss b/collects/mzlib/match.ss index d38a78ad82..8362e9a912 100644 --- a/collects/mzlib/match.ss +++ b/collects/mzlib/match.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base -(require scheme/match/legacy-match) -(provide (all-from-out scheme/match/legacy-match)) +(require racket/match/legacy-match) +(provide (all-from-out racket/match/legacy-match)) diff --git a/collects/mzlib/plt-match.ss b/collects/mzlib/plt-match.ss index 84e08e6231..add845afab 100644 --- a/collects/mzlib/plt-match.ss +++ b/collects/mzlib/plt-match.ss @@ -1,4 +1,4 @@ #lang scheme/base -(require scheme/match/match) -(provide (all-from-out scheme/match/match)) +(require racket/match/match) +(provide (all-from-out racket/match/match)) diff --git a/collects/mzlib/port.ss b/collects/mzlib/port.ss index 56b12030af..c588143b94 100644 --- a/collects/mzlib/port.ss +++ b/collects/mzlib/port.ss @@ -1,8 +1,7 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) - mzlib/etc - scheme/contract/base +(require (for-syntax racket/base) + racket/contract/base mzlib/list "private/port.ss") @@ -118,13 +117,13 @@ ;; 0 always (which implies that the `read' proc must not return ;; a pipe input port). (define make-input-port/read-to-peek - (opt-lambda (name read fast-peek close - [location-proc #f] - [count-lines!-proc void] - [init-position 1] - [buffer-mode-proc #f] - [buffering? #f] - [on-consumed #f]) + (lambda (name read fast-peek close + [location-proc #f] + [count-lines!-proc void] + [init-position 1] + [buffer-mode-proc #f] + [buffering? #f] + [on-consumed #f]) (define lock-semaphore (make-semaphore 1)) (define commit-semaphore (make-semaphore 1)) (define-values (peeked-r peeked-w) (make-pipe)) @@ -440,7 +439,7 @@ (buffer-mode-proc mode)]))))) (define peeking-input-port - (opt-lambda (orig-in [name (object-name orig-in)] [delta 0]) + (lambda (orig-in [name (object-name orig-in)] [delta 0]) (make-input-port/read-to-peek name (lambda (s) @@ -452,11 +451,11 @@ void))) (define relocate-input-port - (opt-lambda (p line col pos [close? #t]) + (lambda (p line col pos [close? #t]) (transplant-to-relocate transplant-input-port p line col pos close?))) (define transplant-input-port - (opt-lambda (p location-proc pos [close? #t] [count-lines!-proc void]) + (lambda (p location-proc pos [close? #t] [count-lines!-proc void]) (make-input-port (object-name p) (lambda (s) @@ -486,7 +485,7 @@ ;; thread when write evts are active; otherwise, we use a lock semaphore. ;; (Actually, the lock semaphore has to be used all the time, to guard ;; the flag indicating whether the manager thread is running.) - (opt-lambda ([limit (expt 2 64)] [in-name 'pipe] [out-name 'pipe]) + (lambda ([limit (expt 2 64)] [in-name 'pipe] [out-name 'pipe]) (let-values ([(r w) (make-pipe limit)] [(more) null] [(more-last) #f] @@ -724,7 +723,7 @@ (values in out)))) (define input-port-append - (opt-lambda (close-orig? . ports) + (lambda (close-orig? . ports) (make-input-port (map object-name ports) (lambda (str) @@ -815,7 +814,7 @@ (loop half skip))))))) (define make-limited-input-port - (opt-lambda (port limit [close-orig? #t]) + (lambda (port limit [close-orig? #t]) (let ([got 0]) (make-input-port (object-name port) @@ -1208,13 +1207,13 @@ (loop (add1 i) (add1 j))]))))])) (define reencode-input-port - (opt-lambda (port encoding [error-bytes #f] [close? #f] - [name (object-name port)] - [newline-convert? #f] - [decode-error (lambda (msg port) - (error 'reencode-input-port - (format "~a: ~e" msg) - port))]) + (lambda (port encoding [error-bytes #f] [close? #f] + [name (object-name port)] + [newline-convert? #f] + [decode-error (lambda (msg port) + (error 'reencode-input-port + (format "~a: ~e" msg) + port))]) (let ([c (let ([c (bytes-open-converter encoding "UTF-8")]) (if newline-convert? (mcons c #f) c))] [ready-bytes (make-bytes 1024)] @@ -1345,13 +1344,13 @@ ;; -------------------------------------------------- (define reencode-output-port - (opt-lambda (port encoding [error-bytes #f] [close? #f] - [name (object-name port)] - [convert-newlines-to #f] - [decode-error (lambda (msg port) - (error 'reencode-input-port - (format "~a: ~e" msg) - port))]) + (lambda (port encoding [error-bytes #f] [close? #f] + [name (object-name port)] + [convert-newlines-to #f] + [decode-error (lambda (msg port) + (error 'reencode-input-port + (format "~a: ~e" msg) + port))]) (let ([c (bytes-open-converter "UTF-8" encoding)] [ready-bytes (make-bytes 1024)] [ready-start 0] @@ -1664,7 +1663,7 @@ ;; ---------------------------------------- (define dup-output-port - (opt-lambda (p [close? #f]) + (lambda (p [close? #f]) (let ([new (transplant-output-port p (lambda () (port-next-location p)) @@ -1677,7 +1676,7 @@ new))) (define dup-input-port - (opt-lambda (p [close? #f]) + (lambda (p [close? #f]) (let ([new (transplant-input-port p (lambda () (port-next-location p)) diff --git a/collects/mzlib/private/contract-arr-checks.ss b/collects/mzlib/private/contract-arr-checks.ss index 5410d7401f..9bbb341fc1 100644 --- a/collects/mzlib/private/contract-arr-checks.ss +++ b/collects/mzlib/private/contract-arr-checks.ss @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (provide (all-defined-out)) -(require scheme/contract/private/guts) +(require racket/contract/private/guts) (define empty-case-lambda/c (flat-named-contract '(case->) diff --git a/collects/mzlib/private/contract-arr-obj-helpers.ss b/collects/mzlib/private/contract-arr-obj-helpers.ss index cb38466262..5123ffdfb4 100644 --- a/collects/mzlib/private/contract-arr-obj-helpers.ss +++ b/collects/mzlib/private/contract-arr-obj-helpers.ss @@ -4,7 +4,7 @@ (require (for-syntax scheme/base)) (require (for-template scheme/base) - (for-template scheme/contract/private/guts) + (for-template racket/contract/private/guts) (for-template "contract-arr-checks.ss")) (provide make-/proc ->/h ->*/h ->d/h ->d*/h ->r/h diff --git a/collects/mzlib/private/contract-arrow.ss b/collects/mzlib/private/contract-arrow.ss index 2b13878178..038951ae8e 100644 --- a/collects/mzlib/private/contract-arrow.ss +++ b/collects/mzlib/private/contract-arrow.ss @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base -(require scheme/contract/private/guts - scheme/contract/private/opt +(require racket/contract/private/guts + racket/contract/private/opt "contract-arr-checks.ss") -(require (for-syntax scheme/base) - (for-syntax scheme/contract/private/opt-guts) - (for-syntax scheme/contract/private/helpers) +(require (for-syntax racket/base) + (for-syntax racket/contract/private/opt-guts) + (for-syntax racket/contract/private/helpers) (for-syntax "contract-arr-obj-helpers.ss") (for-syntax syntax/stx) (for-syntax syntax/name)) diff --git a/collects/mzlib/private/contract-define.ss b/collects/mzlib/private/contract-define.ss index 4cece1f07b..faad09a30a 100644 --- a/collects/mzlib/private/contract-define.ss +++ b/collects/mzlib/private/contract-define.ss @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base (provide define/contract) -(require (for-syntax scheme/base +(require (for-syntax racket/base unstable/srcloc - (prefix-in a: scheme/contract/private/helpers)) - (only-in scheme/contract/private/base contract)) + (prefix-in a: racket/contract/private/helpers)) + (only-in racket/contract/private/base contract)) ;; First, we have the old define/contract implementation, which ;; is still used in mzlib/contract. diff --git a/collects/mzlib/private/contract-object.ss b/collects/mzlib/private/contract-object.ss index 7b7579fa7b..66cc2c5b36 100644 --- a/collects/mzlib/private/contract-object.ss +++ b/collects/mzlib/private/contract-object.ss @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base (require "contract-arrow.ss" - scheme/contract/private/guts - scheme/private/class-internal + racket/contract/private/guts + racket/private/class-internal "contract-arr-checks.ss") -(require (for-syntax scheme/base - scheme/contract/private/helpers +(require (for-syntax racket/base + racket/contract/private/helpers "contract-arr-obj-helpers.ss")) (provide mixin-contract diff --git a/collects/mzlib/private/port.ss b/collects/mzlib/private/port.ss index 56bf26f2b8..33cde9a312 100644 --- a/collects/mzlib/private/port.ss +++ b/collects/mzlib/private/port.ss @@ -3,15 +3,14 @@ ;; used by contract.ss, which is used by port.ss --- so we ;; break the cycle with this module. -(module port mzscheme - (require "../etc.ss") +(module port racket/base (provide open-output-nowhere relocate-output-port transplant-output-port transplant-to-relocate) (define open-output-nowhere - (opt-lambda ([name 'nowhere] [specials-ok? #t]) + (lambda ([name 'nowhere] [specials-ok? #t]) (make-output-port name always-evt @@ -42,13 +41,13 @@ close?))) (define relocate-output-port - (opt-lambda (p line col pos [close? #t]) + (lambda (p line col pos [close? #t]) (transplant-to-relocate transplant-output-port p line col pos close?))) (define transplant-output-port - (opt-lambda (p location-proc pos [close? #t] [count-lines!-proc void]) + (lambda (p location-proc pos [close? #t] [count-lines!-proc void]) (make-output-port (object-name p) p diff --git a/collects/mzlib/private/unit-compiletime.ss b/collects/mzlib/private/unit-compiletime.ss index f0c2630dc1..c2813b6901 100644 --- a/collects/mzlib/private/unit-compiletime.ss +++ b/collects/mzlib/private/unit-compiletime.ss @@ -7,7 +7,7 @@ (require (for-template scheme/base "unit-keywords.ss" "unit-runtime.ss")) -(require scheme/private/define-struct) +(require racket/private/define-struct) (provide (struct-out var-info) (struct-out signature) diff --git a/collects/mzlib/private/unit-contract.ss b/collects/mzlib/private/unit-contract.ss index 30fde3fdb8..591471fff5 100644 --- a/collects/mzlib/private/unit-contract.ss +++ b/collects/mzlib/private/unit-contract.ss @@ -1,14 +1,14 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base +(require (for-syntax racket/base syntax/boundmap syntax/name syntax/parse "unit-compiletime.ss" "unit-contract-syntax.ss" "unit-syntax.ss") - (for-meta 2 scheme/base) - scheme/contract/base + (for-meta 2 racket/base) + racket/contract/base "unit-utils.ss" "unit-runtime.ss") diff --git a/collects/mzlib/private/unit-utils.ss b/collects/mzlib/private/unit-utils.ss index 7b193aa2be..e9dcb02723 100644 --- a/collects/mzlib/private/unit-utils.ss +++ b/collects/mzlib/private/unit-utils.ss @@ -4,7 +4,7 @@ syntax/boundmap "unit-compiletime.ss" "unit-syntax.ss") - scheme/contract/base) + racket/contract/base) (provide (for-syntax build-key check-duplicate-sigs diff --git a/collects/mzlib/serialize.ss b/collects/mzlib/serialize.ss index ed816f961a..e4550133a9 100644 --- a/collects/mzlib/serialize.ss +++ b/collects/mzlib/serialize.ss @@ -4,13 +4,13 @@ mzlib/etc mzlib/list ;; core [de]serializer: - scheme/private/serialize) + racket/private/serialize) (provide define-serializable-struct define-serializable-struct/versions ;; core [de]serializer: - (all-from scheme/private/serialize)) + (all-from racket/private/serialize)) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; define-serializable-struct diff --git a/collects/mzlib/unit.ss b/collects/mzlib/unit.ss index 5a0d8b5696..3c03679eeb 100644 --- a/collects/mzlib/unit.ss +++ b/collects/mzlib/unit.ss @@ -16,7 +16,7 @@ "private/unit-syntax.ss")) (require mzlib/etc - scheme/contract/base + racket/contract/base scheme/stxparam unstable/location "private/unit-contract.ss" diff --git a/collects/planet/config.ss b/collects/planet/config.ss index a79016fec5..7d6f25b55c 100644 --- a/collects/planet/config.ss +++ b/collects/planet/config.ss @@ -1,4 +1,4 @@ -(module config mzscheme +(module config racket/base (require "private/define-config.ss") (define-parameters (PLANET-SERVER-NAME "planet.plt-scheme.org") diff --git a/collects/planet/private/define-config.ss b/collects/planet/private/define-config.ss index a583ca2b8d..34f2b3bc4d 100644 --- a/collects/planet/private/define-config.ss +++ b/collects/planet/private/define-config.ss @@ -1,4 +1,5 @@ -(module define-config mzscheme +(module define-config racket/base + (require (for-syntax racket/base)) (provide define-parameters) diff --git a/collects/r6rs/private/find-version.ss b/collects/r6rs/private/find-version.ss index e26cdafcdb..da2cead888 100644 --- a/collects/r6rs/private/find-version.ss +++ b/collects/r6rs/private/find-version.ss @@ -18,7 +18,7 @@ (and (and (len . < . (bytes-length s)) (bytes=? p (subbytes s 0 len))) - (let ([ext (let ([m (regexp-match #rx#"([.][a-z]+)?[.](ss|sls)$" + (let ([ext (let ([m (regexp-match #rx#"([.][a-z]+)?[.](rkt|ss|sls)$" (subbytes s len))]) (and m (or (not (cadr m)) @@ -37,7 +37,7 @@ ext))))))))) files))] [versions - (let* ([eo '(#".mzscheme.ss" #".mzscheme.sls" #".ss" #".sls")] + (let* ([eo '(#".mzscheme.ss" #".mzscheme.sls" #".ss" #".sls" #".rkt")] [ext< (lambda (a b) (> (length (member a eo)) (length (member b eo))))]) (sort candidate-versions diff --git a/collects/scheme/async-channel.ss b/collects/racket/async-channel.rkt similarity index 100% rename from collects/scheme/async-channel.ss rename to collects/racket/async-channel.rkt diff --git a/collects/racket/base.rkt b/collects/racket/base.rkt new file mode 100644 index 0000000000..1388d4d218 --- /dev/null +++ b/collects/racket/base.rkt @@ -0,0 +1,4 @@ +#lang racket/private + +(require "private/base.rkt") +(provide (all-from-out "private/base.rkt")) diff --git a/collects/racket/base.ss b/collects/racket/base.ss deleted file mode 100644 index ef8f53910c..0000000000 --- a/collects/racket/base.ss +++ /dev/null @@ -1,5 +0,0 @@ -#lang racket/private -(require "private/struct.rkt") - -(provide (all-from-out scheme/base) - struct) diff --git a/collects/scheme/bool.ss b/collects/racket/bool.rkt similarity index 100% rename from collects/scheme/bool.ss rename to collects/racket/bool.rkt diff --git a/collects/racket/class.rkt b/collects/racket/class.rkt new file mode 100644 index 0000000000..9c0a682866 --- /dev/null +++ b/collects/racket/class.rkt @@ -0,0 +1,11 @@ +#lang racket/base + +(require "contract/private/object.rkt") +(provide (all-from-out "contract/private/object.rkt")) + +;; All of the implementation is actually in private/class-internal.rkt, +;; which provides extra (private) functionality to contract.rkt. +(require "private/class-internal.rkt") + +(provide-public-names) +(provide generic?) diff --git a/collects/scheme/cmdline.ss b/collects/racket/cmdline.rkt similarity index 100% rename from collects/scheme/cmdline.ss rename to collects/racket/cmdline.rkt diff --git a/collects/scheme/contract.ss b/collects/racket/contract.rkt similarity index 92% rename from collects/scheme/contract.ss rename to collects/racket/contract.rkt index a0ca0e5209..64f2911732 100644 --- a/collects/scheme/contract.ss +++ b/collects/racket/contract.rkt @@ -9,14 +9,15 @@ differences from v3: |# -(require scheme/contract/exists - scheme/contract/regions - "contract/private/basic-opters.ss" - "contract/base.ss") +(require racket/contract/exists + racket/contract/regions + "contract/private/basic-opters.rkt" + "contract/base.rkt" + "private/define-struct.rkt") -(provide (all-from-out "contract/base.ss") - (except-out (all-from-out scheme/contract/exists) ∃?) - (all-from-out scheme/contract/regions)) +(provide (all-from-out "contract/base.rkt") + (except-out (all-from-out racket/contract/exists) ∃?) + (all-from-out racket/contract/regions)) ;; ====================================================================== ;; The alternate implementation disables contracts. Its useful mainly to diff --git a/collects/scheme/contract/base.ss b/collects/racket/contract/base.ss similarity index 98% rename from collects/scheme/contract/base.ss rename to collects/racket/contract/base.ss index cc331a8588..2a623de02c 100644 --- a/collects/scheme/contract/base.ss +++ b/collects/racket/contract/base.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;; A stripped down version of scheme/contract for use in ;; the PLT code base where appropriate. diff --git a/collects/scheme/contract/exists.ss b/collects/racket/contract/exists.ss similarity index 98% rename from collects/scheme/contract/exists.ss rename to collects/racket/contract/exists.ss index 6529b89ed0..38305b0e98 100644 --- a/collects/scheme/contract/exists.ss +++ b/collects/racket/contract/exists.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "private/guts.ss") diff --git a/collects/scheme/contract/private/arrow.ss b/collects/racket/contract/private/arrow.ss similarity index 99% rename from collects/scheme/contract/private/arrow.ss rename to collects/racket/contract/private/arrow.ss index 62ec6ad5de..8bfd497ebe 100644 --- a/collects/scheme/contract/private/arrow.ss +++ b/collects/racket/contract/private/arrow.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base #| @@ -20,8 +20,8 @@ v4 todo: (require "guts.ss" "opt.ss" - scheme/stxparam) -(require (for-syntax scheme/base) + racket/stxparam) +(require (for-syntax racket/base) (for-syntax "opt-guts.ss") (for-syntax "helpers.ss") (for-syntax syntax/stx) diff --git a/collects/scheme/contract/private/base.ss b/collects/racket/contract/private/base.ss similarity index 94% rename from collects/scheme/contract/private/base.ss rename to collects/racket/contract/private/base.ss index 13a89a2559..293b66f0a1 100644 --- a/collects/scheme/contract/private/base.ss +++ b/collects/racket/contract/private/base.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base #| @@ -13,8 +13,8 @@ improve method arity mismatch contract violation error messages? recursive-contract current-contract-region) -(require (for-syntax scheme/base) - scheme/stxparam +(require (for-syntax racket/base) + racket/stxparam unstable/srcloc unstable/location "guts.ss" diff --git a/collects/scheme/contract/private/basic-opters.ss b/collects/racket/contract/private/basic-opters.ss similarity index 98% rename from collects/scheme/contract/private/basic-opters.ss rename to collects/racket/contract/private/basic-opters.ss index 97a9ef76b5..8b1d4b713b 100644 --- a/collects/scheme/contract/private/basic-opters.ss +++ b/collects/racket/contract/private/basic-opters.ss @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base (require "guts.ss" "opt.ss" "base.ss") -(require (for-syntax scheme/base +(require (for-syntax racket/base "opt-guts.ss")) ;; diff --git a/collects/scheme/contract/private/blame.ss b/collects/racket/contract/private/blame.ss similarity index 98% rename from collects/scheme/contract/private/blame.ss rename to collects/racket/contract/private/blame.ss index 9c917adb34..c6b3cb72a6 100644 --- a/collects/scheme/contract/private/blame.ss +++ b/collects/racket/contract/private/blame.ss @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require unstable/srcloc scheme/pretty) +(require unstable/srcloc racket/pretty) (provide blame? make-blame diff --git a/collects/scheme/contract/private/ds-helpers.ss b/collects/racket/contract/private/ds-helpers.ss similarity index 99% rename from collects/scheme/contract/private/ds-helpers.ss rename to collects/racket/contract/private/ds-helpers.ss index 2c45e7af9e..8bc9ed919c 100644 --- a/collects/scheme/contract/private/ds-helpers.ss +++ b/collects/racket/contract/private/ds-helpers.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide ensure-well-formed build-func-params build-clauses @@ -6,8 +6,7 @@ generate-arglists) (require "opt-guts.ss") -(require (for-template scheme/base) - (for-syntax scheme/base)) +(require (for-template racket/base)) #| diff --git a/collects/scheme/contract/private/ds.ss b/collects/racket/contract/private/ds.ss similarity index 99% rename from collects/scheme/contract/private/ds.ss rename to collects/racket/contract/private/ds.ss index 40a36a6183..0c9ab82d52 100644 --- a/collects/scheme/contract/private/ds.ss +++ b/collects/racket/contract/private/ds.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base #| @@ -18,13 +18,11 @@ it around flattened out. |# (require "guts.ss" - "opt.ss" - mzlib/etc) + "opt.ss") (require (for-syntax scheme/base) (for-syntax "ds-helpers.ss") (for-syntax "helpers.ss") - (for-syntax "opt-guts.ss") - (for-syntax mzlib/etc)) + (for-syntax "opt-guts.ss")) (provide define-contract-struct diff --git a/collects/scheme/contract/private/guts.ss b/collects/racket/contract/private/guts.ss similarity index 99% rename from collects/scheme/contract/private/guts.ss rename to collects/racket/contract/private/guts.ss index bca36b3e19..265a51fd87 100644 --- a/collects/scheme/contract/private/guts.ss +++ b/collects/racket/contract/private/guts.ss @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base (require "helpers.ss" "blame.ss" "prop.ss" - scheme/pretty) + racket/pretty) -(require (for-syntax scheme/base +(require (for-syntax racket/base "helpers.ss")) (provide (except-out (all-from-out "blame.ss") make-blame) diff --git a/collects/scheme/contract/private/helpers.ss b/collects/racket/contract/private/helpers.ss similarity index 99% rename from collects/scheme/contract/private/helpers.ss rename to collects/racket/contract/private/helpers.ss index a1efe65e3b..0c5789113a 100644 --- a/collects/scheme/contract/private/helpers.ss +++ b/collects/racket/contract/private/helpers.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide mangle-id mangle-id-for-maker build-struct-names @@ -9,8 +9,8 @@ known-good-contract?) (require setup/main-collects - scheme/struct-info - (for-template scheme/base)) + racket/struct-info + (for-template racket/base)) ;; lookup-struct-info : syntax -> (union #f (list syntax syntax (listof syntax) ...)) (define (lookup-struct-info stx provide-stx) diff --git a/collects/scheme/contract/private/legacy.ss b/collects/racket/contract/private/legacy.ss similarity index 99% rename from collects/scheme/contract/private/legacy.ss rename to collects/racket/contract/private/legacy.ss index cdf7bee81d..5b80fbbe46 100644 --- a/collects/scheme/contract/private/legacy.ss +++ b/collects/racket/contract/private/legacy.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "guts.ss" "blame.ss" unstable/srcloc) diff --git a/collects/scheme/contract/private/misc.ss b/collects/racket/contract/private/misc.ss similarity index 99% rename from collects/scheme/contract/private/misc.ss rename to collects/racket/contract/private/misc.ss index 1fc43fd6e1..5841e880e3 100644 --- a/collects/scheme/contract/private/misc.ss +++ b/collects/racket/contract/private/misc.ss @@ -1,10 +1,10 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base - scheme/struct-info +(require (for-syntax racket/base + racket/struct-info "helpers.ss" "opt-guts.ss") - scheme/promise + racket/promise "opt.ss" "guts.ss") diff --git a/collects/scheme/contract/private/object.ss b/collects/racket/contract/private/object.ss similarity index 99% rename from collects/scheme/contract/private/object.ss rename to collects/racket/contract/private/object.ss index ea9750098b..750ea43371 100644 --- a/collects/scheme/contract/private/object.ss +++ b/collects/racket/contract/private/object.ss @@ -1,7 +1,7 @@ #lang scheme/base (require "arrow.ss" "guts.ss" - scheme/private/class-internal + racket/private/class-internal scheme/stxparam) (require (for-syntax scheme/base)) diff --git a/collects/scheme/contract/private/opt-guts.ss b/collects/racket/contract/private/opt-guts.ss similarity index 98% rename from collects/scheme/contract/private/opt-guts.ss rename to collects/racket/contract/private/opt-guts.ss index 9e19ee0bbc..76c8cd5180 100644 --- a/collects/scheme/contract/private/opt-guts.ss +++ b/collects/racket/contract/private/opt-guts.ss @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base (require syntax/private/boundmap ;; needs to be the private one, since the public one has contracts - (for-template scheme/base) + (for-template racket/base) (for-template "guts.ss") - (for-syntax scheme/base)) + (for-syntax racket/base)) (provide get-opter reg-opter! opter interleave-lifts diff --git a/collects/scheme/contract/private/opt.ss b/collects/racket/contract/private/opt.ss similarity index 95% rename from collects/scheme/contract/private/opt.ss rename to collects/racket/contract/private/opt.ss index 8b69349574..8de78d6a61 100644 --- a/collects/scheme/contract/private/opt.ss +++ b/collects/racket/contract/private/opt.ss @@ -1,13 +1,12 @@ -#lang scheme/base +#lang racket/base (require "guts.ss" - scheme/stxparam - mzlib/etc) -(require (for-syntax scheme/base) + racket/stxparam) +(require (for-syntax racket/base) (for-syntax "opt-guts.ss") - (for-syntax mzlib/etc) - (for-syntax scheme/stxparam)) + (for-syntax racket/stxparam)) -(provide opt/c define-opt/c define/opter opt-stronger-vars-ref) +(provide opt/c define-opt/c define/opter opt-stronger-vars-ref + begin-lifted) ;; define/opter : id -> syntax ;; @@ -151,6 +150,11 @@ (vector) (begin-lifted (box #f)))))))])) +(define-syntax (begin-lifted stx) + (syntax-case stx () + [(_ expr) + (syntax-local-lift-expression #'expr)])) + (define-syntax-parameter define/opt-recursive-fn #f) (define-syntax (define-opt/c stx) diff --git a/collects/scheme/contract/private/prop.ss b/collects/racket/contract/private/prop.ss similarity index 99% rename from collects/scheme/contract/private/prop.ss rename to collects/racket/contract/private/prop.ss index 3605bd958c..0409af05f8 100644 --- a/collects/scheme/contract/private/prop.ss +++ b/collects/racket/contract/private/prop.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "blame.ss") diff --git a/collects/scheme/contract/private/provide.ss b/collects/racket/contract/private/provide.ss similarity index 99% rename from collects/scheme/contract/private/provide.ss rename to collects/racket/contract/private/provide.ss index ff3ca246fd..76acf4dd06 100644 --- a/collects/scheme/contract/private/provide.ss +++ b/collects/racket/contract/private/provide.ss @@ -1,14 +1,14 @@ -#lang scheme/base +#lang racket/base (provide provide/contract (for-syntax make-provide/contract-transformer)) -(require (for-syntax scheme/base - scheme/list +(require (for-syntax racket/base + racket/list (prefix-in a: "helpers.ss")) "arrow.ss" "base.ss" - scheme/contract/exists + racket/contract/exists "guts.ss" unstable/location unstable/srcloc) diff --git a/collects/scheme/contract/regions.ss b/collects/racket/contract/regions.ss similarity index 99% rename from collects/scheme/contract/regions.ss rename to collects/racket/contract/regions.ss index c1b63445f1..c32063676c 100644 --- a/collects/scheme/contract/regions.ss +++ b/collects/racket/contract/regions.ss @@ -1,19 +1,19 @@ -#lang scheme/base +#lang racket/base (provide define-struct/contract define/contract with-contract) -(require (for-syntax scheme/base - scheme/list - scheme/struct-info +(require (for-syntax racket/base + racket/list + racket/struct-info syntax/define syntax/kerncase syntax/parse unstable/syntax (prefix-in a: "private/helpers.ss")) - scheme/splicing - scheme/stxparam + racket/splicing + racket/stxparam unstable/location "private/arrow.ss" "private/base.ss" diff --git a/collects/scheme/control.ss b/collects/racket/control.rkt similarity index 71% rename from collects/scheme/control.ss rename to collects/racket/control.rkt index 1fdbcf4cb6..541f42dfc2 100644 --- a/collects/scheme/control.ss +++ b/collects/racket/control.rkt @@ -1,4 +1,4 @@ -(module control scheme/base +(module control racket/base (require mzlib/control) (provide (all-from-out mzlib/control))) diff --git a/collects/scheme/date.ss b/collects/racket/date.rkt similarity index 100% rename from collects/scheme/date.ss rename to collects/racket/date.rkt diff --git a/collects/scheme/dict.ss b/collects/racket/dict.rkt similarity index 95% rename from collects/scheme/dict.ss rename to collects/racket/dict.rkt index 78001b4b9a..8a74607b5b 100644 --- a/collects/scheme/dict.ss +++ b/collects/racket/dict.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base)) +(require (for-syntax racket/base)) (provide prop:dict dict? @@ -268,7 +268,7 @@ [else (raise-type-error 'dict-count "dict" d)])) -(define-struct assoc-iter (head pos)) +(struct assoc-iter (head pos)) (define (dict-iterate-first d) (cond @@ -276,7 +276,7 @@ [(vector? d) (if (zero? (vector-length d)) #f 0)] - [(assoc? d) (if (null? d) #f (make-assoc-iter d d))] + [(assoc? d) (if (null? d) #f (assoc-iter d d))] [(dict-struct? d) ((get-dict-iterate-first (dict-struct-ref d)) d)] [else (raise-type-error 'dict-iterate-first "dict" d)])) @@ -302,7 +302,7 @@ (let ([pos (cdr (assoc-iter-pos i))]) (if (null? pos) #f - (make-assoc-iter d pos)))] + (assoc-iter d pos)))] [(dict-struct? d) ((get-dict-iterate-next (dict-struct-ref d)) d i)] [(assoc? d) (raise-mismatch-error @@ -409,7 +409,7 @@ ;; ---------------------------------------- -(define-struct hash-box (key)) +(struct hash-box (key)) (define custom-hash-ref (case-lambda @@ -433,8 +433,8 @@ (let ([table (hash-set (custom-hash-table d) ((custom-hash-make-box d) k) v)]) - (make-immutable-custom-hash table - (custom-hash-make-box d)))) + (immutable-custom-hash table + (custom-hash-make-box d)))) (define (custom-hash-remove! d k) (hash-remove! (custom-hash-table d) @@ -443,8 +443,8 @@ (define (custom-hash-remove d k) (let ([table (hash-remove (custom-hash-table d) ((custom-hash-make-box d) k))]) - (make-immutable-custom-hash table - (custom-hash-make-box d)))) + (immutable-custom-hash table + (custom-hash-make-box d)))) (define (custom-hash-count d) (hash-count (custom-hash-table d))) @@ -461,7 +461,7 @@ (define (custom-hash-iterate-value d i) (hash-iterate-value (custom-hash-table d) i)) -(define-struct custom-hash (table make-box) +(struct custom-hash (table make-box) #:property prop:dict (vector custom-hash-ref custom-hash-set! @@ -482,7 +482,7 @@ (lambda (a recur) (recur (custom-hash-table a))) (lambda (a recur) (recur (custom-hash-table a))))) -(define-struct (immutable-custom-hash custom-hash) () +(struct immutable-custom-hash custom-hash () #:property prop:dict (vector custom-hash-ref #f @@ -510,7 +510,7 @@ (procedure-arity-includes? hash2 1)) (raise-type-error who "procedure (arity 1)" hash2)) (let () - (define-struct (box hash-box) () + (struct box hash-box () #:property prop:equal+hash (list (lambda (a b recur) (=? (hash-box-key a) (hash-box-key b))) @@ -518,16 +518,16 @@ (hash (hash-box-key v))) (lambda (v recur) (hash2 (hash-box-key v))))) - (make-custom-hash table (wrap-make-box make-box))))]) + (make-custom-hash table (wrap-make-box box))))]) (let ([make-custom-hash (lambda (=? hash [hash2 (lambda (v) 10001)]) - (mk hash hash2 =? 'make-custom-hash make-custom-hash (make-hash) values))] + (mk hash hash2 =? 'make-custom-hash custom-hash (make-hash) values))] [make-immutable-custom-hash (lambda (=? hash [hash2 (lambda (v) 10001)]) - (mk hash hash2 =? 'make-immutable-custom-hash make-immutable-custom-hash #hash() values))] + (mk hash hash2 =? 'make-immutable-custom-hash immutable-custom-hash #hash() values))] [make-weak-custom-hash (lambda (=? hash [hash2 (lambda (v) 10001)]) - (mk hash hash2 =? 'make-weak-custom-hash make-custom-hash (make-weak-hash) + (mk hash hash2 =? 'make-weak-custom-hash custom-hash (make-weak-hash) (lambda (make-box) (let ([ht (make-weak-hasheq)]) (lambda (v) diff --git a/collects/scheme/enter.ss b/collects/racket/enter.rkt similarity index 87% rename from collects/scheme/enter.ss rename to collects/racket/enter.rkt index 49af9fbd7b..5e2680b86d 100644 --- a/collects/scheme/enter.ss +++ b/collects/racket/enter.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (require syntax/modcode - (for-syntax scheme/base)) + (for-syntax racket/base)) (provide enter!) @@ -29,10 +29,10 @@ (enter-require mod) (let ([ns (module->namespace mod)]) (current-namespace ns) - (namespace-require 'scheme/enter))) + (namespace-require 'racket/enter))) (current-namespace orig-namespace))) -(define-struct mod (name timestamp depends)) +(struct mod (name timestamp depends)) (define loaded (make-hash)) @@ -66,13 +66,13 @@ (or (current-load-relative-directory) (current-directory)))))]) ;; Record module timestamp and dependencies: - (let ([mod (make-mod name - (get-timestamp path) - (if code - (apply append - (map cdr (module-compiled-imports code))) - null))]) - (hash-set! loaded path mod)) + (let ([a-mod (mod name + (get-timestamp path) + (if code + (apply append + (map cdr (module-compiled-imports code))) + null))]) + (hash-set! loaded path a-mod)) ;; Evaluate the module: (eval code)) ;; Not a module: diff --git a/collects/scheme/fasl.ss b/collects/racket/fasl.rkt similarity index 97% rename from collects/scheme/fasl.ss rename to collects/racket/fasl.rkt index e996342a1d..7d157b5aeb 100644 --- a/collects/scheme/fasl.ss +++ b/collects/racket/fasl.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide s-exp->fasl fasl->s-exp) diff --git a/collects/scheme/file.ss b/collects/racket/file.rkt similarity index 99% rename from collects/scheme/file.ss rename to collects/racket/file.rkt index 624746de0c..522b93f167 100644 --- a/collects/scheme/file.ss +++ b/collects/racket/file.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide delete-directory/files copy-directory/files @@ -22,7 +22,7 @@ write-to-file display-lines-to-file) -(require "private/portlines.ss") +(require "private/portlines.rkt") ;; utility: sorted dirlist so functions are deterministic (define (sorted-dirlist [dir (current-directory)]) diff --git a/collects/scheme/fixnum.ss b/collects/racket/fixnum.rkt similarity index 100% rename from collects/scheme/fixnum.ss rename to collects/racket/fixnum.rkt diff --git a/collects/scheme/flonum.ss b/collects/racket/flonum.rkt similarity index 100% rename from collects/scheme/flonum.ss rename to collects/racket/flonum.rkt diff --git a/collects/scheme/function.ss b/collects/racket/function.rkt similarity index 100% rename from collects/scheme/function.ss rename to collects/racket/function.rkt diff --git a/collects/scheme/future/main.ss b/collects/racket/future.rkt similarity index 84% rename from collects/scheme/future/main.ss rename to collects/racket/future.rkt index 4f8a051af2..ac13738a55 100644 --- a/collects/scheme/future/main.ss +++ b/collects/racket/future.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require '#%futures) (provide future? diff --git a/collects/scheme/generator.ss b/collects/racket/generator.rkt similarity index 97% rename from collects/scheme/generator.ss rename to collects/racket/generator.rkt index 6ad3a93259..2db0bd0014 100644 --- a/collects/scheme/generator.ss +++ b/collects/racket/generator.rkt @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) - scheme/control - scheme/stxparam scheme/splicing) +(require (for-syntax racket/base) + racket/control + racket/stxparam racket/splicing) (provide yield generator generator-state in-generator infinite-generator sequence->generator sequence->repeated-generator) diff --git a/collects/racket/gui.rkt b/collects/racket/gui.rkt new file mode 100644 index 0000000000..58531f4786 --- /dev/null +++ b/collects/racket/gui.rkt @@ -0,0 +1,4 @@ +(module gui racket + (require racket/gui/base) + (provide (all-from-out racket) + (all-from-out racket/gui/base))) diff --git a/collects/scheme/gui/base.ss b/collects/racket/gui/base.rkt similarity index 100% rename from collects/scheme/gui/base.ss rename to collects/racket/gui/base.rkt diff --git a/collects/scheme/gui/dynamic.ss b/collects/racket/gui/dynamic.rkt similarity index 100% rename from collects/scheme/gui/dynamic.ss rename to collects/racket/gui/dynamic.rkt diff --git a/collects/scheme/gui/init.ss b/collects/racket/gui/init.rkt similarity index 100% rename from collects/scheme/gui/init.ss rename to collects/racket/gui/init.rkt diff --git a/collects/racket/gui/lang/reader.ss b/collects/racket/gui/lang/reader.ss new file mode 100644 index 0000000000..48151efe84 --- /dev/null +++ b/collects/racket/gui/lang/reader.ss @@ -0,0 +1,2 @@ +#lang s-exp syntax/module-reader +racket/gui diff --git a/collects/scheme/help.ss b/collects/racket/help.rkt similarity index 97% rename from collects/scheme/help.ss rename to collects/racket/help.rkt index 60154ee771..c99eb3de6d 100644 --- a/collects/scheme/help.ss +++ b/collects/racket/help.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) scheme/promise) +(require (for-syntax racket/base) racket/promise) (provide help) diff --git a/collects/scheme/include.ss b/collects/racket/include.rkt similarity index 99% rename from collects/scheme/include.ss rename to collects/racket/include.rkt index 72c22ba0c7..78c6022f20 100644 --- a/collects/scheme/include.ss +++ b/collects/racket/include.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base +(require (for-syntax racket/base syntax/stx syntax/path-spec mzlib/private/increader diff --git a/collects/racket/init.ss b/collects/racket/init.rkt similarity index 63% rename from collects/racket/init.ss rename to collects/racket/init.rkt index e7fe38ba60..aa2a545349 100644 --- a/collects/racket/init.ss +++ b/collects/racket/init.rkt @@ -1,7 +1,6 @@ #lang racket -(require scheme/enter - scheme/help - "private/runtime.ss") +(require racket/enter + racket/help) ;; Set the printer: (current-print (let ([pretty-printer @@ -11,5 +10,5 @@ pretty-printer)) (provide (all-from-out racket - scheme/enter - scheme/help)) + racket/enter + racket/help)) diff --git a/collects/scheme/list.ss b/collects/racket/list.rkt similarity index 100% rename from collects/scheme/list.ss rename to collects/racket/list.rkt diff --git a/collects/scheme/load.ss b/collects/racket/load.rkt similarity index 100% rename from collects/scheme/load.ss rename to collects/racket/load.rkt diff --git a/collects/scheme/local.ss b/collects/racket/local.rkt similarity index 100% rename from collects/scheme/local.ss rename to collects/racket/local.rkt diff --git a/collects/racket/main.rkt b/collects/racket/main.rkt new file mode 100644 index 0000000000..c7ff6806d3 --- /dev/null +++ b/collects/racket/main.rkt @@ -0,0 +1,55 @@ +#lang racket/private + +(require racket/base + racket/contract + racket/class + racket/unit + racket/dict + racket/include + racket/pretty + racket/math + racket/match + racket/shared + racket/set + racket/tcp + racket/udp + racket/list + racket/vector + racket/string + racket/function + racket/path + racket/file + racket/port + racket/cmdline + racket/promise + racket/bool + racket/local + racket/nest + (for-syntax racket/base)) + +(provide (all-from-out racket/contract + racket/class + racket/unit + racket/dict + racket/include + racket/pretty + racket/math + racket/match + racket/shared + racket/base + racket/set + racket/tcp + racket/udp + racket/list + racket/vector + racket/string + racket/function + racket/path + racket/file + racket/port + racket/cmdline + racket/promise + racket/bool + racket/local + racket/nest) + (for-syntax (all-from-out racket/base))) diff --git a/collects/racket/main.ss b/collects/racket/main.ss deleted file mode 100644 index 2eccc36ade..0000000000 --- a/collects/racket/main.ss +++ /dev/null @@ -1,8 +0,0 @@ -#lang racket/private -(require (except-in scheme struct struct/ctc) - (only-in mzlib/unit struct~r/ctc) - "private/struct.rkt") - -(provide (all-from-out scheme) - (rename-out [struct~r/ctc struct/ctc]) - struct) diff --git a/collects/scheme/match.ss b/collects/racket/match.rkt similarity index 79% rename from collects/scheme/match.ss rename to collects/racket/match.rkt index cfe1cb2c7c..60c4122df7 100644 --- a/collects/scheme/match.ss +++ b/collects/racket/match.rkt @@ -1,7 +1,7 @@ -#lang scheme/base -(require scheme/match/match - (for-syntax scheme/base)) -(provide (except-out (all-from-out scheme/match/match) +#lang racket/base +(require racket/match/match + (for-syntax racket/base)) +(provide (except-out (all-from-out racket/match/match) define-match-expander) (rename-out [define-match-expander* define-match-expander])) diff --git a/collects/scheme/match/compiler.ss b/collects/racket/match/compiler.ss similarity index 100% rename from collects/scheme/match/compiler.ss rename to collects/racket/match/compiler.ss diff --git a/collects/scheme/match/define-forms.ss b/collects/racket/match/define-forms.ss similarity index 100% rename from collects/scheme/match/define-forms.ss rename to collects/racket/match/define-forms.ss diff --git a/collects/scheme/match/gen-match.ss b/collects/racket/match/gen-match.ss similarity index 100% rename from collects/scheme/match/gen-match.ss rename to collects/racket/match/gen-match.ss diff --git a/collects/scheme/match/legacy-match.ss b/collects/racket/match/legacy-match.ss similarity index 97% rename from collects/scheme/match/legacy-match.ss rename to collects/racket/match/legacy-match.ss index 56910ed05e..527a0dca52 100644 --- a/collects/scheme/match/legacy-match.ss +++ b/collects/racket/match/legacy-match.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require (only-in "runtime.ss" match-equality-test diff --git a/collects/scheme/match/match-expander.ss b/collects/racket/match/match-expander.ss similarity index 100% rename from collects/scheme/match/match-expander.ss rename to collects/racket/match/match-expander.ss diff --git a/collects/scheme/match/match.ss b/collects/racket/match/match.ss similarity index 97% rename from collects/scheme/match/match.ss rename to collects/racket/match/match.ss index d066e23ab3..3ab5265b36 100644 --- a/collects/scheme/match/match.ss +++ b/collects/racket/match/match.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require (only-in "runtime.ss" match-equality-test diff --git a/collects/scheme/match/parse-helper.ss b/collects/racket/match/parse-helper.ss similarity index 100% rename from collects/scheme/match/parse-helper.ss rename to collects/racket/match/parse-helper.ss diff --git a/collects/scheme/match/parse-legacy.ss b/collects/racket/match/parse-legacy.ss similarity index 96% rename from collects/scheme/match/parse-legacy.ss rename to collects/racket/match/parse-legacy.ss index 109fac63cf..6227ffbc4e 100644 --- a/collects/scheme/match/parse-legacy.ss +++ b/collects/racket/match/parse-legacy.ss @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base -(require (for-template scheme/base) +(require (for-template racket/base) syntax/boundmap syntax/stx - scheme/struct-info + racket/struct-info "patterns.ss" "compiler.ss" "parse-helper.ss" diff --git a/collects/scheme/match/parse-quasi.ss b/collects/racket/match/parse-quasi.ss similarity index 100% rename from collects/scheme/match/parse-quasi.ss rename to collects/racket/match/parse-quasi.ss diff --git a/collects/scheme/match/parse.ss b/collects/racket/match/parse.ss similarity index 100% rename from collects/scheme/match/parse.ss rename to collects/racket/match/parse.ss diff --git a/collects/scheme/match/patterns.ss b/collects/racket/match/patterns.ss similarity index 100% rename from collects/scheme/match/patterns.ss rename to collects/racket/match/patterns.ss diff --git a/collects/scheme/match/reorder.ss b/collects/racket/match/reorder.ss similarity index 100% rename from collects/scheme/match/reorder.ss rename to collects/racket/match/reorder.ss diff --git a/collects/scheme/match/runtime.ss b/collects/racket/match/runtime.ss similarity index 90% rename from collects/scheme/match/runtime.ss rename to collects/racket/match/runtime.ss index 6b38c07fbb..2527d0059c 100644 --- a/collects/scheme/match/runtime.ss +++ b/collects/racket/match/runtime.ss @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base -(require scheme/stxparam - (for-syntax scheme/base)) +(require racket/stxparam + (for-syntax racket/base)) (provide match-equality-test exn:misc:match? diff --git a/collects/scheme/match/split-rows.ss b/collects/racket/match/split-rows.ss similarity index 100% rename from collects/scheme/match/split-rows.ss rename to collects/racket/match/split-rows.ss diff --git a/collects/scheme/match/struct.ss b/collects/racket/match/struct.ss similarity index 95% rename from collects/scheme/match/struct.ss rename to collects/racket/match/struct.ss index dc7625a0e9..810c27c25f 100644 --- a/collects/scheme/match/struct.ss +++ b/collects/racket/match/struct.ss @@ -1,9 +1,9 @@ -#lang scheme/base -(require scheme/match/match-expander - (for-syntax scheme/base - scheme/struct-info +#lang racket/base +(require racket/match/match-expander + (for-syntax racket/base + racket/struct-info syntax/boundmap - scheme/list)) + racket/list)) (define-match-expander struct* diff --git a/collects/scheme/math.ss b/collects/racket/math.rkt similarity index 100% rename from collects/scheme/math.ss rename to collects/racket/math.rkt diff --git a/collects/scheme/mpair.ss b/collects/racket/mpair.rkt similarity index 100% rename from collects/scheme/mpair.ss rename to collects/racket/mpair.rkt diff --git a/collects/scheme/nest.ss b/collects/racket/nest.rkt similarity index 100% rename from collects/scheme/nest.ss rename to collects/racket/nest.rkt diff --git a/collects/scheme/package.ss b/collects/racket/package.rkt similarity index 100% rename from collects/scheme/package.ss rename to collects/racket/package.rkt diff --git a/collects/scheme/path.ss b/collects/racket/path.rkt similarity index 100% rename from collects/scheme/path.ss rename to collects/racket/path.rkt diff --git a/collects/scheme/place.ss b/collects/racket/place.rkt similarity index 100% rename from collects/scheme/place.ss rename to collects/racket/place.rkt diff --git a/collects/scheme/port.ss b/collects/racket/port.rkt similarity index 99% rename from collects/scheme/port.ss rename to collects/racket/port.rkt index 030865a589..c59996d298 100644 --- a/collects/scheme/port.ss +++ b/collects/racket/port.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require mzlib/port "private/portlines.ss") diff --git a/collects/scheme/pretty.ss b/collects/racket/pretty.rkt similarity index 94% rename from collects/scheme/pretty.ss rename to collects/racket/pretty.rkt index f471705a96..5682ac6034 100644 --- a/collects/scheme/pretty.ss +++ b/collects/racket/pretty.rkt @@ -9,7 +9,7 @@ ;; require this module and evaluate: ;; (current-print pretty-print-handler) -(module pretty mzscheme +(module pretty racket/base (require mzlib/private/port) (provide pretty-print @@ -64,18 +64,18 @@ (format "length of first list (~a) doesn't match the length of the second list (~a): " (length symbols) (length like-symbols)) like-symbols))) - (let ([ht (if table (pretty-print-style-table-hash table) (make-hash-table))] - [new-ht (make-hash-table)]) - (hash-table-for-each + (let ([ht (if table (pretty-print-style-table-hash table) (make-hasheq))] + [new-ht (make-hasheq)]) + (hash-for-each ht (lambda (key val) - (hash-table-put! new-ht key val))) + (hash-set! new-ht key val))) (for-each (lambda (symbol like-symbol) - (let ((s (hash-table-get ht - like-symbol - (lambda () #f)))) - (hash-table-put! new-ht symbol (or s like-symbol)))) + (let ((s (hash-ref ht + like-symbol + (lambda () #f)))) + (hash-set! new-ht symbol (or s like-symbol)))) symbols like-symbols) (make-pretty-print-style-table new-ht)))) @@ -233,7 +233,7 @@ (define pretty-display (make-pretty-print #t #f)) (define pretty-write (make-pretty-print #f #f)) - (define-struct mark (str def)) + (define-struct mark (str def) #:mutable) (define-struct hide (val)) (define (make-tentative-output-port pport width esc) @@ -323,7 +323,7 @@ void)) p))) - (define printing-ports (make-hash-table 'weak)) + (define printing-ports (make-weak-hasheq)) (define-struct print-port-info (get-content def-box @@ -334,15 +334,15 @@ esc)) (define (register-printing-port p info) - (hash-table-put! printing-ports p (make-ephemeron p info))) + (hash-set! printing-ports p (make-ephemeron p info))) (define (register-printing-port-like p pport) - (hash-table-put! printing-ports p - (make-ephemeron p - (ephemeron-value (hash-table-get printing-ports pport))))) + (hash-set! printing-ports p + (make-ephemeron p + (ephemeron-value (hash-ref printing-ports pport))))) (define (get pport selector) - (let ([e (hash-table-get printing-ports pport (lambda () #f))]) + (let ([e (hash-ref printing-ports pport #f)]) (selector (if e (ephemeron-value e) (make-print-port-info @@ -392,7 +392,8 @@ (begin (write-string " " port) (add-spaces (- n 8) port)) - (write-string " " port 0 n)))) + (write-string " " port 0 n)) + (void))) (define (prefab?! obj v) (let ([d (prefab-struct-key obj)]) @@ -413,7 +414,7 @@ (define mpair-open (if (print-mpair-curly-braces) "{" "(")) (define mpair-close (if (print-mpair-curly-braces) "}" ")")) - (define table (make-hash-table)) ; Hash table for looking for loops + (define table (make-hasheq)) ; Hash table for looking for loops (define show-inexactness? (pretty-print-show-inexactness)) (define exact-as-decimal? (pretty-print-exact-as-decimal)) @@ -459,10 +460,10 @@ (and (custom-write? obj) (not (struct-type? obj))) (and (struct? obj) print-struct?) - (and (hash-table? obj) print-hash-table?)) - (or (hash-table-get table obj (lambda () #f)) + (and (hash? obj) print-hash-table?)) + (or (hash-ref table obj #f) (begin - (hash-table-put! table obj #t) + (hash-set! table obj #t) (let ([cycle (cond [(vector? obj) @@ -485,16 +486,16 @@ [(struct? obj) (ormap loop (vector->list (struct->vector obj)))] - [(hash-table? obj) + [(hash? obj) (let/ec esc - (hash-table-for-each + (hash-for-each obj (lambda (v k) (when (or (loop v) (loop k)) (esc #t)))) #f)])]) - (hash-table-remove! table obj) + (hash-remove! table obj) cycle))))))) (define __dummy__ @@ -508,13 +509,13 @@ (and (custom-write? obj) (not (struct-type? obj))) (and (struct? obj) print-struct?) - (and (hash-table? obj) print-hash-table?)) + (and (hash? obj) print-hash-table?)) ;; A little confusing: use #t for not-found - (let ([p (hash-table-get table obj (lambda () #t))]) + (let ([p (hash-ref table obj #t)]) (when (not (mark? p)) (if p (begin - (hash-table-put! table obj #f) + (hash-set! table obj #f) (cond [(vector? obj) (let ([len (vector-length obj)]) @@ -535,15 +536,16 @@ [(struct? obj) (for-each loop (vector->list (struct->vector obj)))] - [(hash-table? obj) - (hash-table-for-each + [(hash? obj) + (hash-for-each obj (lambda (k v) (loop k) (loop v)))])) (begin - (hash-table-put! table obj - (make-mark #f (box #f))))))))))) + (hash-set! table obj + (make-mark #f (box #f))))))) + (void))))) (define cycle-counter 0) @@ -583,7 +585,7 @@ (lambda (obj pport check? c-k d-k n-k) (let ([ref (and check? found - (hash-table-get found obj (lambda () #f)))]) + (hash-ref found obj #f))]) (if (and ref (unbox (mark-def ref))) (if c-k (c-k (mark-str ref)) @@ -752,7 +754,7 @@ qd))))) (parameterize ([print-struct #f]) ((if display? orig-display orig-write) obj pport)))] - [(hash-table? obj) + [(hash? obj) (if (and print-hash-table? (not (and depth (zero? depth)))) @@ -761,13 +763,13 @@ #f #f (lambda () (let ([qd (to-quoted out qd "`")]) - (out (if (hash-table? obj 'equal) - "#hash" - (if (hash-table? obj 'eqv) + (out (if (hash-eq? obj) + "#hasheq" + (if (hash-eqv? obj) "#hasheqv" - "#hasheq"))) - (wr-lst (hash-table-map obj (lambda (k v) - (cons k (make-hide v)))) + "#hash"))) + (wr-lst (hash-map obj (lambda (k v) + (cons k (make-hide v)))) #f depth pair? car cdr "(" ")" qd)))) (parameterize ([print-hash-table #f]) @@ -840,9 +842,9 @@ (and (custom-write? obj) (not (struct-type? obj))) (and (struct? obj) print-struct?) - (and (hash-table? obj) print-hash-table?)))] + (and (hash? obj) print-hash-table?)))] [graph-ref (if can-multi - (and found (hash-table-get found obj (lambda () #f))) + (and found (hash-ref found obj #f)) #f)] [old-counter cycle-counter]) (if (and can-multi @@ -908,14 +910,14 @@ extra pp-expr #f depth pair? car cdr pair-open pair-close qd)))] - [(hash-table? obj) + [(hash? obj) (let ([qd (to-quoted out qd "`")]) - (out (if (hash-table? obj 'equal) - "#hash" - (if (hash-table? obj 'eqv) + (out (if (hash-eq? obj) + "#hasheq" + (if (hash-eqv? obj) "#hasheqv" - "#hasheq"))) - (pp-list (hash-table-map obj cons) extra pp-expr #f depth + "#hash"))) + (pp-list (hash-map obj cons) extra pp-expr #f depth pair? car cdr pair-open pair-close qd))] [(and (box? obj) print-box?) @@ -931,7 +933,7 @@ qd) (if (and (read-macro? expr apair? acar acdr qd) (equal? open "(") - (not (and found (hash-table-get found (acdr expr) #f)))) + (not (and found (hash-ref found (acdr expr) #f)))) (begin (out (read-macro-prefix expr acar)) (pr (read-macro-body expr acar acdr) @@ -1195,7 +1197,7 @@ (define (no-sharing? expr count apair? acdr) (if (apair? expr) (if (and found - (hash-table-get found (acdr expr) #f)) + (hash-ref found (acdr expr) #f)) #f (or (zero? count) (no-sharing? (acdr expr) (sub1 count) apair? acdr))) @@ -1286,10 +1288,10 @@ (define (look-in-style-table raw-head) (let ([head (do-remap raw-head)]) - (or (hash-table-get (pretty-print-style-table-hash - (pretty-print-current-style-table)) - head - #f) + (or (hash-ref (pretty-print-style-table-hash + (pretty-print-current-style-table)) + head + #f) head))) (define (do-remap raw-head) diff --git a/collects/scheme/base.ss b/collects/racket/private/base.rkt similarity index 63% rename from collects/scheme/base.ss rename to collects/racket/private/base.rkt index 08b90e1867..509a39f2a8 100644 --- a/collects/scheme/base.ss +++ b/collects/racket/private/base.rkt @@ -1,15 +1,16 @@ +(module base "pre-base.rkt" + + (#%require "list.rkt" + "string.rkt" + "stxcase-scheme.rkt" + "qqstx.rkt" + "stx.rkt" + "kw-file.rkt" + "namespace.rkt" + "struct.rkt" + (for-syntax "stxcase-scheme.rkt")) -(module base "private/pre-base.ss" - (#%require "private/list.ss" - "private/string.ss" - "private/stxcase-scheme.ss" - "private/qqstx.ss" - "private/stx.ss" - "private/kw-file.ss" - "private/namespace.ss" - (for-syntax "private/stxcase-scheme.ss")) - - (#%provide (all-from-except "private/pre-base.ss" + (#%provide (all-from-except "pre-base.rkt" open-input-file open-output-file open-input-output-file @@ -18,14 +19,15 @@ with-input-from-file with-output-to-file regexp-replace*) - (all-from "private/list.ss") - (all-from-except "private/string.ss" + struct + (all-from "list.rkt") + (all-from-except "string.rkt" -regexp-replace*) (rename -regexp-replace* regexp-replace*) identifier? - (all-from "private/stxcase-scheme.ss") - (all-from "private/qqstx.ss") - (all-from "private/namespace.ss") + (all-from "stxcase-scheme.rkt") + (all-from "qqstx.rkt") + (all-from "namespace.rkt") (for-syntax syntax-rules syntax-id-rules ... _) (rename -open-input-file open-input-file) (rename -open-output-file open-output-file) @@ -37,7 +39,3 @@ call-with-input-file* call-with-output-file*)) - - - - diff --git a/collects/scheme/private/class-events.ss b/collects/racket/private/class-events.rkt similarity index 96% rename from collects/scheme/private/class-events.ss rename to collects/racket/private/class-events.rkt index 1c049b2f35..d5d0f9a409 100644 --- a/collects/scheme/private/class-events.ss +++ b/collects/racket/private/class-events.rkt @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base - scheme/stxparam)) -(require scheme/stxparam) +(require (for-syntax racket/base + racket/stxparam)) +(require racket/stxparam) (provide current-class-event-handler define-traced diff --git a/collects/scheme/private/class-internal.ss b/collects/racket/private/class-internal.rkt similarity index 99% rename from collects/scheme/private/class-internal.ss rename to collects/racket/private/class-internal.rkt index 7390be0032..e6f495758c 100644 --- a/collects/scheme/private/class-internal.ss +++ b/collects/racket/private/class-internal.rkt @@ -1,14 +1,15 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) +(require (for-syntax racket/base) mzlib/etc - scheme/contract/base - (only-in scheme/contract/private/arrow making-a-method) - scheme/list - scheme/stxparam - "class-events.ss" - "serialize-structs.ss" - (for-syntax scheme/stxparam + racket/contract/base + (only-in racket/contract/private/arrow making-a-method) + racket/list + racket/stxparam + "class-events.rkt" + "serialize-structs.rkt" + "define-struct.rkt" + (for-syntax racket/stxparam syntax/kerncase syntax/stx syntax/name @@ -16,7 +17,7 @@ syntax/define syntax/flatten-begin syntax/private/boundmap - "classidmap.ss")) + "classidmap.rkt")) (define insp (current-inspector)) ; for all opaque structures diff --git a/collects/scheme/private/classidmap.ss b/collects/racket/private/classidmap.rkt similarity index 99% rename from collects/scheme/private/classidmap.ss rename to collects/racket/private/classidmap.rkt index 2ac81a9e92..387400790b 100644 --- a/collects/scheme/private/classidmap.ss +++ b/collects/racket/private/classidmap.rkt @@ -1,8 +1,9 @@ -#lang scheme/base +#lang racket/base (require syntax/stx (for-syntax scheme/base) - (for-template scheme/base "class-events.ss")) + (for-template scheme/base "class-events.rkt") + "define-struct.rkt") (define-values (struct:s!t make-s!t s!t? s!t-ref s!t-set!) (make-struct-type 'set!-transformer #f 2 0 #f null (current-inspector) 0)) diff --git a/collects/scheme/private/cond.ss b/collects/racket/private/cond.rkt similarity index 98% rename from collects/scheme/private/cond.ss rename to collects/racket/private/cond.rkt index f66a9eefdc..6f5a074137 100644 --- a/collects/scheme/private/cond.ss +++ b/collects/racket/private/cond.rkt @@ -3,7 +3,7 @@ ;; cond (module cond '#%kernel - (#%require (for-syntax "stx.ss" "qq-and-or.ss" '#%kernel)) + (#%require (for-syntax "stx.rkt" "qq-and-or.rkt" '#%kernel)) (define-syntaxes (=>) (lambda (stx) diff --git a/collects/scheme/private/define-et-al.ss b/collects/racket/private/define-et-al.rkt similarity index 98% rename from collects/scheme/private/define-et-al.ss rename to collects/racket/private/define-et-al.rkt index ac1e30ded6..1117c763e8 100644 --- a/collects/scheme/private/define-et-al.ss +++ b/collects/racket/private/define-et-al.rkt @@ -3,8 +3,8 @@ ;; -define, when, unless, let/ec, define-struct (module define-et-al '#%kernel - (#%require (for-syntax '#%kernel "stx.ss" "qq-and-or.ss" - "cond.ss")) + (#%require (for-syntax '#%kernel "stx.rkt" "qq-and-or.rkt" + "cond.rkt")) ;; No error checking here, because these macros merely help ;; us write macros before the real define and define-syntax diff --git a/collects/scheme/private/define-struct.ss b/collects/racket/private/define-struct.rkt similarity index 99% rename from collects/scheme/private/define-struct.ss rename to collects/racket/private/define-struct.rkt index c9e06f1e94..5b6046da32 100644 --- a/collects/scheme/private/define-struct.ss +++ b/collects/racket/private/define-struct.rkt @@ -3,11 +3,11 @@ ;; (planet "struct.ss" ("ryanc" "macros.plt" 1 0))) (module define-struct '#%kernel - (#%require "more-scheme.ss" "small-scheme.ss" "define.ss" "../stxparam.ss" - (for-syntax '#%kernel "define.ss" - "stx.ss" "stxcase-scheme.ss" "small-scheme.ss" - "stxloc.ss" "qqstx.ss" - "struct-info.ss")) + (#%require "more-scheme.rkt" "small-scheme.rkt" "define.rkt" "../stxparam.rkt" + (for-syntax '#%kernel "define.rkt" + "stx.rkt" "stxcase-scheme.rkt" "small-scheme.rkt" + "stxloc.rkt" "qqstx.rkt" + "struct-info.rkt")) (#%provide define-struct* define-struct/derived diff --git a/collects/scheme/private/define.ss b/collects/racket/private/define.rkt similarity index 95% rename from collects/scheme/private/define.ss rename to collects/racket/private/define.rkt index 4d0535bc46..9c955c88f3 100644 --- a/collects/scheme/private/define.ss +++ b/collects/racket/private/define.rkt @@ -4,8 +4,8 @@ (module define '#%kernel (#%require (for-syntax '#%kernel - "letstx-scheme.ss" "stxcase-scheme.ss" "stx.ss" "qqstx.ss" - "norm-define.ss")) + "letstx-scheme.rkt" "stxcase-scheme.rkt" "stx.rkt" "qqstx.rkt" + "norm-define.rkt")) (#%provide define define-syntax define-for-syntax begin-for-syntax) diff --git a/collects/scheme/private/ellipses.ss b/collects/racket/private/ellipses.rkt similarity index 100% rename from collects/scheme/private/ellipses.ss rename to collects/racket/private/ellipses.rkt diff --git a/collects/scheme/private/for.ss b/collects/racket/private/for.rkt similarity index 99% rename from collects/scheme/private/for.ss rename to collects/racket/private/for.rkt index 4a58518382..6a95bc7236 100644 --- a/collects/scheme/private/for.ss +++ b/collects/racket/private/for.rkt @@ -1,16 +1,16 @@ (module for '#%kernel - (#%require "more-scheme.ss" - "misc.ss" - "define.ss" - "letstx-scheme.ss" + (#%require "more-scheme.rkt" + "misc.rkt" + "define.rkt" + "letstx-scheme.rkt" '#%unsafe (for-syntax '#%kernel - "stx.ss" - "qqstx.ss" - "define.ss" - "small-scheme.ss" - "stxcase-scheme.ss")) + "stx.rkt" + "qqstx.rkt" + "define.rkt" + "small-scheme.rkt" + "stxcase-scheme.rkt")) (#%provide for/fold for*/fold for for* diff --git a/collects/racket/private/get-info.rkt b/collects/racket/private/get-info.rkt new file mode 100644 index 0000000000..deae59928b --- /dev/null +++ b/collects/racket/private/get-info.rkt @@ -0,0 +1,11 @@ +(module get-info "pre-base.ss" + + (provide get-info) + + (define (get-info data) + (lambda (key default) + (case key + [(configure-runtime) + '(#(racket/private/runtime configure #f))] + [else default])))) + diff --git a/collects/racket/private/get-info.ss b/collects/racket/private/get-info.ss deleted file mode 100644 index 76270ec870..0000000000 --- a/collects/racket/private/get-info.ss +++ /dev/null @@ -1,10 +0,0 @@ -#lang scheme/base - -(provide get-info) - -(define (get-info data) - (lambda (key default) - (case key - [(configure-runtime) - '(#(racket/private/runtime configure #f))] - [else default]))) diff --git a/collects/scheme/private/kernstruct.ss b/collects/racket/private/kernstruct.rkt similarity index 99% rename from collects/scheme/private/kernstruct.ss rename to collects/racket/private/kernstruct.rkt index 37ddcdaf1d..da6e9a620b 100644 --- a/collects/scheme/private/kernstruct.ss +++ b/collects/racket/private/kernstruct.rkt @@ -3,8 +3,8 @@ ;; record for static info produced by structs defined in c (module kernstruct '#%kernel (#%require (for-syntax '#%kernel)) - (#%require "define.ss") - (#%require (for-syntax "struct-info.ss")) + (#%require "define.rkt") + (#%require (for-syntax "struct-info.rkt")) (#%provide (all-defined)) (define-syntax exn (make-struct-info diff --git a/collects/scheme/private/kw-file.ss b/collects/racket/private/kw-file.rkt similarity index 99% rename from collects/scheme/private/kw-file.ss rename to collects/racket/private/kw-file.rkt index 22318e788a..66521ce289 100644 --- a/collects/scheme/private/kw-file.ss +++ b/collects/racket/private/kw-file.rkt @@ -1,5 +1,5 @@ -(module kw-file "pre-base.ss" +(module kw-file "pre-base.rkt" (provide -open-input-file -open-output-file diff --git a/collects/scheme/private/kw.ss b/collects/racket/private/kw.rkt similarity index 99% rename from collects/scheme/private/kw.ss rename to collects/racket/private/kw.rkt index 4d4eb767ca..8febbdb1e9 100644 --- a/collects/scheme/private/kw.ss +++ b/collects/racket/private/kw.rkt @@ -1,15 +1,15 @@ (module kw '#%kernel - (#%require "define.ss" - "small-scheme.ss" - "more-scheme.ss" + (#%require "define.rkt" + "small-scheme.rkt" + "more-scheme.rkt" (for-syntax '#%kernel - "stx.ss" - "small-scheme.ss" - "stxcase-scheme.ss" - "name.ss" - "norm-define.ss" - "qqstx.ss" - "sort.ss")) + "stx.rkt" + "small-scheme.rkt" + "stxcase-scheme.rkt" + "name.rkt" + "norm-define.rkt" + "qqstx.rkt" + "sort.rkt")) (#%provide new-lambda new-λ new-define diff --git a/collects/racket/private/lang/reader.ss b/collects/racket/private/lang/reader.ss index b15c1ae80f..fc10398151 100644 --- a/collects/racket/private/lang/reader.ss +++ b/collects/racket/private/lang/reader.ss @@ -1,5 +1,5 @@ #lang s-exp syntax/module-reader -scheme/base +racket/private/pre-base #:info get-info #:module-info '#(racket/private/get-info get-info #f) diff --git a/collects/scheme/private/letstx-scheme.ss b/collects/racket/private/letstx-scheme.rkt similarity index 83% rename from collects/scheme/private/letstx-scheme.ss rename to collects/racket/private/letstx-scheme.rkt index c29b20a978..5be2e7ab88 100644 --- a/collects/scheme/private/letstx-scheme.ss +++ b/collects/racket/private/letstx-scheme.rkt @@ -3,9 +3,9 @@ ;; #%stxcase-scheme: adds let-syntax, letrec-syntax, etc. (module letstx-scheme '#%kernel - (#%require "small-scheme.ss" "stx.ss" "stxcase.ss" "with-stx.ss" "stxloc.ss" - (for-syntax '#%kernel "small-scheme.ss" "stx.ss" "stxcase.ss" - "with-stx.ss" "stxloc.ss")) + (#%require "small-scheme.rkt" "stx.rkt" "stxcase.rkt" "with-stx.rkt" "stxloc.rkt" + (for-syntax '#%kernel "small-scheme.rkt" "stx.rkt" "stxcase.rkt" + "with-stx.rkt" "stxloc.rkt")) (-define-syntax letrec-syntaxes (lambda (stx) @@ -49,5 +49,5 @@ (let-syntaxes ([(id) expr] ...) body1 body ...))]))) - (#%provide (all-from "small-scheme.ss") - letrec-syntaxes letrec-syntax let-syntaxes let-syntax )) + (#%provide (all-from "small-scheme.rkt") + letrec-syntaxes letrec-syntax let-syntaxes let-syntax)) diff --git a/collects/scheme/private/list.ss b/collects/racket/private/list.rkt similarity index 98% rename from collects/scheme/private/list.ss rename to collects/racket/private/list.rkt index 383e1426b6..a943d07e07 100644 --- a/collects/scheme/private/list.ss +++ b/collects/racket/private/list.rkt @@ -1,5 +1,5 @@ -(module list "pre-base.ss" +(module list "pre-base.rkt" (provide foldl foldr @@ -25,8 +25,8 @@ compose) - (#%require (rename "sort.ss" raw-sort sort) - (for-syntax "stxcase-scheme.ss")) + (#%require (rename "sort.rkt" raw-sort sort) + (for-syntax "stxcase-scheme.rkt")) (provide sort) (define (sort lst less? #:key [getkey #f] #:cache-keys? [cache-keys? #f]) diff --git a/collects/scheme/private/local.ss b/collects/racket/private/local.rkt similarity index 99% rename from collects/scheme/private/local.ss rename to collects/racket/private/local.rkt index 62a4720405..c59cd70e00 100644 --- a/collects/scheme/private/local.ss +++ b/collects/racket/private/local.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require (for-syntax scheme/base) +#lang racket/base +(require (for-syntax racket/base) (for-syntax syntax/context) (for-syntax syntax/kerncase)) (provide (for-syntax do-local)) diff --git a/collects/scheme/private/map.ss b/collects/racket/private/map.rkt similarity index 98% rename from collects/scheme/private/map.ss rename to collects/racket/private/map.rkt index fa19f2edb3..2b163614a7 100644 --- a/collects/scheme/private/map.ss +++ b/collects/racket/private/map.rkt @@ -4,7 +4,7 @@ (module map '#%kernel (#%require '#%utils ; built into mzscheme - "more-scheme.ss" "small-scheme.ss" "define.ss") + "more-scheme.rkt" "small-scheme.rkt" "define.rkt") (#%provide (rename map2 map) (rename for-each2 for-each) diff --git a/collects/scheme/private/misc.ss b/collects/racket/private/misc.rkt similarity index 97% rename from collects/scheme/private/misc.ss rename to collects/racket/private/misc.rkt index 1b7f2049c0..90c2f99542 100644 --- a/collects/scheme/private/misc.ss +++ b/collects/racket/private/misc.rkt @@ -4,8 +4,8 @@ (module misc '#%kernel (#%require '#%utils ; built into mzscheme - "more-scheme.ss" "small-scheme.ss" "define.ss" - (for-syntax '#%kernel "stx.ss" "stxcase-scheme.ss" "stxcase.ss")) + "more-scheme.rkt" "small-scheme.rkt" "define.rkt" + (for-syntax '#%kernel "stx.rkt" "stxcase-scheme.rkt" "stxcase.rkt")) ;; ------------------------------------------------------------------------- diff --git a/collects/scheme/private/modbeg.ss b/collects/racket/private/modbeg.rkt similarity index 100% rename from collects/scheme/private/modbeg.ss rename to collects/racket/private/modbeg.rkt diff --git a/collects/scheme/private/more-scheme.ss b/collects/racket/private/more-scheme.rkt similarity index 98% rename from collects/scheme/private/more-scheme.ss rename to collects/racket/private/more-scheme.rkt index 7b5bcb3bf7..0c32ee0fe0 100644 --- a/collects/scheme/private/more-scheme.ss +++ b/collects/racket/private/more-scheme.rkt @@ -3,8 +3,8 @@ ;; more-scheme : case, do, etc. - remaining syntax (module more-scheme '#%kernel - (#%require "small-scheme.ss" "define.ss" '#%paramz - (for-syntax '#%kernel "stx.ss" "small-scheme.ss" "stxcase-scheme.ss" "qqstx.ss")) + (#%require "small-scheme.rkt" "define.rkt" '#%paramz + (for-syntax '#%kernel "stx.rkt" "small-scheme.rkt" "stxcase-scheme.rkt" "qqstx.rkt")) (define-syntax case-test (lambda (x) diff --git a/collects/scheme/private/name.ss b/collects/racket/private/name.rkt similarity index 93% rename from collects/scheme/private/name.ss rename to collects/racket/private/name.rkt index a597cca7f7..6400d7676c 100644 --- a/collects/scheme/private/name.ss +++ b/collects/racket/private/name.rkt @@ -1,6 +1,6 @@ (module name '#%kernel - (#%require "define.ss" "small-scheme.ss") + (#%require "define.rkt" "small-scheme.rkt") (#%provide syntax-local-infer-name) (define (syntax-local-infer-name stx) diff --git a/collects/scheme/private/namespace.ss b/collects/racket/private/namespace.rkt similarity index 92% rename from collects/scheme/private/namespace.ss rename to collects/racket/private/namespace.rkt index c3d137e56d..c8b87be730 100644 --- a/collects/scheme/private/namespace.ss +++ b/collects/racket/private/namespace.rkt @@ -1,7 +1,7 @@ -(module namespace "pre-base.ss" - (require (for-syntax '#%kernel "define.ss" - "stx.ss" "stxcase-scheme.ss" "small-scheme.ss" - "stxloc.ss")) +(module namespace "pre-base.rkt" + (require (for-syntax '#%kernel "define.rkt" + "stx.rkt" "stxcase-scheme.rkt" "small-scheme.rkt" + "stxloc.rkt")) (provide make-base-empty-namespace make-base-namespace diff --git a/collects/scheme/private/norm-arity.ss b/collects/racket/private/norm-arity.rkt similarity index 98% rename from collects/scheme/private/norm-arity.ss rename to collects/racket/private/norm-arity.rkt index 1d12e4a9db..d1d0e10807 100644 --- a/collects/scheme/private/norm-arity.ss +++ b/collects/racket/private/norm-arity.rkt @@ -1,5 +1,5 @@ (module norm-arity '#%kernel - (#%require "define.ss" "small-scheme.ss" "sort.ss") + (#%require "define.rkt" "small-scheme.rkt" "sort.rkt") (#%provide norm:procedure-arity norm:raise-arity-error normalize-arity) ;; for test suites diff --git a/collects/scheme/private/norm-define.ss b/collects/racket/private/norm-define.rkt similarity index 99% rename from collects/scheme/private/norm-define.ss rename to collects/racket/private/norm-define.rkt index 52ce2ddd4d..cbb835b3f8 100644 --- a/collects/scheme/private/norm-define.ss +++ b/collects/racket/private/norm-define.rkt @@ -1,6 +1,6 @@ (module norm-define '#%kernel - (#%require "small-scheme.ss" "stxcase-scheme.ss" "stx.ss" "qqstx.ss") + (#%require "small-scheme.rkt" "stxcase-scheme.rkt" "stx.rkt" "qqstx.rkt") (#%provide normalize-definition) diff --git a/collects/scheme/private/old-ds.ss b/collects/racket/private/old-ds.rkt similarity index 100% rename from collects/scheme/private/old-ds.ss rename to collects/racket/private/old-ds.rkt diff --git a/collects/scheme/private/old-if.ss b/collects/racket/private/old-if.rkt similarity index 100% rename from collects/scheme/private/old-if.ss rename to collects/racket/private/old-if.rkt diff --git a/collects/scheme/private/old-procs.ss b/collects/racket/private/old-procs.rkt similarity index 96% rename from collects/scheme/private/old-procs.ss rename to collects/racket/private/old-procs.rkt index 7a074fd377..632acb6bbb 100644 --- a/collects/scheme/private/old-procs.ss +++ b/collects/racket/private/old-procs.rkt @@ -1,10 +1,10 @@ (module old-procs '#%kernel - (#%require "small-scheme.ss" - "more-scheme.ss" - "misc.ss" - "stxmz-body.ss" - "define.ss") + (#%require "small-scheme.rkt" + "more-scheme.rkt" + "misc.rkt" + "stxmz-body.rkt" + "define.rkt") (#%provide make-namespace free-identifier=?* diff --git a/collects/scheme/private/old-rp.ss b/collects/racket/private/old-rp.rkt similarity index 96% rename from collects/scheme/private/old-rp.ss rename to collects/racket/private/old-rp.rkt index 2634ece8ff..74f15547f2 100644 --- a/collects/scheme/private/old-rp.ss +++ b/collects/racket/private/old-rp.rkt @@ -1,6 +1,6 @@ (module old-rp '#%kernel - (#%require (for-syntax '#%kernel "stx.ss" "small-scheme.ss" "stxcase-scheme.ss")) + (#%require (for-syntax '#%kernel "stx.rkt" "small-scheme.rkt" "stxcase-scheme.rkt")) (#%provide require require-for-syntax require-for-template require-for-label provide provide-for-syntax provide-for-label) diff --git a/collects/scheme/private/portlines.ss b/collects/racket/private/portlines.rkt similarity index 97% rename from collects/scheme/private/portlines.ss rename to collects/racket/private/portlines.rkt index 9c5fcde121..a9a65a8065 100644 --- a/collects/scheme/private/portlines.ss +++ b/collects/racket/private/portlines.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide port->x-lines check-mode diff --git a/collects/scheme/private/pre-base.ss b/collects/racket/private/pre-base.rkt similarity index 82% rename from collects/scheme/private/pre-base.ss rename to collects/racket/private/pre-base.rkt index 6984f83c59..dfdc37d894 100644 --- a/collects/scheme/private/pre-base.ss +++ b/collects/racket/private/pre-base.rkt @@ -3,18 +3,18 @@ (module pre-base '#%kernel (#%require (for-syntax '#%kernel)) - (#%require "more-scheme.ss" - "misc.ss" - (all-except "define.ss" define) - "letstx-scheme.ss" - "kw.ss" - "define-struct.ss" - "reqprov.ss" - "modbeg.ss" - "for.ss" - "map.ss" ; shadows #%kernel bindings - "kernstruct.ss" - "norm-arity.ss" + (#%require "more-scheme.rkt" + "misc.rkt" + (all-except "define.rkt" define) + "letstx-scheme.rkt" + "kw.rkt" + "define-struct.rkt" + "reqprov.rkt" + "modbeg.rkt" + "for.rkt" + "map.rkt" ; shadows #%kernel bindings + "kernstruct.rkt" + "norm-arity.rkt" '#%builtin) ; so it's attached (define-syntaxes (#%top-interaction) @@ -57,10 +57,10 @@ (keyword-apply proc kws kw-args (apply list* args rest)))) keyword-apply)) - (#%provide (all-from-except "more-scheme.ss" old-case fluid-let) - (all-from "misc.ss") - (all-from "define.ss") - (all-from-except "letstx-scheme.ss" -define -define-syntax -define-struct old-cond) + (#%provide (all-from-except "more-scheme.rkt" old-case fluid-let) + (all-from "misc.rkt") + (all-from "define.rkt") + (all-from-except "letstx-scheme.rkt" -define -define-syntax -define-struct old-cond) (rename new-lambda lambda) (rename new-λ λ) (rename new-define define) @@ -81,9 +81,9 @@ procedure-arity procedure-reduce-arity raise-arity-error procedure->method procedure-rename chaperone-procedure) - (all-from "reqprov.ss") - (all-from "for.ss") - (all-from "kernstruct.ss") + (all-from "reqprov.rkt") + (all-from "for.rkt") + (all-from "kernstruct.rkt") #%top-interaction map for-each andmap ormap diff --git a/collects/scheme/private/promise.ss b/collects/racket/private/promise.rkt similarity index 98% rename from collects/scheme/private/promise.ss rename to collects/racket/private/promise.rkt index f8408c08fb..6b6c5bf697 100644 --- a/collects/scheme/private/promise.ss +++ b/collects/racket/private/promise.rkt @@ -1,9 +1,9 @@ (module promise '#%kernel -(#%require "small-scheme.ss" - "more-scheme.ss" - "define.ss" - (rename "define-struct.ss" define-struct define-struct*) - (for-syntax '#%kernel "stxcase-scheme.ss" "name.ss") +(#%require "small-scheme.rkt" + "more-scheme.rkt" + "define.rkt" + (rename "define-struct.rkt" define-struct define-struct*) + (for-syntax '#%kernel "stxcase-scheme.rkt" "name.rkt") '#%unsafe) (#%provide force promise? promise-forced? promise-running? ;; provided to create extensions diff --git a/collects/scheme/private/qq-and-or.ss b/collects/racket/private/qq-and-or.rkt similarity index 99% rename from collects/scheme/private/qq-and-or.ss rename to collects/racket/private/qq-and-or.rkt index 4cf2ab610c..226dc72022 100644 --- a/collects/scheme/private/qq-and-or.ss +++ b/collects/racket/private/qq-and-or.rkt @@ -3,7 +3,7 @@ ;; quasiquote, and, or (module qq-and-or '#%kernel - (#%require (for-syntax "stx.ss" '#%kernel)) + (#%require (for-syntax "stx.rkt" '#%kernel)) (define-syntaxes (let let* letrec) (let-values ([(lambda-stx) (quote-syntax lambda-stx)] diff --git a/collects/scheme/private/qqstx.ss b/collects/racket/private/qqstx.rkt similarity index 97% rename from collects/scheme/private/qqstx.ss rename to collects/racket/private/qqstx.rkt index d2669d2bc2..d0bcb4dfe9 100644 --- a/collects/scheme/private/qqstx.ss +++ b/collects/racket/private/qqstx.rkt @@ -2,8 +2,8 @@ ;; #%qqstx : quasisyntax (module qqstx '#%kernel - (#%require "small-scheme.ss" "stxcase-scheme.ss" "stx.ss" - (for-syntax '#%kernel "small-scheme.ss" "stxcase-scheme.ss" "stx.ss")) + (#%require "small-scheme.rkt" "stxcase-scheme.rkt" "stx.rkt" + (for-syntax '#%kernel "small-scheme.rkt" "stxcase-scheme.rkt" "stx.rkt")) (#%provide quasisyntax quasisyntax/loc diff --git a/collects/scheme/private/reqprov.ss b/collects/racket/private/reqprov.rkt similarity index 99% rename from collects/scheme/private/reqprov.ss rename to collects/racket/private/reqprov.rkt index bd2c9518d9..180791c81c 100644 --- a/collects/scheme/private/reqprov.ss +++ b/collects/racket/private/reqprov.rkt @@ -1,11 +1,11 @@ (module reqprov '#%kernel - (#%require "more-scheme.ss" "small-scheme.ss" "define.ss" "../stxparam.ss" - (for-syntax '#%kernel "define.ss" - "stx.ss" "stxcase-scheme.ss" "small-scheme.ss" - "stxloc.ss" "qqstx.ss" - "../require-transform.ss" - "../provide-transform.ss" - "struct-info.ss")) + (#%require "more-scheme.rkt" "small-scheme.rkt" "define.rkt" "../stxparam.rkt" + (for-syntax '#%kernel "define.rkt" + "stx.rkt" "stxcase-scheme.rkt" "small-scheme.rkt" + "stxloc.rkt" "qqstx.rkt" + "../require-transform.rkt" + "../provide-transform.rkt" + "struct-info.rkt")) (#%provide lib file planet for-syntax for-template for-label for-meta diff --git a/collects/racket/private/runtime.ss b/collects/racket/private/runtime.rkt similarity index 100% rename from collects/racket/private/runtime.ss rename to collects/racket/private/runtime.rkt diff --git a/collects/scheme/private/sandbox-coverage.ss b/collects/racket/private/sandbox-coverage.rkt similarity index 100% rename from collects/scheme/private/sandbox-coverage.ss rename to collects/racket/private/sandbox-coverage.rkt diff --git a/collects/scheme/private/sc.ss b/collects/racket/private/sc.rkt similarity index 99% rename from collects/scheme/private/sc.ss rename to collects/racket/private/sc.rkt index 04ba3b1dff..9491adca1d 100644 --- a/collects/scheme/private/sc.ss +++ b/collects/racket/private/sc.rkt @@ -3,9 +3,9 @@ ;; based on Shriram's pattern matcher for Zodiac (module sc '#%kernel - (#%require "stx.ss" "small-scheme.ss" + (#%require "stx.rkt" "small-scheme.rkt" (for-template (only '#%kernel set!) - "ellipses.ss")) + "ellipses.rkt")) ;; Checks whether s is "..." (-define (...? s) diff --git a/collects/scheme/private/serialize-structs.ss b/collects/racket/private/serialize-structs.rkt similarity index 61% rename from collects/scheme/private/serialize-structs.ss rename to collects/racket/private/serialize-structs.rkt index 87e87adb12..b2026ddfdd 100644 --- a/collects/scheme/private/serialize-structs.ss +++ b/collects/racket/private/serialize-structs.rkt @@ -1,13 +1,13 @@ -(module serialize-structs mzscheme +(module serialize-structs racket/base ;; Exports just the structre info, which is needed in - ;; "class.ss" (which is, in turn, ultimately required by - ;; "serialize.ss") + ;; "class.rkt" (which is, in turn, ultimately required by + ;; "serialize.rkt") (provide - (protect - (struct serialize-info (vectorizer deserialize-id can-cycle? dir)) - (struct deserialize-info (maker cycle-maker)) + (protect-out + (struct-out serialize-info) + (struct-out deserialize-info) prop:serializable serializable-struct? serializable-info)) (define-struct serialize-info (vectorizer deserialize-id can-cycle? dir)) diff --git a/collects/scheme/private/serialize.ss b/collects/racket/private/serialize.rkt similarity index 99% rename from collects/scheme/private/serialize.ss rename to collects/racket/private/serialize.rkt index bd67fe8879..f52e8b4f3f 100644 --- a/collects/scheme/private/serialize.ss +++ b/collects/racket/private/serialize.rkt @@ -1,4 +1,4 @@ -(module serialize scheme/base +(module serialize racket/base (require syntax/modcollapse "serialize-structs.ss") diff --git a/collects/racket/private/small-scheme.rkt b/collects/racket/private/small-scheme.rkt new file mode 100644 index 0000000000..36c881a617 --- /dev/null +++ b/collects/racket/private/small-scheme.rkt @@ -0,0 +1,11 @@ + +;;---------------------------------------------------------------------- +;; assembles all basic forms we have so far + +(module small-scheme '#%kernel + (#%require "stx.rkt" "qq-and-or.rkt" "cond.rkt" "define-et-al.rkt") + + (#%provide (all-from "qq-and-or.rkt") + (all-from "cond.rkt") + (all-from "define-et-al.rkt"))) + diff --git a/collects/scheme/private/sort.ss b/collects/racket/private/sort.rkt similarity index 98% rename from collects/scheme/private/sort.ss rename to collects/racket/private/sort.rkt index bea358fa20..48457bf1d1 100644 --- a/collects/scheme/private/sort.ss +++ b/collects/racket/private/sort.rkt @@ -1,6 +1,6 @@ (module sort '#%kernel -(#%require "small-scheme.ss" "define.ss" (for-syntax "stxcase-scheme.ss")) +(#%require "small-scheme.rkt" "define.rkt" (for-syntax "stxcase-scheme.rkt")) (#%provide sort) @@ -19,7 +19,7 @@ code. Note that there is no error checking on the arguments -- the `sort' function that this module provide is then wrapped up by a keyworded version in -"scheme/private/list.ss", and that's what everybody sees. The wrapper is +"scheme/private/list.rkt", and that's what everybody sees. The wrapper is doing these checks. |# diff --git a/collects/scheme/private/string.ss b/collects/racket/private/string.rkt similarity index 99% rename from collects/scheme/private/string.ss rename to collects/racket/private/string.rkt index 9b7077b860..784d23ef3d 100644 --- a/collects/scheme/private/string.ss +++ b/collects/racket/private/string.rkt @@ -1,4 +1,4 @@ -(module string "pre-base.ss" +(module string "pre-base.rkt" (provide real->decimal-string regexp-quote @@ -10,7 +10,7 @@ regexp-match-exact? regexp-try-match -regexp-replace*) - (require (for-syntax "stxcase-scheme.ss")) + (require (for-syntax "stxcase-scheme.rkt")) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define (real->decimal-string n [digits 2]) diff --git a/collects/scheme/private/struct-info.ss b/collects/racket/private/struct-info.rkt similarity index 99% rename from collects/scheme/private/struct-info.ss rename to collects/racket/private/struct-info.rkt index 067feef6cb..90954bd2be 100644 --- a/collects/scheme/private/struct-info.ss +++ b/collects/racket/private/struct-info.rkt @@ -3,7 +3,7 @@ ;; record for static info produced by `define-struct' (module struct-info '#%kernel - (#%require "small-scheme.ss") + (#%require "small-scheme.rkt") (#%provide make-struct-info struct-info? diff --git a/collects/racket/private/struct.rkt b/collects/racket/private/struct.rkt index 15a061a5f6..ccb78bb65f 100644 --- a/collects/racket/private/struct.rkt +++ b/collects/racket/private/struct.rkt @@ -1,38 +1,44 @@ -#lang scheme/base -(require (for-syntax scheme/base)) -(provide struct) +(module struct '#%kernel + (#%require "more-scheme.rkt" "small-scheme.rkt" "define.rkt" "../stxparam.rkt" + "define-struct.rkt" + (for-syntax '#%kernel "define.rkt" + "stx.rkt" "stxcase-scheme.rkt" "small-scheme.rkt" + "stxloc.rkt" "qqstx.rkt" + "struct-info.rkt")) -(define-syntax (struct stx) - (define (config-has-name? config) - (cond - [(syntax? config) (config-has-name? (syntax-e config))] - [(pair? config) (or (eq? (syntax-e (car config)) '#:constructor-name) - (config-has-name? (cdr config)))] - [else #f])) - (with-syntax ([orig stx]) - (syntax-case stx () - [(_ id super-id fields . config) - (and (identifier? #'id) - (identifier? #'super-id)) - (if (not (config-has-name? #'config)) - (syntax/loc stx - (define-struct/derived orig (id super-id) fields #:constructor-name id . config)) - (syntax/loc stx - (define-struct/derived orig (id super-id) fields . config)))] - [(_ id fields . config) - (identifier? #'id) - (if (not (config-has-name? #'config)) - (syntax/loc stx - (define-struct/derived orig id fields #:constructor-name id . config)) - (syntax/loc stx - (define-struct/derived orig id fields . config)))] - [(_ id . rest) - (identifier? #'id) - (syntax/loc stx - (define-struct/derived orig id . rest))] - [(_ thing . _) - (raise-syntax-error #f - "expected an identifier for the structure type name" - #'thing - stx)]))) + (#%provide struct) + + (define-syntax (struct stx) + (define (config-has-name? config) + (cond + [(syntax? config) (config-has-name? (syntax-e config))] + [(pair? config) (or (eq? (syntax-e (car config)) '#:constructor-name) + (config-has-name? (cdr config)))] + [else #f])) + (with-syntax ([orig stx]) + (syntax-case stx () + [(_ id super-id fields . config) + (and (identifier? #'id) + (identifier? #'super-id)) + (if (not (config-has-name? #'config)) + (syntax/loc stx + (define-struct/derived orig (id super-id) fields #:constructor-name id . config)) + (syntax/loc stx + (define-struct/derived orig (id super-id) fields . config)))] + [(_ id fields . config) + (identifier? #'id) + (if (not (config-has-name? #'config)) + (syntax/loc stx + (define-struct/derived orig id fields #:constructor-name id . config)) + (syntax/loc stx + (define-struct/derived orig id fields . config)))] + [(_ id . rest) + (identifier? #'id) + (syntax/loc stx + (define-struct/derived orig id . rest))] + [(_ thing . _) + (raise-syntax-error #f + "expected an identifier for the structure type name" + #'thing + stx)])))) diff --git a/collects/scheme/private/stx.ss b/collects/racket/private/stx.rkt similarity index 100% rename from collects/scheme/private/stx.ss rename to collects/racket/private/stx.rkt diff --git a/collects/scheme/private/stxcase-scheme.ss b/collects/racket/private/stxcase-scheme.rkt similarity index 88% rename from collects/scheme/private/stxcase-scheme.ss rename to collects/racket/private/stxcase-scheme.rkt index be7fb0a3dc..585aa4adb5 100644 --- a/collects/scheme/private/stxcase-scheme.ss +++ b/collects/racket/private/stxcase-scheme.rkt @@ -4,9 +4,9 @@ ;; check-duplicate-identifier, and assembles everything we have so far (module stxcase-scheme '#%kernel - (#%require "small-scheme.ss" "stx.ss" "stxcase.ss" "with-stx.ss" "stxloc.ss" - (for-syntax '#%kernel "small-scheme.ss" "stx.ss" "stxcase.ss" "with-stx.ss" - "stxloc.ss")) + (#%require "small-scheme.rkt" "stx.rkt" "stxcase.rkt" "with-stx.rkt" "stxloc.rkt" + (for-syntax '#%kernel "small-scheme.rkt" "stx.rkt" "stxcase.rkt" "with-stx.rkt" + "stxloc.rkt")) (-define (check-duplicate-identifier names) (unless (and (list? names) (andmap identifier? names)) @@ -58,7 +58,7 @@ (pattern (syntax/loc x template)) ...)))))))) - (#%provide syntax (all-from "with-stx.ss") (all-from "stxloc.ss") + (#%provide syntax (all-from "with-stx.rkt") (all-from "stxloc.rkt") check-duplicate-identifier syntax-rules syntax-id-rules (for-syntax syntax-pattern-variable?))) diff --git a/collects/scheme/private/stxcase.ss b/collects/racket/private/stxcase.rkt similarity index 98% rename from collects/scheme/private/stxcase.ss rename to collects/racket/private/stxcase.rkt index 5ca9410a52..1f041ae45b 100644 --- a/collects/scheme/private/stxcase.ss +++ b/collects/racket/private/stxcase.rkt @@ -2,9 +2,9 @@ ;; syntax-case and syntax (module stxcase '#%kernel - (#%require "stx.ss" "small-scheme.ss" '#%paramz - "ellipses.ss" - (for-syntax "stx.ss" "small-scheme.ss" "sc.ss" '#%kernel)) + (#%require "stx.rkt" "small-scheme.rkt" '#%paramz + "ellipses.rkt" + (for-syntax "stx.rkt" "small-scheme.rkt" "sc.rkt" '#%kernel)) (-define (datum->syntax/shape orig datum) (if (syntax? datum) @@ -556,5 +556,5 @@ (cons (quote-syntax list*) r)])))))))))) x))) - (#%provide (all-from "ellipses.ss") syntax-case** syntax + (#%provide (all-from "ellipses.rkt") syntax-case** syntax (for-syntax syntax-pattern-variable?))) diff --git a/collects/scheme/private/stxloc.ss b/collects/racket/private/stxloc.rkt similarity index 94% rename from collects/scheme/private/stxloc.ss rename to collects/racket/private/stxloc.rkt index 0fbb69fa96..9a7f50ecc2 100644 --- a/collects/scheme/private/stxloc.ss +++ b/collects/racket/private/stxloc.rkt @@ -3,8 +3,8 @@ ;; syntax/loc (module stxloc '#%kernel - (#%require "qq-and-or.ss" "stxcase.ss" "define-et-al.ss" - (for-syntax '#%kernel "stxcase.ss" "sc.ss")) + (#%require "qq-and-or.rkt" "stxcase.rkt" "define-et-al.rkt" + (for-syntax '#%kernel "stxcase.rkt" "sc.rkt")) ;; Regular syntax-case (-define-syntax syntax-case* diff --git a/collects/scheme/private/stxmz-body.ss b/collects/racket/private/stxmz-body.rkt similarity index 91% rename from collects/scheme/private/stxmz-body.ss rename to collects/racket/private/stxmz-body.rkt index 8ae50ce800..20e198451e 100644 --- a/collects/scheme/private/stxmz-body.ss +++ b/collects/racket/private/stxmz-body.rkt @@ -2,8 +2,8 @@ ;; mzscheme's `#%module-begin' (module stxmz-body '#%kernel - (#%require "stxcase-scheme.ss" "define.ss" - (for-syntax '#%kernel "stx.ss")) + (#%require "stxcase-scheme.rkt" "define.rkt" + (for-syntax '#%kernel "stx.rkt")) ;; So that expansions print the way the MzScheme programmer expects: (#%require (rename '#%kernel #%plain-module-begin #%module-begin)) diff --git a/collects/scheme/private/stxparam.ss b/collects/racket/private/stxparam.rkt similarity index 82% rename from collects/scheme/private/stxparam.ss rename to collects/racket/private/stxparam.rkt index 0862f4fa49..9a8a372332 100644 --- a/collects/scheme/private/stxparam.ss +++ b/collects/racket/private/stxparam.rkt @@ -1,13 +1,13 @@ (module stxparam '#%kernel - (#%require "more-scheme.ss" - "letstx-scheme.ss" - "define.ss" + (#%require "more-scheme.rkt" + "letstx-scheme.rkt" + "define.rkt" (for-syntax '#%kernel - "../stxparam-exptime.ss" - "stx.ss" "stxcase-scheme.ss" - "small-scheme.ss" - "stxloc.ss" "stxparamkey.ss")) + "../stxparam-exptime.rkt" + "stx.rkt" "stxcase-scheme.rkt" + "small-scheme.rkt" + "stxloc.rkt" "stxparamkey.rkt")) (#%provide (for-syntax do-syntax-parameterize)) diff --git a/collects/scheme/private/stxparamkey.ss b/collects/racket/private/stxparamkey.rkt similarity index 93% rename from collects/scheme/private/stxparamkey.ss rename to collects/racket/private/stxparamkey.rkt index d7adbdee40..a73e33e8be 100644 --- a/collects/scheme/private/stxparamkey.ss +++ b/collects/racket/private/stxparamkey.rkt @@ -1,7 +1,7 @@ (module stxparamkey '#%kernel - (#%require "more-scheme.ss" "small-scheme.ss" "define.ss" - "stxcase.ss" "stxloc.ss" "with-stx.ss") + (#%require "more-scheme.rkt" "small-scheme.rkt" "define.rkt" + "stxcase.rkt" "stxloc.rkt" "with-stx.rkt") (-define-struct wrapped-renamer (renamer)) diff --git a/collects/scheme/private/with-stx.ss b/collects/racket/private/with-stx.rkt similarity index 92% rename from collects/scheme/private/with-stx.ss rename to collects/racket/private/with-stx.rkt index 71bc03b8eb..cb65708160 100644 --- a/collects/scheme/private/with-stx.ss +++ b/collects/racket/private/with-stx.rkt @@ -2,9 +2,9 @@ ;; with-syntax, generate-temporaries (module with-stx '#%kernel - (#%require "stx.ss" "stxloc.ss" "small-scheme.ss" "stxcase.ss" - (for-syntax '#%kernel "stx.ss" "stxcase.ss" "stxloc.ss" - "sc.ss" "qq-and-or.ss" "cond.ss")) + (#%require "stx.rkt" "stxloc.rkt" "small-scheme.rkt" "stxcase.rkt" + (for-syntax '#%kernel "stx.rkt" "stxcase.rkt" "stxloc.rkt" + "sc.rkt" "qq-and-or.rkt" "cond.rkt")) (-define (with-syntax-fail stx) (raise-syntax-error diff --git a/collects/scheme/promise.ss b/collects/racket/promise.rkt similarity index 98% rename from collects/scheme/promise.ss rename to collects/racket/promise.rkt index ab67dd1848..02fce13e0e 100644 --- a/collects/scheme/promise.ss +++ b/collects/racket/promise.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require "private/promise.ss" (for-syntax scheme/base)) +#lang racket/base +(require "private/promise.rkt" (for-syntax racket/base)) (provide delay lazy force promise? promise-forced? promise-running?) ;; ---------------------------------------------------------------------------- diff --git a/collects/scheme/provide-syntax.ss b/collects/racket/provide-syntax.rkt similarity index 100% rename from collects/scheme/provide-syntax.ss rename to collects/racket/provide-syntax.rkt diff --git a/collects/scheme/provide-transform.ss b/collects/racket/provide-transform.rkt similarity index 100% rename from collects/scheme/provide-transform.ss rename to collects/racket/provide-transform.rkt diff --git a/collects/scheme/provide.ss b/collects/racket/provide.rkt similarity index 100% rename from collects/scheme/provide.ss rename to collects/racket/provide.rkt diff --git a/collects/scheme/require-syntax.ss b/collects/racket/require-syntax.rkt similarity index 100% rename from collects/scheme/require-syntax.ss rename to collects/racket/require-syntax.rkt diff --git a/collects/scheme/require-transform.ss b/collects/racket/require-transform.rkt similarity index 100% rename from collects/scheme/require-transform.ss rename to collects/racket/require-transform.rkt diff --git a/collects/scheme/require.ss b/collects/racket/require.rkt similarity index 100% rename from collects/scheme/require.ss rename to collects/racket/require.rkt diff --git a/collects/scheme/runtime-path.ss b/collects/racket/runtime-path.rkt similarity index 100% rename from collects/scheme/runtime-path.ss rename to collects/racket/runtime-path.rkt diff --git a/collects/scheme/sandbox.ss b/collects/racket/sandbox.rkt similarity index 99% rename from collects/scheme/sandbox.ss rename to collects/racket/sandbox.rkt index 9c9547d201..65a6e17dc3 100644 --- a/collects/scheme/sandbox.ss +++ b/collects/racket/sandbox.rkt @@ -545,7 +545,7 @@ (define (evaluate-program program limit-thunk uncovered!) (when uncovered! (parameterize ([current-code-inspector orig-code-inspector]) - (eval `(,#'#%require scheme/private/sandbox-coverage)))) + (eval `(,#'#%require racket/private/sandbox-coverage)))) (let ([ns (syntax-case* program (module) literal-identifier=? [(module mod . body) (identifier? #'mod) diff --git a/collects/scheme/serialize.ss b/collects/racket/serialize.rkt similarity index 98% rename from collects/scheme/serialize.ss rename to collects/racket/serialize.rkt index b413ddefa7..4849b2beec 100644 --- a/collects/scheme/serialize.ss +++ b/collects/racket/serialize.rkt @@ -1,8 +1,8 @@ -(module serialize scheme/base +(module serialize racket/base (require "private/serialize.ss" - (for-syntax scheme/base - scheme/struct-info)) + (for-syntax racket/base + racket/struct-info)) (provide (all-from-out "private/serialize.ss") define-serializable-struct diff --git a/collects/scheme/set.ss b/collects/racket/set.rkt similarity index 100% rename from collects/scheme/set.ss rename to collects/racket/set.rkt diff --git a/collects/scheme/shared.ss b/collects/racket/shared.rkt similarity index 100% rename from collects/scheme/shared.ss rename to collects/racket/shared.rkt diff --git a/collects/scheme/splicing.ss b/collects/racket/splicing.rkt similarity index 100% rename from collects/scheme/splicing.ss rename to collects/racket/splicing.rkt diff --git a/collects/scheme/string.ss b/collects/racket/string.rkt similarity index 100% rename from collects/scheme/string.ss rename to collects/racket/string.rkt diff --git a/collects/scheme/struct-info.ss b/collects/racket/struct-info.rkt similarity index 100% rename from collects/scheme/struct-info.ss rename to collects/racket/struct-info.rkt diff --git a/collects/scheme/stxparam-exptime.ss b/collects/racket/stxparam-exptime.rkt similarity index 100% rename from collects/scheme/stxparam-exptime.ss rename to collects/racket/stxparam-exptime.rkt diff --git a/collects/scheme/stxparam.ss b/collects/racket/stxparam.rkt similarity index 68% rename from collects/scheme/stxparam.ss rename to collects/racket/stxparam.rkt index c9f38e3c9a..d29804154f 100644 --- a/collects/scheme/stxparam.ss +++ b/collects/racket/stxparam.rkt @@ -1,14 +1,14 @@ (module stxparam '#%kernel - (#%require "private/more-scheme.ss" - "private/letstx-scheme.ss" - "private/define.ss" - "private/stxparam.ss" + (#%require "private/more-scheme.rkt" + "private/letstx-scheme.rkt" + "private/define.rkt" + "private/stxparam.rkt" (for-syntax '#%kernel - "stxparam-exptime.ss" - "private/stx.ss" "private/stxcase-scheme.ss" - "private/small-scheme.ss" - "private/stxloc.ss" "private/stxparamkey.ss")) + "stxparam-exptime.rkt" + "private/stx.rkt" "private/stxcase-scheme.rkt" + "private/small-scheme.rkt" + "private/stxloc.rkt" "private/stxparamkey.rkt")) (#%provide define-syntax-parameter syntax-parameterize diff --git a/collects/scheme/surrogate.ss b/collects/racket/surrogate.rkt similarity index 100% rename from collects/scheme/surrogate.ss rename to collects/racket/surrogate.rkt diff --git a/collects/scheme/system.ss b/collects/racket/system.rkt similarity index 100% rename from collects/scheme/system.ss rename to collects/racket/system.rkt diff --git a/collects/scheme/tcp.ss b/collects/racket/tcp.rkt similarity index 100% rename from collects/scheme/tcp.ss rename to collects/racket/tcp.rkt diff --git a/collects/scheme/trace.ss b/collects/racket/trace.rkt similarity index 100% rename from collects/scheme/trace.ss rename to collects/racket/trace.rkt diff --git a/collects/scheme/trait.ss b/collects/racket/trait.rkt similarity index 100% rename from collects/scheme/trait.ss rename to collects/racket/trait.rkt diff --git a/collects/scheme/udp.ss b/collects/racket/udp.rkt similarity index 100% rename from collects/scheme/udp.ss rename to collects/racket/udp.rkt diff --git a/collects/scheme/unit-exptime.ss b/collects/racket/unit-exptime.rkt similarity index 100% rename from collects/scheme/unit-exptime.ss rename to collects/racket/unit-exptime.rkt diff --git a/collects/racket/unit.rkt b/collects/racket/unit.rkt new file mode 100644 index 0000000000..3b465e3037 --- /dev/null +++ b/collects/racket/unit.rkt @@ -0,0 +1,10 @@ + +(module unit racket/base + (require mzlib/unit + racket/contract/base + (for-syntax racket/base + syntax/struct)) + (provide (except-out (all-from-out mzlib/unit) + struct struct/ctc + struct~r struct~r/ctc + struct~s struct~s/ctc))) diff --git a/collects/scheme/foreign.ss b/collects/racket/unsafe/ffi.rkt similarity index 94% rename from collects/scheme/foreign.ss rename to collects/racket/unsafe/ffi.rkt index 3d7b5b2225..2ad92a982a 100644 --- a/collects/scheme/foreign.ss +++ b/collects/racket/unsafe/ffi.rkt @@ -1,78 +1,22 @@ -#lang scheme/base +#lang racket/base -;; Foreign Scheme interface -(require '#%foreign setup/dirs scheme/unsafe/ops - (for-syntax scheme/base scheme/list syntax/stx - scheme/struct-info)) +;; Foreign Racket interface +(require '#%foreign setup/dirs racket/unsafe/ops + (for-syntax racket/base racket/list syntax/stx + racket/struct-info)) -;; This module is full of unsafe bindings that are not provided to requiring -;; modules. Instead, an `unsafe!' binding is provided that makes these unsafe -;; bindings available. The following two syntaxes do that: `provide*' is like -;; `provide', but using `(unsafe id)' registers an unsafe binding. Then, -;; `define-unsafer' should be used with a binding that will expose the unsafe -;; bindings. This might move elsewhere at some point if it turns out to be -;; useful in other contexts. -(provide provide* define-unsafer) -(define-syntaxes (provide* define-unsafer) - (let ((unsafe-bindings '())) - (values - (lambda (stx) - (syntax-case stx () - [(_ p ...) - (let loop ([provides '()] - [unsafes '()] - [ps (syntax->list #'(p ...))]) - (if (null? ps) - (begin (set! unsafe-bindings - (append unsafe-bindings (reverse unsafes))) - (with-syntax ([(p ...) provides]) #'(provide p ...))) - (syntax-case (car ps) (unsafe) - [(unsafe u) - (syntax-case #'u (rename-out) - [(rename-out [from to]) - (loop provides (cons (cons #'from #'to) unsafes) (cdr ps))] - [id (identifier? #'id) - (loop provides (cons (cons #'id #'id) unsafes) (cdr ps))] - [_ - (raise-syntax-error 'provide* "bad unsafe usage" - (car ps) stx)])] - [_ (loop (cons (car ps) provides) unsafes (cdr ps))])))])) - (lambda (stx) - (syntax-case stx () - [(_ unsafe) - (with-syntax ([(from ...) (map car unsafe-bindings)] - [(to ...) (map cdr unsafe-bindings)] - [(id ...) (generate-temporaries unsafe-bindings)]) - (set! unsafe-bindings '()) - #'(begin - (provide (protect-out unsafe)) - (define-syntax (unsafe stx) - (syntax-case stx () - [(_) (with-syntax ([(id ...) (list (datum->syntax - stx 'to stx) - ...)]) - #'(begin (define-syntax id - (make-rename-transformer (syntax-property - (syntax-property - #'from - 'not-provide-all-defined - #t) - 'nominal-id - 'to))) - ...))]))))]))))) - -(provide* ctype-sizeof ctype-alignof compiler-sizeof - (unsafe malloc) (unsafe free) (unsafe end-stubborn-change) - cpointer? ptr-equal? ptr-add (unsafe ptr-ref) (unsafe ptr-set!) (unsafe cast) - ptr-offset ptr-add! offset-ptr? set-ptr-offset! - vector->cpointer flvector->cpointer saved-errno lookup-errno - ctype? make-ctype make-cstruct-type (unsafe make-sized-byte-string) ctype->layout - _void _int8 _uint8 _int16 _uint16 _int32 _uint32 _int64 _uint64 - _fixint _ufixint _fixnum _ufixnum - _float _double _double* - _bool _pointer _gcpointer _scheme _fpointer function-ptr - (unsafe memcpy) (unsafe memmove) (unsafe memset) - (unsafe malloc-immobile-cell) (unsafe free-immobile-cell)) +(provide ctype-sizeof ctype-alignof compiler-sizeof + malloc free end-stubborn-change + cpointer? ptr-equal? ptr-add ptr-ref ptr-set! (protect-out cast) + ptr-offset ptr-add! offset-ptr? set-ptr-offset! + vector->cpointer flvector->cpointer saved-errno lookup-errno + ctype? make-ctype make-cstruct-type make-sized-byte-string ctype->layout + _void _int8 _uint8 _int16 _uint16 _int32 _uint32 _int64 _uint64 + _fixint _ufixint _fixnum _ufixnum + _float _double _double* + _bool _pointer _gcpointer _scheme (rename-out [_scheme _racket]) _fpointer function-ptr + memcpy memmove memset + malloc-immobile-cell free-immobile-cell) (define-syntax define* (syntax-rules () @@ -145,8 +89,8 @@ (define lib-suffix-re (regexp (string-append "\\." lib-suffix "$"))) (define suffix-before-version? (not (equal? lib-suffix "dylib"))) -(provide* (unsafe (rename-out [get-ffi-lib ffi-lib])) - ffi-lib? ffi-lib-name) +(provide (protect-out (rename-out [get-ffi-lib ffi-lib])) + ffi-lib? ffi-lib-name) (define get-ffi-lib (case-lambda [(name) (get-ffi-lib name "")] @@ -214,7 +158,7 @@ (ptr-set! ffi-obj type new))) ;; This is better handled with `make-c-parameter' -(provide* (unsafe ffi-obj-ref)) +(provide (protect-out ffi-obj-ref)) (define ffi-obj-ref (case-lambda [(name lib) (ffi-obj-ref name lib #f)] @@ -228,7 +172,7 @@ ;; get-ffi-obj is implemented as a syntax only to be able to propagate the ;; foreign name into the type syntax, which allows generated wrappers to have a ;; proper name. -(provide* (unsafe get-ffi-obj)) +(provide (protect-out get-ffi-obj)) (define get-ffi-obj* (case-lambda [(name lib type) (get-ffi-obj* name lib type #f)] @@ -254,7 +198,7 @@ ;; It is important to use the set-ffi-obj! wrapper because it takes care of ;; keeping a handle on the object -- otherwise, setting a callback hook will ;; crash when the Scheme function is gone. -(provide* (unsafe set-ffi-obj!)) +(provide (protect-out set-ffi-obj!)) (define (set-ffi-obj! name lib type new) (ffi-set! (ffi-obj (get-ffi-obj-name 'set-ffi-obj! name) (get-ffi-lib-internal lib)) @@ -262,7 +206,7 @@ ;; Combining the above two in a `define-c' special form which makes a Scheme ;; `binding', first a `parameter'-like constructor: -(provide* (unsafe make-c-parameter)) +(provide (protect-out make-c-parameter)) (define (make-c-parameter name lib type) (let ([obj (ffi-obj (get-ffi-obj-name 'make-c-parameter name) (get-ffi-lib-internal lib))]) @@ -270,7 +214,7 @@ [(new) (ffi-set! obj type new)]))) ;; Then the fake binding syntax, uses the defined identifier to name the ;; object: -(provide* (unsafe define-c)) +(provide (protect-out define-c)) (define-syntax (define-c stx) (syntax-case stx () [(_ var-name lib-name type-expr) @@ -1035,9 +979,9 @@ (define-struct cvector (ptr type length)) -(provide* cvector? cvector-length cvector-type cvector-ptr - ;; make-cvector* is a dangerous operation - (unsafe (rename-out [make-cvector make-cvector*]))) +(provide cvector? cvector-length cvector-type cvector-ptr + ;; make-cvector* is a dangerous operation + (protect-out (rename-out [make-cvector make-cvector*]))) (define _cvector* ; used only as input types (make-ctype _pointer cvector-ptr @@ -1230,8 +1174,8 @@ ;; Make these operations available for unsafe interfaces (they can be used to ;; grab a hidden tag value and break code). -(provide* (unsafe cpointer-tag) (unsafe set-cpointer-tag!) - (unsafe cpointer-has-tag?) (unsafe cpointer-push-tag!)) +(provide cpointer-tag set-cpointer-tag! + cpointer-has-tag? cpointer-push-tag!) ;; Defined as syntax for efficiency, but can be used as procedures too. (define-syntax (cpointer-has-tag? stx) @@ -1661,7 +1605,7 @@ (ptr-set! cblock type i (car l)) (loop (cdr l) (add1 i)))) cblock))) -(provide* (unsafe cblock->list)) +(provide (protect-out cblock->list)) (define (cblock->list cblock type len) (cond [(zero? len) '()] [(cpointer? cblock) @@ -1683,7 +1627,7 @@ (ptr-set! cblock type i (vector-ref v i)) (loop (add1 i)))) cblock)))) -(provide* (unsafe cblock->vector)) +(provide (protect-out cblock->vector)) (define (cblock->vector cblock type len) (cond [(zero? len) '#()] [(cpointer? cblock) @@ -1725,4 +1669,3 @@ (let loop () (will-execute killer-executor) (loop)))))))) (will-register killer-executor obj finalizer)) -(define-unsafer unsafe!) diff --git a/collects/scheme/unsafe/ops.ss b/collects/racket/unsafe/ops.ss similarity index 100% rename from collects/scheme/unsafe/ops.ss rename to collects/racket/unsafe/ops.ss diff --git a/collects/scheme/vector.ss b/collects/racket/vector.rkt similarity index 99% rename from collects/scheme/vector.ss rename to collects/racket/vector.rkt index 32582f6e00..b1bf40ceb2 100644 --- a/collects/scheme/vector.ss +++ b/collects/racket/vector.rkt @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base (provide vector-copy vector-map vector-map! vector-append vector-take vector-drop vector-split-at vector-take-right vector-drop-right vector-split-at-right vector-filter vector-filter-not vector-count vector-argmin vector-argmax) -(require scheme/unsafe/ops) +(require racket/unsafe/ops) ;; unchecked version of `vector-copy' ;; used at the implementation of many functions in this file @@ -188,7 +188,7 @@ (loop (+ start len) (cdr lens) (cdr vs))))) new-v)) -;; copied from `scheme/list' +;; copied from `racket/list' (define (mk-min cmp name f xs) (unless (and (procedure? f) (procedure-arity-includes? f 1)) diff --git a/collects/scheme/async-channel.rkt b/collects/scheme/async-channel.rkt new file mode 100644 index 0000000000..94fb12ee2a --- /dev/null +++ b/collects/scheme/async-channel.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/async-channel diff --git a/collects/scheme/base.rkt b/collects/scheme/base.rkt new file mode 100644 index 0000000000..4df2ad6ca4 --- /dev/null +++ b/collects/scheme/base.rkt @@ -0,0 +1,3 @@ + +(module base racket/base + (provide (except-out (all-from-out racket/base) struct))) diff --git a/collects/scheme/bool.rkt b/collects/scheme/bool.rkt new file mode 100644 index 0000000000..1443e287b0 --- /dev/null +++ b/collects/scheme/bool.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/bool diff --git a/collects/scheme/class.rkt b/collects/scheme/class.rkt new file mode 100644 index 0000000000..cb278f3b9b --- /dev/null +++ b/collects/scheme/class.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/class diff --git a/collects/scheme/class.ss b/collects/scheme/class.ss deleted file mode 100644 index 55108bbef7..0000000000 --- a/collects/scheme/class.ss +++ /dev/null @@ -1,11 +0,0 @@ -#lang scheme/base - -(require "contract/private/object.ss") -(provide (all-from-out "contract/private/object.ss")) - -;; All of the implementation is actually in private/class-internal.ss, -;; which provides extra (private) functionality to contract.ss. -(require "private/class-internal.ss") - -(provide-public-names) -(provide generic?) diff --git a/collects/scheme/cmdline.rkt b/collects/scheme/cmdline.rkt new file mode 100644 index 0000000000..ce043b9725 --- /dev/null +++ b/collects/scheme/cmdline.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/cmdline diff --git a/collects/scheme/contract.rkt b/collects/scheme/contract.rkt new file mode 100644 index 0000000000..6ea58bc826 --- /dev/null +++ b/collects/scheme/contract.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/contract diff --git a/collects/scheme/control.rkt b/collects/scheme/control.rkt new file mode 100644 index 0000000000..dbdb25f214 --- /dev/null +++ b/collects/scheme/control.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/control diff --git a/collects/scheme/date.rkt b/collects/scheme/date.rkt new file mode 100644 index 0000000000..6bbfcfab83 --- /dev/null +++ b/collects/scheme/date.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/date diff --git a/collects/scheme/dict.rkt b/collects/scheme/dict.rkt new file mode 100644 index 0000000000..bb4e0490e8 --- /dev/null +++ b/collects/scheme/dict.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/dict diff --git a/collects/scheme/enter.rkt b/collects/scheme/enter.rkt new file mode 100644 index 0000000000..68820e4926 --- /dev/null +++ b/collects/scheme/enter.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/enter diff --git a/collects/scheme/exists/lang.ss b/collects/scheme/exists/lang.ss index 9c19ea2c13..e750a8d967 100644 --- a/collects/scheme/exists/lang.ss +++ b/collects/scheme/exists/lang.ss @@ -1,6 +1,6 @@ #lang scheme -(require scheme/contract/exists) +(require racket/contract/exists) ;; this code builds the list of predicates (in case it changes, this may need to be re-run) #; diff --git a/collects/scheme/fasl.rkt b/collects/scheme/fasl.rkt new file mode 100644 index 0000000000..6a982c9584 --- /dev/null +++ b/collects/scheme/fasl.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/fasl diff --git a/collects/scheme/file.rkt b/collects/scheme/file.rkt new file mode 100644 index 0000000000..aaf46487b5 --- /dev/null +++ b/collects/scheme/file.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/file diff --git a/collects/scheme/fixnum.rkt b/collects/scheme/fixnum.rkt new file mode 100644 index 0000000000..58a261c594 --- /dev/null +++ b/collects/scheme/fixnum.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/fixnum diff --git a/collects/scheme/flonum.rkt b/collects/scheme/flonum.rkt new file mode 100644 index 0000000000..96aca4f52e --- /dev/null +++ b/collects/scheme/flonum.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/flonum diff --git a/collects/scheme/foreign.rkt b/collects/scheme/foreign.rkt new file mode 100644 index 0000000000..a3e1b5bd78 --- /dev/null +++ b/collects/scheme/foreign.rkt @@ -0,0 +1,91 @@ +#lang racket/base +(require (for-syntax scheme/base)) + +(define-syntax-rule (provide-except-unsafe lib u! id ...) + (begin + (require lib) + (provide (except-out (all-from-out lib) id ...)) + (define-syntax (u! stx) + (syntax-case stx () + [(_) (with-syntax ([lib+ids (datum->syntax stx '(lib id ...))]) + #'(require (only-in . lib+ids)))])))) + +(provide-except-unsafe racket/unsafe/ffi unsafe! + + free end-stubborn-change + ptr-ref ptr-set! cast + make-sized-byte-string + memcpy memmove memset + malloc-immobile-cell free-immobile-cell + malloc + ffi-lib + ffi-obj-ref + get-ffi-obj + set-ffi-obj! + make-c-parameter + define-c + define-fun-syntax + make-cvector* + cpointer-tag set-cpointer-tag! + cpointer-has-tag? cpointer-push-tag! + cblock->list + cblock->vector) + +(provide provide* define-unsafer + unsafe!) + +;; This module is full of unsafe bindings that are not provided to requiring +;; modules. Instead, an `unsafe!' binding is provided that makes these unsafe +;; bindings available. The following two syntaxes do that: `provide*' is like +;; `provide', but using `(unsafe id)' registers an unsafe binding. Then, +;; `define-unsafer' should be used with a binding that will expose the unsafe +;; bindings. This might move elsewhere at some point if it turns out to be +;; useful in other contexts. +(provide provide* define-unsafer) +(define-syntaxes (provide* define-unsafer) + (let ((unsafe-bindings '())) + (values + (lambda (stx) + (syntax-case stx () + [(_ p ...) + (let loop ([provides '()] + [unsafes '()] + [ps (syntax->list #'(p ...))]) + (if (null? ps) + (begin (set! unsafe-bindings + (append unsafe-bindings (reverse unsafes))) + (with-syntax ([(p ...) provides]) #'(provide p ...))) + (syntax-case (car ps) (unsafe) + [(unsafe u) + (syntax-case #'u (rename-out) + [(rename-out [from to]) + (loop provides (cons (cons #'from #'to) unsafes) (cdr ps))] + [id (identifier? #'id) + (loop provides (cons (cons #'id #'id) unsafes) (cdr ps))] + [_ + (raise-syntax-error 'provide* "bad unsafe usage" + (car ps) stx)])] + [_ (loop (cons (car ps) provides) unsafes (cdr ps))])))])) + (lambda (stx) + (syntax-case stx () + [(_ unsafe) + (with-syntax ([(from ...) (map car unsafe-bindings)] + [(to ...) (map cdr unsafe-bindings)] + [(id ...) (generate-temporaries unsafe-bindings)]) + (set! unsafe-bindings '()) + #'(begin + (provide (protect-out unsafe)) + (define-syntax (unsafe stx) + (syntax-case stx () + [(_) (with-syntax ([(id ...) (list (datum->syntax + stx 'to stx) + ...)]) + #'(begin (define-syntax id + (make-rename-transformer (syntax-property + (syntax-property + #'from + 'not-provide-all-defined + #t) + 'nominal-id + 'to))) + ...))]))))]))))) diff --git a/collects/scheme/function.rkt b/collects/scheme/function.rkt new file mode 100644 index 0000000000..65826b61b8 --- /dev/null +++ b/collects/scheme/function.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/function diff --git a/collects/scheme/future.rkt b/collects/scheme/future.rkt new file mode 100644 index 0000000000..7ff7325e5f --- /dev/null +++ b/collects/scheme/future.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/future diff --git a/collects/scheme/future.ss b/collects/scheme/future.ss deleted file mode 100644 index 56c24aefd8..0000000000 --- a/collects/scheme/future.ss +++ /dev/null @@ -1,3 +0,0 @@ -#lang scheme -(require "future/main.ss") -(provide (all-from-out "future/main.ss")) diff --git a/collects/scheme/generator.rkt b/collects/scheme/generator.rkt new file mode 100644 index 0000000000..2e2faee090 --- /dev/null +++ b/collects/scheme/generator.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/generator diff --git a/collects/scheme/gui.ss b/collects/scheme/gui.rkt similarity index 100% rename from collects/scheme/gui.ss rename to collects/scheme/gui.rkt diff --git a/collects/scheme/gui/base.rkt b/collects/scheme/gui/base.rkt new file mode 100644 index 0000000000..25deaa3701 --- /dev/null +++ b/collects/scheme/gui/base.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/gui/base diff --git a/collects/scheme/gui/dynamic.rkt b/collects/scheme/gui/dynamic.rkt new file mode 100644 index 0000000000..1451364144 --- /dev/null +++ b/collects/scheme/gui/dynamic.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/gui/dynamic diff --git a/collects/scheme/gui/init.rkt b/collects/scheme/gui/init.rkt new file mode 100644 index 0000000000..c56704037d --- /dev/null +++ b/collects/scheme/gui/init.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/gui/init diff --git a/collects/scheme/help.rkt b/collects/scheme/help.rkt new file mode 100644 index 0000000000..b4e17a4a76 --- /dev/null +++ b/collects/scheme/help.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/help diff --git a/collects/scheme/include.rkt b/collects/scheme/include.rkt new file mode 100644 index 0000000000..154d7ddb4f --- /dev/null +++ b/collects/scheme/include.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/include diff --git a/collects/scheme/init.ss b/collects/scheme/init.rkt similarity index 100% rename from collects/scheme/init.ss rename to collects/scheme/init.rkt diff --git a/collects/scheme/list.rkt b/collects/scheme/list.rkt new file mode 100644 index 0000000000..0b334aa833 --- /dev/null +++ b/collects/scheme/list.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/list diff --git a/collects/scheme/load.rkt b/collects/scheme/load.rkt new file mode 100644 index 0000000000..c3a870df30 --- /dev/null +++ b/collects/scheme/load.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/load diff --git a/collects/scheme/local.rkt b/collects/scheme/local.rkt new file mode 100644 index 0000000000..1078d68b54 --- /dev/null +++ b/collects/scheme/local.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/local diff --git a/collects/scheme/main.ss b/collects/scheme/main.rkt similarity index 100% rename from collects/scheme/main.ss rename to collects/scheme/main.rkt diff --git a/collects/scheme/match.rkt b/collects/scheme/match.rkt new file mode 100644 index 0000000000..164a3349e5 --- /dev/null +++ b/collects/scheme/match.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/match diff --git a/collects/scheme/math.rkt b/collects/scheme/math.rkt new file mode 100644 index 0000000000..a7802130d5 --- /dev/null +++ b/collects/scheme/math.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/math diff --git a/collects/scheme/mpair.rkt b/collects/scheme/mpair.rkt new file mode 100644 index 0000000000..fd74621737 --- /dev/null +++ b/collects/scheme/mpair.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/mpair diff --git a/collects/scheme/mzscheme.ss b/collects/scheme/mzscheme.rkt similarity index 76% rename from collects/scheme/mzscheme.ss rename to collects/scheme/mzscheme.rkt index fff161e0c4..43e5bc9f4a 100644 --- a/collects/scheme/mzscheme.ss +++ b/collects/scheme/mzscheme.rkt @@ -2,43 +2,43 @@ ;; mzscheme: provide everything (module mzscheme '#%kernel - (#%require "private/more-scheme.ss" - "private/misc.ss" - "private/letstx-scheme.ss" - "private/stxcase-scheme.ss" - "private/stx.ss" - "private/stxmz-body.ss" - "private/qqstx.ss" - "private/define.ss" - "private/old-ds.ss" - "private/old-rp.ss" - "private/old-if.ss" - "private/old-procs.ss" - "private/map.ss" ; shadows #%kernel bindings - "private/kernstruct.ss" - "private/promise.ss" - (only "private/cond.ss" old-cond) - "tcp.ss" - "udp.ss" + (#%require racket/private/more-scheme + racket/private/misc + racket/private/letstx-scheme + racket/private/stxcase-scheme + racket/private/stx + racket/private/stxmz-body + racket/private/qqstx + racket/private/define + racket/private/old-ds + racket/private/old-rp + racket/private/old-if + racket/private/old-procs + racket/private/map ; shadows #%kernel bindings + racket/private/kernstruct + racket/private/promise + (only racket/private/cond old-cond) + racket/tcp + racket/udp '#%builtin) ; so it's attached (#%provide require require-for-syntax require-for-template require-for-label provide provide-for-syntax provide-for-label - (all-from-except "private/more-scheme.ss" case old-case + (all-from-except racket/private/more-scheme case old-case log-fatal log-error log-warning log-info log-debug hash-update hash-update!) (rename old-case case) - (all-from "private/misc.ss") - (all-from-except "private/stxcase-scheme.ss" _) - (all-from-except "private/letstx-scheme.ss" + (all-from racket/private/misc) + (all-from-except racket/private/stxcase-scheme _) + (all-from-except racket/private/letstx-scheme -define -define-syntax -define-struct cond old-cond else =>) (rename old-cond cond) define-struct let-struct - identifier? ;; from "private/stx.ss" - (all-from "private/qqstx.ss") - (all-from "private/define.ss") - (all-from "private/kernstruct.ss") + identifier? ;; from racket/private/stx + (all-from racket/private/qqstx) + (all-from racket/private/define) + (all-from racket/private/kernstruct) force delay promise? (all-from-except '#%kernel #%module-begin #%datum if make-empty-namespace @@ -95,5 +95,5 @@ (rename #%module-begin #%plain-module-begin) (rename lambda #%plain-lambda) (rename #%app #%plain-app) - (all-from "tcp.ss") - (all-from "udp.ss"))) + (all-from racket/tcp) + (all-from racket/udp))) diff --git a/collects/scheme/nest.rkt b/collects/scheme/nest.rkt new file mode 100644 index 0000000000..6a8caf2fe8 --- /dev/null +++ b/collects/scheme/nest.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/nest diff --git a/collects/scheme/package.rkt b/collects/scheme/package.rkt new file mode 100644 index 0000000000..332c173eda --- /dev/null +++ b/collects/scheme/package.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/package diff --git a/collects/scheme/path.rkt b/collects/scheme/path.rkt new file mode 100644 index 0000000000..6e4662f94c --- /dev/null +++ b/collects/scheme/path.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/path diff --git a/collects/scheme/place.rkt b/collects/scheme/place.rkt new file mode 100644 index 0000000000..4b8b03a5dd --- /dev/null +++ b/collects/scheme/place.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/place diff --git a/collects/scheme/port.rkt b/collects/scheme/port.rkt new file mode 100644 index 0000000000..4291124e20 --- /dev/null +++ b/collects/scheme/port.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/port diff --git a/collects/scheme/pretty.rkt b/collects/scheme/pretty.rkt new file mode 100644 index 0000000000..43ca9c3233 --- /dev/null +++ b/collects/scheme/pretty.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/pretty diff --git a/collects/scheme/private/provider/lang.ss b/collects/scheme/private/provider/lang.ss new file mode 100644 index 0000000000..509fdee928 --- /dev/null +++ b/collects/scheme/private/provider/lang.ss @@ -0,0 +1,7 @@ +#lang racket/base +(provide (rename-out [module-begin #%module-begin])) + +(define-syntax-rule (module-begin mod) + (#%plain-module-begin + (require mod) + (provide (all-from-out mod)))) diff --git a/collects/scheme/private/provider/lang/reader.ss b/collects/scheme/private/provider/lang/reader.ss new file mode 100644 index 0000000000..d6be5751f2 --- /dev/null +++ b/collects/scheme/private/provider/lang/reader.ss @@ -0,0 +1,2 @@ +#lang s-exp syntax/module-reader +scheme/private/provider/lang diff --git a/collects/scheme/private/small-scheme.ss b/collects/scheme/private/small-scheme.ss deleted file mode 100644 index bf4c79f506..0000000000 --- a/collects/scheme/private/small-scheme.ss +++ /dev/null @@ -1,11 +0,0 @@ - -;;---------------------------------------------------------------------- -;; assembles all basic forms we have so far - -(module small-scheme '#%kernel - (#%require "stx.ss" "qq-and-or.ss" "cond.ss" "define-et-al.ss") - - (#%provide (all-from "qq-and-or.ss") - (all-from "cond.ss") - (all-from "define-et-al.ss"))) - diff --git a/collects/scheme/promise.rkt b/collects/scheme/promise.rkt new file mode 100644 index 0000000000..7a87b7a2a6 --- /dev/null +++ b/collects/scheme/promise.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/promise diff --git a/collects/scheme/provide-syntax.rkt b/collects/scheme/provide-syntax.rkt new file mode 100644 index 0000000000..da9b1342ce --- /dev/null +++ b/collects/scheme/provide-syntax.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/provide-syntax diff --git a/collects/scheme/provide-transform.rkt b/collects/scheme/provide-transform.rkt new file mode 100644 index 0000000000..76d501d927 --- /dev/null +++ b/collects/scheme/provide-transform.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/provide-transform diff --git a/collects/scheme/provide.rkt b/collects/scheme/provide.rkt new file mode 100644 index 0000000000..3e29329b94 --- /dev/null +++ b/collects/scheme/provide.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/provide diff --git a/collects/scheme/require-syntax.rkt b/collects/scheme/require-syntax.rkt new file mode 100644 index 0000000000..2753a72a67 --- /dev/null +++ b/collects/scheme/require-syntax.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/require-syntax diff --git a/collects/scheme/require-transform.rkt b/collects/scheme/require-transform.rkt new file mode 100644 index 0000000000..c172cbb51e --- /dev/null +++ b/collects/scheme/require-transform.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/require-transform diff --git a/collects/scheme/require.rkt b/collects/scheme/require.rkt new file mode 100644 index 0000000000..9b258ef21e --- /dev/null +++ b/collects/scheme/require.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/require diff --git a/collects/scheme/runtime-path.rkt b/collects/scheme/runtime-path.rkt new file mode 100644 index 0000000000..1f37b548fa --- /dev/null +++ b/collects/scheme/runtime-path.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/runtime-path diff --git a/collects/scheme/sandbox.rkt b/collects/scheme/sandbox.rkt new file mode 100644 index 0000000000..dead2ecec8 --- /dev/null +++ b/collects/scheme/sandbox.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/sandbox diff --git a/collects/scheme/serialize.rkt b/collects/scheme/serialize.rkt new file mode 100644 index 0000000000..5c356f9d58 --- /dev/null +++ b/collects/scheme/serialize.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/serialize diff --git a/collects/scheme/set.rkt b/collects/scheme/set.rkt new file mode 100644 index 0000000000..eca23dab4b --- /dev/null +++ b/collects/scheme/set.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/set diff --git a/collects/scheme/shared.rkt b/collects/scheme/shared.rkt new file mode 100644 index 0000000000..9a254e619c --- /dev/null +++ b/collects/scheme/shared.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/shared diff --git a/collects/scheme/splicing.rkt b/collects/scheme/splicing.rkt new file mode 100644 index 0000000000..69baca6211 --- /dev/null +++ b/collects/scheme/splicing.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/splicing diff --git a/collects/scheme/string.rkt b/collects/scheme/string.rkt new file mode 100644 index 0000000000..d8bce3d1cc --- /dev/null +++ b/collects/scheme/string.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/string diff --git a/collects/scheme/struct-info.rkt b/collects/scheme/struct-info.rkt new file mode 100644 index 0000000000..c6400e0862 --- /dev/null +++ b/collects/scheme/struct-info.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/struct-info diff --git a/collects/scheme/stxparam-exptime.rkt b/collects/scheme/stxparam-exptime.rkt new file mode 100644 index 0000000000..bed9d51c53 --- /dev/null +++ b/collects/scheme/stxparam-exptime.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/stxparam-exptime diff --git a/collects/scheme/stxparam.rkt b/collects/scheme/stxparam.rkt new file mode 100644 index 0000000000..922695ec8b --- /dev/null +++ b/collects/scheme/stxparam.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/stxparam diff --git a/collects/scheme/surrogate.rkt b/collects/scheme/surrogate.rkt new file mode 100644 index 0000000000..7f79d42c88 --- /dev/null +++ b/collects/scheme/surrogate.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/surrogate diff --git a/collects/scheme/system.rkt b/collects/scheme/system.rkt new file mode 100644 index 0000000000..00eb4e8d5b --- /dev/null +++ b/collects/scheme/system.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/system diff --git a/collects/scheme/tcp.rkt b/collects/scheme/tcp.rkt new file mode 100644 index 0000000000..9a864b8be3 --- /dev/null +++ b/collects/scheme/tcp.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/tcp diff --git a/collects/scheme/trace.rkt b/collects/scheme/trace.rkt new file mode 100644 index 0000000000..35b5e34657 --- /dev/null +++ b/collects/scheme/trace.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/trace diff --git a/collects/scheme/trait.rkt b/collects/scheme/trait.rkt new file mode 100644 index 0000000000..f182a19659 --- /dev/null +++ b/collects/scheme/trait.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/trait diff --git a/collects/scheme/udp.rkt b/collects/scheme/udp.rkt new file mode 100644 index 0000000000..499aa40b21 --- /dev/null +++ b/collects/scheme/udp.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/udp diff --git a/collects/scheme/unit-exptime.rkt b/collects/scheme/unit-exptime.rkt new file mode 100644 index 0000000000..40c3a1ff7c --- /dev/null +++ b/collects/scheme/unit-exptime.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/unit-exptime diff --git a/collects/scheme/unit.ss b/collects/scheme/unit.rkt similarity index 68% rename from collects/scheme/unit.ss rename to collects/scheme/unit.rkt index 342b5812c7..a32063b198 100644 --- a/collects/scheme/unit.ss +++ b/collects/scheme/unit.rkt @@ -1,11 +1,12 @@ -(module unit scheme/base +(module unit racket/base (require mzlib/unit - scheme/contract/base - (for-syntax scheme/base + racket/contract/base + (for-syntax racket/base syntax/struct)) (provide (except-out (all-from-out mzlib/unit) struct struct/ctc + struct~s struct~s/ctc struct~r struct~r/ctc) (rename-out [struct~s struct] [struct~s/ctc struct/ctc]))) diff --git a/collects/scheme/unsafe/ops.rkt b/collects/scheme/unsafe/ops.rkt new file mode 100644 index 0000000000..33af963a7f --- /dev/null +++ b/collects/scheme/unsafe/ops.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/unsafe/ops diff --git a/collects/scheme/vector.rkt b/collects/scheme/vector.rkt new file mode 100644 index 0000000000..4cbf935a38 --- /dev/null +++ b/collects/scheme/vector.rkt @@ -0,0 +1,2 @@ +#lang scheme/private/provider +racket/vector diff --git a/collects/scribblings/foreign/foreign.scrbl b/collects/scribblings/foreign/foreign.scrbl index bdc92ff4d8..52b73ab995 100644 --- a/collects/scribblings/foreign/foreign.scrbl +++ b/collects/scribblings/foreign/foreign.scrbl @@ -5,7 +5,8 @@ @author["Eli Barzilay"] -@defmodule[scheme/foreign #:use-sources ('#%foreign)] +@defmodule[scheme/foreign #:use-sources ('#%foreign + racket/unsafe/ffi)] The @schememodname[scheme/foreign] library enables the direct use of C-based APIs within Scheme programs---without writing any new C diff --git a/collects/scribblings/reference/class.scrbl b/collects/scribblings/reference/class.scrbl index 0ddebd3cad..0fa70a1852 100644 --- a/collects/scribblings/reference/class.scrbl +++ b/collects/scribblings/reference/class.scrbl @@ -77,7 +77,7 @@ @guideintro["classes"]{classes and objects} -@note-lib[scheme/class #:use-sources (scheme/private/class-internal)] +@note-lib[scheme/class #:use-sources (racket/private/class-internal)] A @deftech{class} specifies diff --git a/collects/scribblings/reference/contracts.scrbl b/collects/scribblings/reference/contracts.scrbl index 01ef221321..343bd3bdf5 100644 --- a/collects/scribblings/reference/contracts.scrbl +++ b/collects/scribblings/reference/contracts.scrbl @@ -17,11 +17,11 @@ another. Programmers specify the behavior of a module exports via @scheme[provide/contract] and the contract system enforces those constraints. -@note-lib[scheme/contract #:use-sources (scheme/contract/private/ds - scheme/contract/private/base - scheme/contract/private/guts - scheme/contract/private/misc - scheme/contract/private/provide)] +@note-lib[scheme/contract #:use-sources (racket/contract/private/ds + racket/contract/private/base + racket/contract/private/guts + racket/contract/private/misc + racket/contract/private/provide)] @deftech{Contracts} come in two forms: those constructed by the various operations listed in this section of the manual, and various diff --git a/collects/scribblings/reference/reference.scrbl b/collects/scribblings/reference/reference.scrbl index 85c2385518..8413d4971a 100644 --- a/collects/scribblings/reference/reference.scrbl +++ b/collects/scribblings/reference/reference.scrbl @@ -37,14 +37,14 @@ language. @defmodulelang*[(scheme/base scheme) ;; Use sources for overlap with `mzscheme': #:use-sources ('#%kernel - scheme/private/more-scheme - scheme/private/misc - scheme/private/qqstx - scheme/private/stxcase-scheme - scheme/private/letstx-scheme - scheme/private/define - scheme/private/stx - scheme/private/map)]{ + racket/private/more-scheme + racket/private/misc + racket/private/qqstx + racket/private/stxcase-scheme + racket/private/letstx-scheme + racket/private/define + racket/private/stx + racket/private/map)]{ Unless otherwise noted, the bindings defined in this manual are exported by the @schememodname[scheme/base] and @schememodname[scheme] diff --git a/collects/scribblings/reference/serialization.scrbl b/collects/scribblings/reference/serialization.scrbl index 7d71d274e1..1361df1d72 100644 --- a/collects/scribblings/reference/serialization.scrbl +++ b/collects/scribblings/reference/serialization.scrbl @@ -8,7 +8,7 @@ @title[#:tag "serialization"]{Serialization} -@note-lib-only[scheme/serialize #:use-sources (scheme/private/serialize)] +@note-lib-only[scheme/serialize #:use-sources (racket/private/serialize)] @defproc[(serializable? [v any/c]) boolean?]{ diff --git a/collects/setup/configtab.ss b/collects/setup/configtab.ss index 27d49d03d5..e60c9162dd 100644 --- a/collects/setup/configtab.ss +++ b/collects/setup/configtab.ss @@ -1,8 +1,8 @@ -#lang scheme/base +#lang racket/base ;; Defines a language to be used by the "config.ss" file -(require scheme/promise - (for-syntax scheme/base)) +(require racket/promise + (for-syntax racket/base)) (provide (rename-out [config-module-begin #%module-begin]) define diff --git a/collects/setup/dirs.ss b/collects/setup/dirs.ss index 12c6bee788..050ecf143e 100644 --- a/collects/setup/dirs.ss +++ b/collects/setup/dirs.ss @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require scheme/promise +(require racket/promise (prefix-in config: config) compiler/private/winutf16 compiler/private/mach-o @@ -184,7 +184,7 @@ (cond [(not rel) #f] ; no framework reference found!? [(regexp-match - #rx#"^(@executable_path/)?(.*?)PLT_M(?:rEd|zScheme).framework" + #rx#"^(@executable_path/)?(.*?)G?Racket.framework" rel) => (lambda (m) (let ([b (caddr m)]) diff --git a/collects/setup/main-collects.ss b/collects/setup/main-collects.ss index b37c0f0d1d..83edc40546 100644 --- a/collects/setup/main-collects.ss +++ b/collects/setup/main-collects.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "dirs.ss" "path-relativize.ss") (provide path->main-collects-relative diff --git a/collects/setup/path-relativize.ss b/collects/setup/path-relativize.ss index d611591e9d..e7364a3541 100644 --- a/collects/setup/path-relativize.ss +++ b/collects/setup/path-relativize.ss @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/promise) +#lang racket/base +(require racket/promise) (provide make-relativize) diff --git a/collects/syntax/define.ss b/collects/syntax/define.ss index 9e56cd349f..844d376b79 100644 --- a/collects/syntax/define.ss +++ b/collects/syntax/define.ss @@ -1,5 +1,5 @@ (module define scheme/base - (require scheme/private/norm-define) + (require racket/private/norm-define) (provide normalize-definition)) diff --git a/collects/syntax/id-table.ss b/collects/syntax/id-table.ss index 0e1f89972e..95ac8b05ed 100644 --- a/collects/syntax/id-table.ss +++ b/collects/syntax/id-table.ss @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (require (for-syntax scheme/base) - scheme/contract/base - scheme/dict + racket/contract/base + racket/dict "private/id-table.ss") #| (provide id-table-position?) diff --git a/collects/syntax/kerncase.ss b/collects/syntax/kerncase.ss index 612c595e62..f03b3b1b8c 100644 --- a/collects/syntax/kerncase.ss +++ b/collects/syntax/kerncase.ss @@ -1,7 +1,7 @@ -(module kerncase scheme/base - (require (for-syntax scheme/base) - (for-template scheme/base)) +(module kerncase racket/base + (require (for-syntax racket/base) + (for-template racket/base)) (define-syntax kernel-syntax-case-internal (lambda (stx) diff --git a/collects/syntax/keyword.ss b/collects/syntax/keyword.ss index f3dfcffbf3..15c8334ea5 100644 --- a/collects/syntax/keyword.ss +++ b/collects/syntax/keyword.ss @@ -1,6 +1,6 @@ -#lang scheme/base -(require scheme/contract/base - scheme/dict +#lang racket/base +(require racket/contract/base + racket/dict "private/keyword.ss") (define optstx (or/c syntax? false/c)) diff --git a/collects/syntax/modcollapse.ss b/collects/syntax/modcollapse.ss index 9a94d274cd..dfab94b126 100644 --- a/collects/syntax/modcollapse.ss +++ b/collects/syntax/modcollapse.ss @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require scheme/contract/base +(require racket/contract/base "private/modcollapse-noctc.ss") (define simple-rel-to-module-path-v/c diff --git a/collects/syntax/modresolve.ss b/collects/syntax/modresolve.ss index 690c640bf2..51da712840 100644 --- a/collects/syntax/modresolve.ss +++ b/collects/syntax/modresolve.ss @@ -1,6 +1,5 @@ - -#lang scheme/base -(require scheme/contract/base +#lang racket/base +(require racket/contract/base "private/modhelp.ss") (define (force-relto relto dir?) diff --git a/collects/syntax/module-reader.ss b/collects/syntax/module-reader.ss index f9dd48aa2e..92aa5d3050 100644 --- a/collects/syntax/module-reader.ss +++ b/collects/syntax/module-reader.ss @@ -1,12 +1,11 @@ -(module module-reader scheme/base - (require syntax/readerr) +(module module-reader racket/private/base + (require syntax/readerr + (for-syntax racket/private/base)) (provide (rename-out [provide-module-reader #%module-begin] [wrap wrap-read-all]) make-meta-reader - (except-out (all-from-out scheme/base) #%module-begin)) - - (require (for-syntax scheme/base)) + (except-out (all-from-out racket/private/base) #%module-begin)) (define ar? procedure-arity-includes?) diff --git a/collects/syntax/name.ss b/collects/syntax/name.ss index cbb7937edb..b03bd2dab7 100644 --- a/collects/syntax/name.ss +++ b/collects/syntax/name.ss @@ -1,4 +1,4 @@ -(module name scheme/base - (require scheme/private/name) +(module name racket/base + (require racket/private/name) (provide syntax-local-infer-name)) diff --git a/collects/syntax/private/boundmap.ss b/collects/syntax/private/boundmap.ss index 4886eb005a..6c41d692ff 100644 --- a/collects/syntax/private/boundmap.ss +++ b/collects/syntax/private/boundmap.ss @@ -1,6 +1,6 @@ -(module boundmap mzscheme - (require mzlib/etc) +(module boundmap racket/base + (require (for-syntax racket/base)) (define-syntax (make-mapping-code stx) (syntax-case stx () @@ -25,31 +25,31 @@ (let ([make-identifier-mapping (lambda () (make-identifier-mapping - (make-hash-table)))]) + (make-hasheq)))]) make-identifier-mapping)) (define identifier-mapping-get - (opt-lambda (bi id [fail (lambda () - (error 'identifier-mapping-get - "no mapping for ~e" - id))]) + (lambda (bi id [fail (lambda () + (error 'identifier-mapping-get + "no mapping for ~e" + id))]) (let ([i (ormap (lambda (i) (and (identifier=? (car i) id) i)) - (hash-table-get (identifier-mapping-ht bi) - (identifier->symbol id) - null))]) + (hash-ref (identifier-mapping-ht bi) + (identifier->symbol id) + null))]) (if i (cdr i) (fail))))) (define identifier-mapping-put! (lambda (bi id v) - (let ([l (hash-table-get + (let ([l (hash-ref (identifier-mapping-ht bi) (identifier->symbol id) null)]) - (hash-table-put! + (hash-set! (identifier-mapping-ht bi) (identifier->symbol id) (let loop ([l l]) @@ -61,11 +61,11 @@ (define identifier-mapping-for-each (lambda (bi f) - (hash-table-for-each (identifier-mapping-ht bi) - (lambda (k v) - (for-each (lambda (i) - (f (car i) (cdr i))) - v))))) + (hash-for-each (identifier-mapping-ht bi) + (lambda (k v) + (for-each (lambda (i) + (f (car i) (cdr i))) + v))))) (define identifier-mapping-map (lambda (bi f) @@ -76,7 +76,7 @@ (set! r (cons (f k v) r)))) (reverse r)))) - (provide (rename mk-identifier-mapping make-identifier-mapping)) + (provide (rename-out [mk-identifier-mapping make-identifier-mapping])) (provide identifier-mapping? identifier-mapping-get identifier-mapping-put! @@ -121,4 +121,4 @@ module-identifier-mapping-put! module-identifier-mapping-for-each module-identifier-mapping-map - module-identifier=?)) + free-identifier=?)) diff --git a/collects/syntax/private/modcollapse-noctc.ss b/collects/syntax/private/modcollapse-noctc.ss index 6285cb3d69..b7724c1806 100644 --- a/collects/syntax/private/modcollapse-noctc.ss +++ b/collects/syntax/private/modcollapse-noctc.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base #| @@ -8,8 +8,8 @@ Use syntax/modcollapse instead. |# -(require scheme/string - scheme/list +(require racket/string + racket/list "modhelp.ss") (define (collapse-module-path s relto-mp) diff --git a/collects/syntax/private/modhelp.ss b/collects/syntax/private/modhelp.ss index fe82aa6d18..d9a2d39fa5 100644 --- a/collects/syntax/private/modhelp.ss +++ b/collects/syntax/private/modhelp.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide explode-relpath-string module-path-v? diff --git a/collects/syntax/private/stxparse/lib.ss b/collects/syntax/private/stxparse/lib.ss index f67c58a9b9..859b0ce874 100644 --- a/collects/syntax/private/stxparse/lib.ss +++ b/collects/syntax/private/stxparse/lib.ss @@ -1,15 +1,15 @@ -#lang scheme/base +#lang racket/base (require "sc.ss" "../util.ss" syntax/stx - scheme/struct-info + racket/struct-info unstable/srcloc - (for-syntax scheme/base + (for-syntax racket/base "rep.ss" (only-in "rep-data.ss" make-literalset)) - (for-template scheme/base - scheme/contract/base)) + (for-template racket/base + racket/contract/base)) (provide identifier boolean diff --git a/collects/syntax/private/stxparse/minimatch.ss b/collects/syntax/private/stxparse/minimatch.ss index bd177143b0..9ebfe9165c 100644 --- a/collects/syntax/private/stxparse/minimatch.ss +++ b/collects/syntax/private/stxparse/minimatch.ss @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base (require unstable/struct - (for-syntax scheme/base scheme/struct-info unstable/struct)) + (for-syntax racket/base racket/struct-info unstable/struct)) (provide match make) (define-syntax (match stx) diff --git a/collects/syntax/private/stxparse/parse.ss b/collects/syntax/private/stxparse/parse.ss index ec5f70cc05..3bb3e9e959 100644 --- a/collects/syntax/private/stxparse/parse.ss +++ b/collects/syntax/private/stxparse/parse.ss @@ -1,6 +1,6 @@ #lang scheme/base (require (for-syntax scheme/base - scheme/private/sc + racket/private/sc syntax/stx syntax/id-table syntax/keyword diff --git a/collects/syntax/private/stxparse/rep-attrs.ss b/collects/syntax/private/stxparse/rep-attrs.ss index 12a2de45eb..4b1a85643e 100644 --- a/collects/syntax/private/stxparse/rep-attrs.ss +++ b/collects/syntax/private/stxparse/rep-attrs.ss @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/contract/base +#lang racket/base +(require racket/contract/base syntax/stx syntax/id-table "../util.ss") diff --git a/collects/syntax/private/stxparse/rep-data.ss b/collects/syntax/private/stxparse/rep-data.ss index 17469b36e6..1f99826c31 100644 --- a/collects/syntax/private/stxparse/rep-data.ss +++ b/collects/syntax/private/stxparse/rep-data.ss @@ -1,6 +1,6 @@ -#lang scheme/base -(require scheme/contract/base - scheme/dict +#lang racket/base +(require racket/contract/base + racket/dict syntax/stx syntax/id-table "../util.ss" diff --git a/collects/syntax/private/stxparse/rep.ss b/collects/syntax/private/stxparse/rep.ss index 0e055c1709..fcabc96e9e 100644 --- a/collects/syntax/private/stxparse/rep.ss +++ b/collects/syntax/private/stxparse/rep.ss @@ -1,9 +1,9 @@ -#lang scheme/base -(require (for-template scheme/base) +#lang racket/base +(require (for-template racket/base) (for-template "runtime.ss") - scheme/contract/base + racket/contract/base "minimatch.ss" - scheme/dict + racket/dict syntax/id-table syntax/stx syntax/keyword diff --git a/collects/syntax/private/stxparse/runtime-prose.ss b/collects/syntax/private/stxparse/runtime-prose.ss index 18bbd221f3..3e1b0eb9ed 100644 --- a/collects/syntax/private/stxparse/runtime-prose.ss +++ b/collects/syntax/private/stxparse/runtime-prose.ss @@ -1,12 +1,12 @@ -#lang scheme/base -(require scheme/contract/base - scheme/list +#lang racket/base +(require racket/contract/base + racket/list "minimatch.ss" - scheme/stxparam + racket/stxparam syntax/stx - (for-syntax scheme/base) + (for-syntax racket/base) (for-syntax syntax/stx) - (for-syntax scheme/private/sc) + (for-syntax racket/private/sc) (for-syntax "rep-data.ss") (for-syntax "../util.ss") "runtime.ss") diff --git a/collects/syntax/private/stxparse/runtime.ss b/collects/syntax/private/stxparse/runtime.ss index 53bcb283a7..38f2389794 100644 --- a/collects/syntax/private/stxparse/runtime.ss +++ b/collects/syntax/private/stxparse/runtime.ss @@ -1,12 +1,12 @@ -#lang scheme/base -(require scheme/contract/base - scheme/stxparam - scheme/list +#lang racket/base +(require racket/contract/base + racket/stxparam + racket/list unstable/struct "minimatch.ss" - (for-syntax scheme/base + (for-syntax racket/base syntax/stx - scheme/private/sc + racket/private/sc "rep-data.ss" "rep-attrs.ss" "../util.ss")) diff --git a/collects/syntax/private/stxparse/sc.ss b/collects/syntax/private/stxparse/sc.ss index 2a50158235..d1e20e55d9 100644 --- a/collects/syntax/private/stxparse/sc.ss +++ b/collects/syntax/private/stxparse/sc.ss @@ -1,12 +1,12 @@ -#lang scheme/base -(require (for-syntax scheme/base - scheme/private/sc +#lang racket/base +(require (for-syntax racket/base + racket/private/sc unstable/syntax unstable/struct "minimatch.ss" "rep-data.ss" "rep.ss") - scheme/list + racket/list syntax/stx "parse.ss" "runtime.ss" diff --git a/collects/syntax/readerr.ss b/collects/syntax/readerr.ss index e62cb216ee..8e352aa382 100644 --- a/collects/syntax/readerr.ss +++ b/collects/syntax/readerr.ss @@ -1,5 +1,5 @@ ; Don't change this module to #lang, since it's used by syntax/module-reader -(module readerr mzscheme +(module readerr racket/private/base (provide raise-read-error raise-read-eof-error) diff --git a/collects/syntax/stx.ss b/collects/syntax/stx.ss index 42d658babf..d57371eee3 100644 --- a/collects/syntax/stx.ss +++ b/collects/syntax/stx.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;; These utilities facilitate operations on syntax objects. ;; A syntax object that represents a parenthesized sequence diff --git a/collects/teachpack/2htdp/scribblings/.gitignore b/collects/teachpack/2htdp/scribblings/.gitignore deleted file mode 100644 index 8617481f53..0000000000 --- a/collects/teachpack/2htdp/scribblings/.gitignore +++ /dev/null @@ -1 +0,0 @@ -output.txt diff --git a/collects/teachpack/2htdp/scribblings/batch-io.scrbl b/collects/teachpack/2htdp/scribblings/batch-io.scrbl index 272e929fa1..11ecdda6b4 100644 --- a/collects/teachpack/2htdp/scribblings/batch-io.scrbl +++ b/collects/teachpack/2htdp/scribblings/batch-io.scrbl @@ -139,3 +139,5 @@ There is only one writer function at the moment: } ] +@(delete-file "output.txt") + diff --git a/collects/tests/mzscheme/basic.ss b/collects/tests/mzscheme/basic.ss index 5efd3875a7..0027dd32ac 100644 --- a/collects/tests/mzscheme/basic.ss +++ b/collects/tests/mzscheme/basic.ss @@ -4,7 +4,7 @@ (Section 'basic) (require scheme/flonum - scheme/private/norm-arity) + racket/private/norm-arity) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/collects/tests/mzscheme/contract-test.ss b/collects/tests/mzscheme/contract-test.ss index 6c92ad3761..32bc840fcc 100644 --- a/collects/tests/mzscheme/contract-test.ss +++ b/collects/tests/mzscheme/contract-test.ss @@ -11,7 +11,7 @@ (namespace-require '(for-syntax scheme/base)) (namespace-require '(for-template scheme/base)) (namespace-require 'scheme/contract) - (namespace-require '(only scheme/contract/private/arrow procedure-accepts-and-more?)) + (namespace-require '(only racket/contract/private/arrow procedure-accepts-and-more?)) (namespace-require 'scheme/class) (namespace-require 'scheme/promise)) n)) diff --git a/collects/tests/mzscheme/sandbox.ss b/collects/tests/mzscheme/sandbox.ss index 1a3abd0e8f..b691da7de5 100644 --- a/collects/tests/mzscheme/sandbox.ss +++ b/collects/tests/mzscheme/sandbox.ss @@ -285,9 +285,9 @@ --top-- (let* ([tmp (make-temporary-file "sandboxtest~a" 'directory)] [strpath (lambda xs (path->string (apply build-path xs)))] - [schemelib (strpath (collection-path "scheme"))] - [list-lib (strpath schemelib "list.ss")] - [list-zo (strpath schemelib "compiled" "list_ss.zo")] + [racketlib (strpath (collection-path "racket"))] + [list-lib (strpath racketlib "list.rkt")] + [list-zo (strpath racketlib "compiled" "list_rkt.zo")] [test-lib (strpath tmp "sandbox-test.ss")] [test-zo (strpath tmp "compiled" "sandbox-test_ss.zo")] [test2-lib (strpath tmp "sandbox-test2.ss")] @@ -296,7 +296,7 @@ (make-base-evaluator!) --eval-- ;; reading from collects is allowed - (list? (directory-list ,schemelib)) + (list? (directory-list ,racketlib)) (file-exists? ,list-lib) => #t (input-port? (open-input-file ,list-lib)) => #t ;; writing is forbidden @@ -304,13 +304,13 @@ ;; reading from other places is forbidden (directory-list ,tmp) =err> "`read' access denied" ;; no network too - (require scheme/tcp) + (require racket/tcp) (tcp-listen 12345) =err> "network access denied" --top-- ;; reading from a specified require is fine (with-output-to-file test-lib (lambda () - (printf "~s\n" '(module sandbox-test scheme/base + (printf "~s\n" '(module sandbox-test racket/base (define x 123) (provide x))))) (make-base-evaluator/reqs! `(,test-lib)) --eval-- @@ -322,7 +322,7 @@ ;; should work also for module evaluators ;; --> NO! Shouldn't make user code require whatever it wants ;; (make-module-evaluator! - ;; `(module foo scheme/base (require (file ,test-lib)))) + ;; `(module foo racket/base (require (file ,test-lib)))) ;; --eval-- ;; x => 123 ;; (length (with-input-from-file ,test-lib read)) => 5 @@ -340,7 +340,7 @@ (list? (directory-list ,tmp)) (open-output-file ,(build-path tmp "blah")) =err> "access denied" (delete-directory ,(build-path tmp "blah")) =err> "access denied" - (list? (directory-list ,schemelib)) + (list? (directory-list ,racketlib)) ;; we can read/write/delete list-zo, but we can't load bytecode from ;; it due to the code inspector (copy-file ,list-zo ,test-zo) => (void) @@ -368,7 +368,7 @@ ;; bytecode from test2-lib is explicitly allowed (load/use-compiled ,test2-lib) (require 'list) => (void)) - ((dynamic-require 'scheme/file 'delete-directory/files) tmp)) + ((dynamic-require 'racket/file 'delete-directory/files) tmp)) ;; languages and requires --top-- @@ -389,7 +389,7 @@ (eq? (ev "6") (ev "(sub1 (* 2 3.5))")) (eq? (ev "6") (ev "(sub1 (* 2 x))")) --top-- - (make-base-evaluator/reqs! '(scheme/list)) + (make-base-evaluator/reqs! '(racket/list)) --eval-- (last-pair '(1 2 3)) => '(3) (last-pair null) =err> "expected argument of type" diff --git a/collects/tests/mzscheme/stx.ss b/collects/tests/mzscheme/stx.ss index 04c2a2054a..3054b366e7 100644 --- a/collects/tests/mzscheme/stx.ss +++ b/collects/tests/mzscheme/stx.ss @@ -479,7 +479,7 @@ (test '('#%kernel case-lambda (lib "scheme/init") case-lambda 0 0 0) identifier-binding* #'case-lambda) -(test '("private/promise.ss" delay* (lib "scheme/init") delay 0 0 0) +(test '("private/promise.rkt" delay* (lib "scheme/init") delay 0 0 0) identifier-binding* #'delay) (test '('#%kernel #%module-begin (lib "scheme/init") #%plain-module-begin 0 0 0) identifier-binding* #'#%plain-module-begin) diff --git a/collects/typed-scheme/private/base-env-indexing-abs.ss b/collects/typed-scheme/private/base-env-indexing-abs.ss index 1676ca26bd..44587b1cf6 100644 --- a/collects/typed-scheme/private/base-env-indexing-abs.ss +++ b/collects/typed-scheme/private/base-env-indexing-abs.ss @@ -12,7 +12,7 @@ (only-in '#%kernel [apply kernel:apply]) scheme/promise scheme/system (only-in string-constants/private/only-once maybe-print-message) - (only-in scheme/match/runtime match:error matchable? match-equality-test) + (only-in racket/match/runtime match:error matchable? match-equality-test) (for-template scheme) (rename-in (types abbrev) [-Number N] [-Boolean B] [-Symbol Sym] [-Nat -Nat*])) diff --git a/collects/typed-scheme/private/base-env-numeric.ss b/collects/typed-scheme/private/base-env-numeric.ss index de984fdead..e86614384c 100644 --- a/collects/typed-scheme/private/base-env-numeric.ss +++ b/collects/typed-scheme/private/base-env-numeric.ss @@ -11,7 +11,7 @@ (only-in '#%kernel [apply kernel:apply]) scheme/promise scheme/system (only-in string-constants/private/only-once maybe-print-message) - (only-in scheme/match/runtime match:error matchable? match-equality-test) + (only-in racket/match/runtime match:error matchable? match-equality-test) (for-syntax (only-in (types abbrev) [-Number N] [-Boolean B] [-Symbol Sym] [-Real R] [-ExactPositiveInteger -Pos]))) (define-for-syntax all-num-types (list -Pos -Nat -Integer -ExactRational -Flonum -Real N)) diff --git a/collects/typed-scheme/private/base-env.ss b/collects/typed-scheme/private/base-env.ss index 278a95587c..231f6ea821 100644 --- a/collects/typed-scheme/private/base-env.ss +++ b/collects/typed-scheme/private/base-env.ss @@ -12,7 +12,7 @@ scheme/promise scheme/system (only-in string-constants/private/only-once maybe-print-message) (only-in mzscheme make-namespace) - (only-in scheme/match/runtime match:error matchable? match-equality-test) + (only-in racket/match/runtime match:error matchable? match-equality-test) (for-syntax (only-in (types abbrev) [-Number N] [-Boolean B] [-Symbol Sym]) (only-in (rep type-rep) make-HashtableTop make-MPairTop make-BoxTop make-VectorTop))) diff --git a/collects/typed-scheme/private/base-special-env.ss b/collects/typed-scheme/private/base-special-env.ss index b631a4d78c..4ead72b0b9 100644 --- a/collects/typed-scheme/private/base-special-env.ss +++ b/collects/typed-scheme/private/base-special-env.ss @@ -7,7 +7,7 @@ (only-in scheme/list cons? take drop add-between last filter-map) (only-in rnrs/lists-6 fold-left) '#%paramz - (only-in scheme/match/runtime match:error) + (only-in racket/match/runtime match:error) scheme/promise string-constants/string-constant ;(prefix-in ce: test-engine/scheme-tests) diff --git a/collects/typed-scheme/private/with-types.ss b/collects/typed-scheme/private/with-types.ss index 06c550b647..9e0c85dd6d 100644 --- a/collects/typed-scheme/private/with-types.ss +++ b/collects/typed-scheme/private/with-types.ss @@ -9,7 +9,7 @@ "extra-procs.ss" "prims.ss" "base-types.ss" - scheme/contract/regions scheme/contract/base + racket/contract/regions racket/contract/base (for-syntax "base-types-extra.ss" unstable/debug diff --git a/collects/typed-scheme/typecheck/provide-handling.ss b/collects/typed-scheme/typecheck/provide-handling.ss index ecfc7a925e..88eb112698 100644 --- a/collects/typed-scheme/typecheck/provide-handling.ss +++ b/collects/typed-scheme/typecheck/provide-handling.ss @@ -9,7 +9,7 @@ (private typed-renaming) (rep type-rep) (utils tc-utils) - scheme/contract/private/provide unstable/list + racket/contract/private/provide unstable/list unstable/debug unstable/syntax scheme/struct-info scheme/match "def-binding.ss" syntax/parse) diff --git a/collects/typed-scheme/typecheck/tc-app.ss b/collects/typed-scheme/typecheck/tc-app.ss index 0991965694..8f501b4916 100644 --- a/collects/typed-scheme/typecheck/tc-app.ss +++ b/collects/typed-scheme/typecheck/tc-app.ss @@ -8,7 +8,7 @@ unstable/sequence ;; fixme - don't need to be bound in this phase - only to make syntax/parse happy scheme/bool - (only-in scheme/private/class-internal make-object do-make-object) + (only-in racket/private/class-internal make-object do-make-object) (only-in '#%kernel [apply k:apply]) ;; end fixme (for-syntax syntax/parse scheme/base (utils tc-utils)) @@ -22,7 +22,7 @@ (for-template (only-in '#%kernel [apply k:apply]) "internal-forms.ss" scheme/base scheme/bool - (only-in scheme/private/class-internal make-object do-make-object))) + (only-in racket/private/class-internal make-object do-make-object))) (import tc-expr^ tc-lambda^ tc-dots^ tc-let^) (export tc-app^) diff --git a/collects/typed-scheme/typecheck/tc-expr-unit.ss b/collects/typed-scheme/typecheck/tc-expr-unit.ss index 9d22a03cd5..dce2fb2094 100644 --- a/collects/typed-scheme/typecheck/tc-expr-unit.ss +++ b/collects/typed-scheme/typecheck/tc-expr-unit.ss @@ -12,11 +12,11 @@ (except-in (utils tc-utils stxclass-util)) (env lexical-env) (only-in (env type-environments) lookup current-tvars extend-env) - scheme/private/class-internal + racket/private/class-internal (except-in syntax/parse id) (only-in srfi/1 split-at)) -(require (for-template scheme/base scheme/private/class-internal)) +(require (for-template scheme/base racket/private/class-internal)) (import tc-if^ tc-lambda^ tc-app^ tc-let^ check-subforms^) (export tc-expr^) diff --git a/collects/unstable/dirs.ss b/collects/unstable/dirs.ss index 4ce8a4ea83..9e984c98f5 100644 --- a/collects/unstable/dirs.ss +++ b/collects/unstable/dirs.ss @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base ;; Unstable library by: Carl Eastlund -;; intended for use in scheme/contract, so don't try to add contracts! +;; intended for use in racket/contract, so don't try to add contracts! -(require scheme/dict +(require racket/dict setup/path-relativize setup/dirs (only-in planet/config [CACHE-DIR find-planet-dir])) diff --git a/collects/unstable/location.ss b/collects/unstable/location.ss index 028b820b4d..472aa5aa89 100644 --- a/collects/unstable/location.ss +++ b/collects/unstable/location.ss @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (require unstable/srcloc - (for-syntax scheme/base + (for-syntax racket/base unstable/srcloc unstable/dirs)) diff --git a/collects/unstable/srcloc.ss b/collects/unstable/srcloc.ss index f83d80835a..e48fc8f5cf 100644 --- a/collects/unstable/srcloc.ss +++ b/collects/unstable/srcloc.ss @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;; Unstable library by: Carl Eastlund ;; intended for use in scheme/contract, so don't try to add contracts! diff --git a/collects/unstable/struct.ss b/collects/unstable/struct.ss index 1640c56e77..c6c8ce605f 100644 --- a/collects/unstable/struct.ss +++ b/collects/unstable/struct.ss @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base ;; owner: ryanc -(require (for-syntax scheme/base - scheme/struct-info)) +(require (for-syntax racket/base + racket/struct-info)) (provide make struct->list (for-syntax get-struct-info)) diff --git a/collects/unstable/syntax.ss b/collects/unstable/syntax.ss index 0ad94ddeb0..e9bdaf3190 100644 --- a/collects/unstable/syntax.ss +++ b/collects/unstable/syntax.ss @@ -1,11 +1,11 @@ -#lang scheme/base +#lang racket/base ;; owner: ryanc (require syntax/kerncase syntax/stx unstable/struct - (for-syntax scheme/base - scheme/private/sc) - (for-template scheme/base)) + (for-syntax racket/base + racket/private/sc) + (for-template racket/base)) (provide unwrap-syntax diff --git a/src/Makefile.in b/src/Makefile.in index a5aefbb78d..c28f2b647f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -29,21 +29,21 @@ all: $(MAKE) @MAIN_VARIANT@ 3m: - cd mzscheme; $(MAKE) 3m + cd racket; $(MAKE) 3m $(MAKE) @MAKE_GRACKET@-3m gracket-3m: - cd mred; $(MAKE) 3m + cd gracket; $(MAKE) 3m no-3m: $(NOOP) cgc: - cd mzscheme; $(MAKE) cgc + cd racket; $(MAKE) cgc $(MAKE) @MAKE_GRACKET@-cgc gracket-cgc: - cd mred; $(MAKE) cgc + cd gracket; $(MAKE) cgc no-cgc: $(NOOP) @@ -83,20 +83,20 @@ no-run: $(NOOP) copytree-run: - mzscheme/racket@CGC@ -u \ + racket/racket@CGC@ -u \ "$(srcdir)/../collects/setup/unixstyle-install.ss" \ make-install-copytree "$(srcdir)/.." \ $(ALLDIRINFO) "@INSTALL_ORIG_TREE@" install-gracket-post-collects: - cd mred; $(MAKE) install-post-collects + cd gracket; $(MAKE) install-post-collects install-no-post-collects: $(NOOP) fix-paths: if [ "$(DESTDIR)" != "" ]; then \ - mzscheme/racket@CGC@ -u \ + racket/racket@CGC@ -u \ "$(srcdir)/../collects/setup/unixstyle-install.ss" \ make-install-destdir-fix "$(srcdir)/.." \ $(ALLDIRINFO) "@INSTALL_ORIG_TREE@"; \ @@ -106,13 +106,13 @@ fix-paths: install-3m-common: $(MAKE) install-common-first - cd mzscheme; $(MAKE) install-3m + cd racket; $(MAKE) install-3m $(MAKE) install-@MAKE_GRACKET@-3m $(MAKE) install-common-middle install-3m: $(MAKE) install-3m-common - mzscheme/racket@MMM@ $(SETUP_ARGS) + racket/racket@MMM@ $(SETUP_ARGS) $(MAKE) install-common-last plain-install-3m: @@ -123,19 +123,19 @@ install-no-3m: $(NOOP) install-gracket-3m: - cd mred; $(MAKE) install-3m + cd gracket; $(MAKE) install-3m # CGC install ---------------------------------------- install-cgc-common: $(MAKE) install-common-first - cd mzscheme; $(MAKE) install-cgc + cd racket; $(MAKE) install-cgc $(MAKE) install-@MAKE_GRACKET@-cgc $(MAKE) install-common-middle install-cgc: $(MAKE) install-cgc-common - mzscheme/racket@CGC@ $(SETUP_ARGS) + racket/racket@CGC@ $(SETUP_ARGS) $(MAKE) install-common-last plain-install-cgc: @@ -146,19 +146,19 @@ install-no-cgc: $(NOOP) install-gracket-cgc: - cd mred; $(MAKE) install-cgc + cd gracket; $(MAKE) install-cgc # Both install ---------------------------------------- install-both-common: $(MAKE) install-common-first - cd mzscheme; $(MAKE) install-both + cd racket; $(MAKE) install-both $(MAKE) install-@MAKE_GRACKET@-both $(MAKE) install-common-middle install-both: $(MAKE) install-both-common - mzscheme/racket@MAIN_VARIANT@ $(SETUP_ARGS) + racket/racket@MAIN_VARIANT@ $(SETUP_ARGS) $(MAKE) install-common-last plain-install-both: @@ -169,10 +169,10 @@ install-no-both: $(NOOP) install-gracket-both: - cd mred; $(MAKE) install-both + cd gracket; $(MAKE) install-both # Clean ---------------------------------------- clean: - cd mzscheme; $(MAKE) clean - if [ -d mred ]; then cd mred; $(MAKE) clean; fi + cd racket; $(MAKE) clean + if [ -d gracket ]; then cd gracket; $(MAKE) clean; fi diff --git a/src/configure b/src/configure index 6b437f2134..6f307e7443 100755 --- a/src/configure +++ b/src/configure @@ -577,7 +577,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= ac_unique_file="PLT Scheme" -ac_unique_file="mzscheme/src/bignum.c" +ac_unique_file="racket/src/bignum.c" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -767,7 +767,7 @@ CXXFLAGS CCC CXXCPP XMKMF' -ac_subdirs_all='mzscheme/gc/libatomic_ops +ac_subdirs_all='racket/gc/libatomic_ops foreign/gcc/libffi wxcommon/jpeg wxxt/src/x/wbuild ' @@ -1818,7 +1818,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers mzscheme/mzconfig.h" +ac_config_headers="$ac_config_headers racket/mzconfig.h" # Check whether --enable-gracket was given. @@ -2213,7 +2213,7 @@ fi ###### Make sure GRacket is really there ###### if test "${enable_gracket}" = "yes" ; then - if test ! -d $srcdir/mred ; then + if test ! -d $srcdir/gracket ; then enable_gracket=no fi fi @@ -5850,7 +5850,7 @@ case $OS in ;; AIX) enable_cgcdefault="yes" - EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../mzscheme/include/racket.exp" + EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../racket/include/racket.exp" ;; FreeBSD) LIBS="$LIBS -rdynamic" @@ -5931,7 +5931,7 @@ case $OS in if test "${enable_shared}" = "yes" ; then ar_libtool_no_undefined=" -no-undefined" LIBRACKET_DEP="libmzgc.la -liconv" - LIBGRACKET_DEP="../mzscheme/libmzgc.la ../mzscheme/libgracket.la" + LIBGRACKET_DEP="../racket/libmzgc.la ../racket/libgracket.la" fi EXE_SUFFIX=".exe" ;; @@ -12018,7 +12018,7 @@ if test "${enable_shared}" = "yes" ; then if test "$INCLUDEDEP" = "-include" ; then plt_lib_version="\$(FWVERSION)" else - plt_lib_version=`grep " MZSCHEME_VERSION " ${srcdir}/mzscheme/src/schvers.h | cut -d '"' -f 2` + plt_lib_version=`grep " MZSCHEME_VERSION " ${srcdir}/racket/src/schvers.h | cut -d '"' -f 2` fi AR="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc}${ar_libtool_no_undefined} -release ${plt_lib_version} -rpath ${abslibdir} \$(ARLIBFLAGS) -o" @@ -12173,10 +12173,10 @@ mk_needed_dir() } makefiles="Makefile - mzscheme/Makefile - mzscheme/src/Makefile mzscheme/dynsrc/Makefile - mzscheme/gc/Makefile mzscheme/sgc/Makefile - mzscheme/gc2/Makefile" + racket/Makefile + racket/src/Makefile racket/dynsrc/Makefile + racket/gc/Makefile racket/sgc/Makefile + racket/gc2/Makefile" # Make sure the --enable-shared default is propagated: if test "${enable_shared}" = "yes" ; then @@ -12185,7 +12185,7 @@ fi if test "${LIBATOM}" = "LIBATOM_USE" ; then ac_aux_dir= -for ac_dir in mzscheme/gc/libatomic_ops "$srcdir"/mzscheme/gc/libatomic_ops ; do +for ac_dir in racket/gc/libatomic_ops "$srcdir"/racket/gc/libatomic_ops ; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -12201,8 +12201,8 @@ for ac_dir in mzscheme/gc/libatomic_ops "$srcdir"/mzscheme/gc/libatomic_ops ; d fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in mzscheme/gc/libatomic_ops \"$srcdir\"/mzscheme/gc/libatomic_ops " >&5 -echo "$as_me: error: cannot find install-sh or install.sh in mzscheme/gc/libatomic_ops \"$srcdir\"/mzscheme/gc/libatomic_ops " >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in racket/gc/libatomic_ops \"$srcdir\"/racket/gc/libatomic_ops " >&5 +echo "$as_me: error: cannot find install-sh or install.sh in racket/gc/libatomic_ops \"$srcdir\"/racket/gc/libatomic_ops " >&2;} { (exit 1); exit 1; }; } fi @@ -12215,7 +12215,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - subdirs="$subdirs mzscheme/gc/libatomic_ops" + subdirs="$subdirs racket/gc/libatomic_ops" fi @@ -12281,9 +12281,9 @@ if test "${enable_gracket}" = "yes" ; then fi makefiles="$makefiles - mred/Makefile - mred/wxs/Makefile - mred/gc2/Makefile" + gracket/Makefile + gracket/wxs/Makefile + gracket/gc2/Makefile" if test "${enable_libpng}" != "yes" ; then makefiles="$makefiles @@ -12927,7 +12927,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case $ac_config_target in - "mzscheme/mzconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS mzscheme/mzconfig.h" ;; + "racket/mzconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS racket/mzconfig.h" ;; "$makefiles") CONFIG_FILES="$CONFIG_FILES $makefiles" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 diff --git a/src/foreign/Makefile.in b/src/foreign/Makefile.in index 83b727d4db..6314911314 100644 --- a/src/foreign/Makefile.in +++ b/src/foreign/Makefile.in @@ -4,8 +4,8 @@ srcdir = @srcdir@ builddir = @builddir@ CC = @CC@ CFLAGS = @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ \ - -I$(builddir)/../mzscheme \ - -I$(srcdir)/../mzscheme/include -I$(srcdir)/../mzscheme/src \ + -I$(builddir)/../racket \ + -I$(srcdir)/../racket/include -I$(srcdir)/../racket/src \ -Igcc/libffi/include ARFLAGS = @ARFLAGS@ @@ -20,9 +20,9 @@ gcc/libffi/libffi@FOREIGN_CONVENIENCE@.la: cd gcc/libffi; $(MAKE) libffi@FOREIGN_CONVENIENCE@.la foreign.@LTO@: $(srcdir)/foreign.c \ - $(srcdir)/../mzscheme/include/scheme.h \ - $(srcdir)/../mzscheme/src/schemef.h \ - $(srcdir)/../mzscheme/src/schpriv.h + $(srcdir)/../racket/include/scheme.h \ + $(srcdir)/../racket/src/schemef.h \ + $(srcdir)/../racket/src/schpriv.h $(CC) $(CFLAGS) -c $(srcdir)/foreign.c -o foreign.@LTO@ clean: diff --git a/src/mred/Makefile.in b/src/gracket/Makefile.in similarity index 74% rename from src/mred/Makefile.in rename to src/gracket/Makefile.in index 25e2ecf71d..610d594eac 100644 --- a/src/mred/Makefile.in +++ b/src/gracket/Makefile.in @@ -13,7 +13,7 @@ builddir = @builddir@ # for version.mak: mainsrcdir = @srcdir@/.. -@INCLUDEDEP@ @srcdir@/../mzscheme/version.mak +@INCLUDEDEP@ @srcdir@/../racket/version.mak WXDIR = $(srcdir)/../wxxt @@ -44,8 +44,8 @@ WXINC_wx_xt = -I$(PLTSRCDIR)/wxxt/src/AIAI-include -I$(PLTSRCDIR)/wxxt/src WXINC_wx_mac = -I$(PLTSRCDIR)/wxmac/include/base -I$(PLTSRCDIR)/wxmac/include/mac -I$(PLTSRCDIR)/wxcommon -I$(PLTSRCDIR)/a-list/c-headers/ WXINC = $(WXINC_@WXVARIANT@) -NOGCINC = $(WXINC) -I$(PLTBUILDDIR)/mzscheme/ -I$(PLTSRCDIR)/mzscheme/include/ -INC = -I$(PLTSRCDIR)/mzscheme/$(GCDIRECTORY) $(NOGCINC) +NOGCINC = $(WXINC) -I$(PLTBUILDDIR)/racket/ -I$(PLTSRCDIR)/racket/include/ +INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC) CXXFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @PREFLAGS@ CFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@ LDFLAGS = @LDFLAGS@ $(XLIB) @@ -64,22 +64,22 @@ EXTRALDFLAGS_wx_xt = EXTRALDFLAGS_wx_mac = -framework Carbon -framework Cocoa -framework QuickTime -framework AGL -framework OpenGL -lz GRACKETLDFLAGS = $(LDFLAGS) $(EXTRALDFLAGS_@WXVARIANT@) WXLIBS_wx_xt = ../wxxt/src/libwx_xt.@LIBSFX@ ../wxxt/contrib/xpm/lib/libXpm.@LIBSFX@ ../wxxt/utils/image/src/libimage_xt.@LIBSFX@ -GRACKETX_wx_xt = mredx.@LTO@ +GRACKETX_wx_xt = gracketx.@LTO@ WXLIBS_wx_mac = ../wxmac/src/libwxmac.@LIBSFX@ -GRACKETX_wx_mac = mredmac.@LTO@ simpledrop.@LTO@ -WXLIBSNORM = mred.@LTO@ $(GRACKETX_@WXVARIANT@) wxGC.@LTO@ wxJPEG.@LTO@ wxs/libwxscheme.@LIBSFX@ $(WXLIBS_@WXVARIANT@) @JPEG_A@ @PNG_A@ @ZLIB_A@ +GRACKETX_wx_mac = gracketmac.@LTO@ simpledrop.@LTO@ +WXLIBSNORM = gracket.@LTO@ $(GRACKETX_@WXVARIANT@) wxGC.@LTO@ wxJPEG.@LTO@ wxs/libwxscheme.@LIBSFX@ $(WXLIBS_@WXVARIANT@) @JPEG_A@ @PNG_A@ @ZLIB_A@ WXLIBSDYN = libgracket.@LIBSFX@ GUILIBS_wx_xt = $(LDLIBS) GUILIBS_wx_mac = @LIBS@ -GRACKETLDLIBS = ../mzscheme/libracket.@LIBSFX@ ../mzscheme/libmzgc.@LIBSFX@ $(@WXLIBS@) $(GUILIBS_@WXVARIANT@) +GRACKETLDLIBS = ../racket/libracket.@LIBSFX@ ../racket/libmzgc.@LIBSFX@ $(@WXLIBS@) $(GUILIBS_@WXVARIANT@) LOCALFLAGS_wx_xt = @WX_MMD_FLAG@ -LOCALFLAGS_wx_mac = -I$(srcdir)/../mac/mzscheme -MMD -DWX_CARBON +LOCALFLAGS_wx_mac = -I$(srcdir)/../mac/racket -MMD -DWX_CARBON LOCALFLAGS = $(LOCALFLAGS_@WXVARIANT@) -GRACKETOBJECTS = mrmain.@LTO@ +GRACKETOBJECTS = grmain.@LTO@ -RACKETDEPS = ../mzscheme/libracket.@LIBSFX@ ../mzscheme/libmzgc.@LIBSFX@ +RACKETDEPS = ../racket/libracket.@LIBSFX@ ../racket/libmzgc.@LIBSFX@ WXSCHEME = wxs/libwxscheme.@LIBSFX@ INSTALLDEST=/home/scheme/plt @@ -121,7 +121,7 @@ both: ext-libs: @JPEG_A@ @PNG_A@ @ZLIB_A@ $(NOOP) -gracket@CGC@ : $(RACKETDEPS) mrmain.@LTO@ $(GRACKETOBJECTS) $(@WXLIBS@) $(MRSTATIC_STUB) +gracket@CGC@ : $(RACKETDEPS) grmain.@LTO@ $(GRACKETOBJECTS) $(@WXLIBS@) $(MRSTATIC_STUB) $(GRACKETLINKER) $(GRACKETLDFLAGS) $(MRSTATIC) -o gracket@CGC@ $(GRACKETOBJECTS) $(GRACKETLDLIBS) $(MRSTATIC_STUB) libgracket.@LIBSFX@: $(WXLIBSNORM) @@ -131,22 +131,22 @@ MRFW = GRacket.framework/Versions/$(FWVERSION)/GRacket MRFWRES = GRacket.framework/Versions/$(FWVERSION)/Resources/GRacket.rsrc $(MRFW) : $(RACKETDEPS) $(GRACKETOBJECTS) $(@WXLIBS@) $(MRSTATIC_STUB) $(MRFWRES) - $(GRACKETLINKER) $(GRACKETLDFLAGS) -dynamiclib -o $(MRFW) -Wl,-headerpad_max_install_names ../mzscheme/libracket.@LIBSFX@ ../mzscheme/libmzgc.@LIBSFX@ $(@WXLIBS@) $(GUILIBS_@WXVARIANT@) @X_EXTRA_LIBS@ + $(GRACKETLINKER) $(GRACKETLDFLAGS) -dynamiclib -o $(MRFW) -Wl,-headerpad_max_install_names ../racket/libracket.@LIBSFX@ ../racket/libmzgc.@LIBSFX@ $(@WXLIBS@) $(GUILIBS_@WXVARIANT@) @X_EXTRA_LIBS@ -GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@: $(MRFWRES) $(MRFW) mrmain.@LTO@ - $(GRACKETLINKER) $(GRACKETLDFLAGS) -o GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@ mrmain.@LTO@ -Wl,-headerpad_max_install_names -F. -framework GRacket -framework Carbon -framework Cocoa @PROFFLAGS@ +GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@: $(MRFWRES) $(MRFW) grmain.@LTO@ + $(GRACKETLINKER) $(GRACKETLDFLAGS) -o GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@ grmain.@LTO@ -Wl,-headerpad_max_install_names -F. -framework GRacket -framework Carbon -framework Cocoa @PROFFLAGS@ /usr/bin/install_name_tool -change "GRacket.framework/Versions/$(FWVERSION)/GRacket" "@executable_path/../../../GRacket.framework/Versions/$(FWVERSION)/GRacket" GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@ -$(MRFWRES): $(srcdir)/../mac/osx_appl.ss $(srcdir)/../mac/cw/MrEd.r +$(MRFWRES): $(srcdir)/../mac/osx_appl.ss $(srcdir)/../mac/cw/GRacket.r rm -rf GRacket.framework/Resources GRacket.framework/GRacket - env BUILDBASE=.. ../mzscheme/racket@CGC@ -cqu $(srcdir)/../mac/osx_appl.ss $(srcdir)/.. "@CGC@" + env BUILDBASE=.. ../racket/racket@CGC@ -cqu $(srcdir)/../mac/osx_appl.ss $(srcdir)/.. "@CGC@" ln -s Versions/$(FWVERSION)/GRacket GRacket.framework/GRacket ln -s Versions/$(FWVERSION)/Resources GRacket.framework/Resources -RACKET = ../mzscheme/racket@CGC@ +RACKET = ../racket/racket@CGC@ -ee-app: gracket mrmain_ee.@LTO@ - if [ "$(EEAPP)" = '' ] ; then echo "ERROR: You must specify EEAPP" ; else $(GRACKETLINKER) $(GRACKETLDFLAGS) $(MRSTATIC) -o $(EEAPP) mrmain_ee.@LTO@ $(EEOBJECTS) $(GRACKETLDLIBS) $(MRSTATIC_STUB) ; fi +ee-app: gracket grmain_ee.@LTO@ + if [ "$(EEAPP)" = '' ] ; then echo "ERROR: You must specify EEAPP" ; else $(GRACKETLINKER) $(GRACKETLDFLAGS) $(MRSTATIC) -o $(EEAPP) grmain_ee.@LTO@ $(EEOBJECTS) $(GRACKETLDLIBS) $(MRSTATIC_STUB) ; fi sunos4-static: dl_stub.@LTO@ $(MAKE) gracket MRSTATIC=-static MRSTATIC_STUB='dl_stub.@LTO@' LDNONSTATICLIBS='' @@ -169,39 +169,39 @@ wx_mac: wx_mac-min: cd ../wxmac/src; $(MAKE) min -mred.@LTO@ : $(srcdir)/mred.cxx \ - $(srcdir)/wxs/wxscheme.h $(srcdir)/mred.h \ - $(srcdir)/../mzscheme/include/scheme.h \ - $(srcdir)/wxs/wxsmred.h $(WXINCDEP) $(srcdir)/../wxcommon/wxGC.h \ +gracket.@LTO@ : $(srcdir)/gracket.cxx \ + $(srcdir)/wxs/wxscheme.h $(srcdir)/gracket.h \ + $(srcdir)/../racket/include/scheme.h \ + $(srcdir)/wxs/wxsgracket.h $(WXINCDEP) $(srcdir)/../wxcommon/wxGC.h \ $(srcdir)/../wxcommon/wx_list.h - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/mred.cxx -o mred.@LTO@ + $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/gracket.cxx -o gracket.@LTO@ DEF_COLLECTS_DIR = -DINITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../collects; pwd`"'"' -mrmain.@LTO@ : $(srcdir)/mrmain.cxx $(srcdir)/mred.h $(srcdir)/wxs/wxsmred.h \ - $(srcdir)/../mzscheme/cmdline.inc $(srcdir)/../mzscheme/src/stypes.h \ - $(srcdir)/../mzscheme/include/scheme.h - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) $(DEF_COLLECTS_DIR) -c $(srcdir)/mrmain.cxx -o mrmain.@LTO@ +grmain.@LTO@ : $(srcdir)/grmain.cxx $(srcdir)/gracket.h $(srcdir)/wxs/wxsgracket.h \ + $(srcdir)/../racket/cmdline.inc $(srcdir)/../racket/src/stypes.h \ + $(srcdir)/../racket/include/scheme.h + $(CXX) $(LOCALFLAGS) $(CXXFLAGS) $(DEF_COLLECTS_DIR) -c $(srcdir)/grmain.cxx -o grmain.@LTO@ -mrmain_ee.@LTO@ : mred.@LTO@ - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -DSTANDALONE_WITH_EMBEDDED_EXTENSION $(DEF_COLLECTS_DIR) -c $(srcdir)/mrmain.cxx -o mrmain_ee.@LTO@ +grmain_ee.@LTO@ : gracket.@LTO@ + $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -DSTANDALONE_WITH_EMBEDDED_EXTENSION $(DEF_COLLECTS_DIR) -c $(srcdir)/grmain.cxx -o grmain_ee.@LTO@ ee-main: - $(MAKE) mrmain_ee.@LTO@ + $(MAKE) grmain_ee.@LTO@ -mredx.@LTO@ : $(srcdir)/mredx.cxx $(srcdir)/../mzscheme/include/scheme.h $(srcdir)/mred.h \ +gracketx.@LTO@ : $(srcdir)/gracketx.cxx $(srcdir)/../racket/include/scheme.h $(srcdir)/gracket.h \ $(WXINCDEP) \ $(srcdir)/../wxcommon/wxGC.h $(srcdir)/../wxcommon/wx_list.h \ - $(srcdir)/../mzscheme/src/stypes.h - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/mredx.cxx -o mredx.@LTO@ + $(srcdir)/../racket/src/stypes.h + $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/gracketx.cxx -o gracketx.@LTO@ -mredmac.@LTO@ : $(srcdir)/mredmac.cxx $(srcdir)/../mzscheme/include/scheme.h $(srcdir)/mred.h \ +gracketmac.@LTO@ : $(srcdir)/gracketmac.cxx $(srcdir)/../racket/include/scheme.h $(srcdir)/gracket.h \ $(srcdir)/../wxcommon/wxGC.h $(srcdir)/../wxcommon/wx_list.h \ - $(srcdir)/../mzscheme/src/stypes.h - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/mredmac.cxx -o mredmac.@LTO@ + $(srcdir)/../racket/src/stypes.h + $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/gracketmac.cxx -o gracketmac.@LTO@ wxGC.@LTO@ : $(srcdir)/../wxcommon/wxGC.cxx $(srcdir)/../wxcommon/wxGC.h \ - $(srcdir)/../mzscheme/src/stypes.h + $(srcdir)/../racket/src/stypes.h $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/../wxcommon/wxGC.cxx -o wxGC.@LTO@ wxJPEG.@LTO@ : $(srcdir)/../wxcommon/wxJPEG.cxx $(srcdir)/../wxcommon/wxGC.h @@ -210,8 +210,8 @@ wxJPEG.@LTO@ : $(srcdir)/../wxcommon/wxJPEG.cxx $(srcdir)/../wxcommon/wxGC.h dl_stub.@LTO@: $(srcdir)/misc/dl_stub.c $(CC) $(CFLAGS) $(LOCALFLAGS) -c $(srcdir)/misc/dl_stub.c -o dl_stub.@LTO@ -simpledrop.@LTO@ : $(srcdir)/../mac/mzscheme/simpledrop.cpp - $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -o simpledrop.@LTO@ -c $(srcdir)/../mac/mzscheme/simpledrop.cpp +simpledrop.@LTO@ : $(srcdir)/../mac/racket/simpledrop.cpp + $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -o simpledrop.@LTO@ -c $(srcdir)/../mac/racket/simpledrop.cpp sgilinkhack.@LTO@: $(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/misc/sgilinkhack.cxx -o sgilinkhack.@LTO@ @@ -300,12 +300,12 @@ install-no-lib-cgc-wx_xt: echo "no dynamic libs" install-lib-cgc-wx_xt: - cd ..; $(ICP) mred/libgracket.@LIBSFX@ "$(DESTDIR)$(libdir)" + cd ..; $(ICP) gracket/libgracket.@LIBSFX@ "$(DESTDIR)$(libdir)" install-wx_xt-cgc: $(MAKE) @MRLIBINSTALL@-cgc-wx_xt - cd ..; $(ICP) mred/gracket@CGC@ "$(DESTDIR)$(bindir)/gracket@CGC_INSTALLED@" - $(RACKET) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(DESTDIR)$(bindir)/gracket@CGC_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ + cd ..; $(ICP) gracket/gracket@CGC@ "$(DESTDIR)$(bindir)/gracket@CGC_INSTALLED@" + $(RACKET) -cu "$(srcdir)/../racket/collects-path.ss" "$(DESTDIR)$(bindir)/gracket@CGC_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ install-wx_xt-cgc-final: $(NOOP) @@ -314,12 +314,12 @@ install-no-lib-3m-wx_xt: echo "no dynamic libs" install-lib-3m-wx_xt: - cd ..; $(ICP) mred/libgracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)" + cd ..; $(ICP) gracket/libgracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)" install-wx_xt-3m: $(MAKE) @MRLIBINSTALL@-3m-wx_xt - cd ..; $(ICP) mred/gracket@MMM@ "$(DESTDIR)$(bindir)/gracket@MMM_INSTALLED@" - $(RACKET) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(DESTDIR)$(bindir)/gracket@MMM_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ + cd ..; $(ICP) gracket/gracket@MMM@ "$(DESTDIR)$(bindir)/gracket@MMM_INSTALLED@" + $(RACKET) -cu "$(srcdir)/../racket/collects-path.ss" "$(DESTDIR)$(bindir)/gracket@MMM_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ install-wx_xt-3m-final: $(NOOP) @@ -344,12 +344,12 @@ install-wx_mac: install-wx_mac-cgc: mkdir -p "$(MRFWDIR)/Versions/$(FWVERSION)" - cd ..; $(ICP) -r mred/GRacket@CGC@.app "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app" + cd ..; $(ICP) -r gracket/GRacket@CGC@.app "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app" $(RACKET) -cqu "$(srcdir)/../mac/rename-app.ss" "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app" "GRacket@CGC@" "GRacket@CGC_CAP_INSTALLED@" $(ICP) GRacket.framework/Versions/$(FWVERSION)/GRacket $(MRFWDIR)/Versions/$(FWVERSION)/GRacket $(ICP) -r GRacket.framework/Versions/$(FWVERSION)/Resources $(MRFWDIR)/Versions/$(FWVERSION)/Resources /usr/bin/install_name_tool -change "@executable_path/../../../GRacket.framework/Versions/$(FWVERSION)/GRacket" "@FRAMEWORK_PREFIX@GRacket.framework/Versions/$(FWVERSION)/GRacket" "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" - $(RACKET) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" ../../../collects + $(RACKET) -cu "$(srcdir)/../racket/collects-path.ss" "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" ../../../collects @STRIP_DEBUG@ "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" install-wx_mac-cgc-final: @@ -358,12 +358,12 @@ install-wx_mac-cgc-final: install-wx_mac-3m: mkdir -p "$(MRFWDIR)/Versions/$(FWVERSION)_3m" - cd ..; $(ICP) -r "mred/GRacket@MMM@.app" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app" + cd ..; $(ICP) -r "gracket/GRacket@MMM@.app" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app" $(RACKET) -cqu "$(srcdir)/../mac/rename-app.ss" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app" "GRacket@MMM@" "GRacket@MMM_CAP_INSTALLED@" $(ICP) "GRacket.framework/Versions/$(FWVERSION)_3m/GRacket" "$(MRFWDIR)/Versions/$(FWVERSION)_3m/GRacket" $(ICP) -r "GRacket.framework/Versions/$(FWVERSION)_3m/Resources" "$(MRFWDIR)/Versions/$(FWVERSION)_3m/Resources" /usr/bin/install_name_tool -change "@executable_path/../../../GRacket.framework/Versions/$(FWVERSION)_3m/GRacket" "@FRAMEWORK_PREFIX@GRacket.framework/Versions/$(FWVERSION)_3m/GRacket" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" - $(RACKET) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" "../../../collects" + $(RACKET) -cu "$(srcdir)/../racket/collects-path.ss" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" "../../../collects" @STRIP_DEBUG@ "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" install-wx_mac-3m-final: @@ -373,11 +373,11 @@ install-wx_mac-3m-final: install-wx_mac-post-collects: cd ..; rm -rf $(collectsdir)/launcher/Starter.app mkdir -p $(collectsdir)/launcher - cd ..; $(ICP) -r mred/Starter.app $(collectsdir)/launcher/. + cd ..; $(ICP) -r gracket/Starter.app $(collectsdir)/launcher/. @INCLUDEDEP@ wxGC.d @INCLUDEDEP@ wxJPEG.d -@INCLUDEDEP@ mred.d -@INCLUDEDEP@ mredmac.d -@INCLUDEDEP@ mrmain.d +@INCLUDEDEP@ gracket.d +@INCLUDEDEP@ gracketmac.d +@INCLUDEDEP@ grmain.d diff --git a/src/gracket/README b/src/gracket/README new file mode 100644 index 0000000000..659068d9b8 --- /dev/null +++ b/src/gracket/README @@ -0,0 +1,7 @@ + +This is the GRacket source code directory. See ../README for information +on compiling it. + +Compiled binaries, documentation, and up-to-date information about +GRacket are at + http://www.racket-lang.org/ diff --git a/src/mred/gc2/Makefile.in b/src/gracket/gc2/Makefile.in similarity index 94% rename from src/mred/gc2/Makefile.in rename to src/gracket/gc2/Makefile.in index 52fbf9db68..ae09747655 100644 --- a/src/mred/gc2/Makefile.in +++ b/src/gracket/gc2/Makefile.in @@ -10,7 +10,7 @@ collectsdir = @collectsdir@ # for version.mak: mainsrcdir = @srcdir@/../.. -@INCLUDEDEP@ @srcdir@/../../mzscheme/version.mak +@INCLUDEDEP@ @srcdir@/../../racket/version.mak WXDIR = $(srcdir)/../../wxxt WXMACDIR = $(srcdir)/../../wxmac/src @@ -40,8 +40,8 @@ WXINC_wx_xt = -I$(PLTSRCDIR)/wxxt/src/AIAI-include -I$(PLTSRCDIR)/wxxt/src WXINC_wx_mac = -I$(PLTSRCDIR)/wxmac/include/base -I$(PLTSRCDIR)/wxmac/include/mac -I$(PLTSRCDIR)/wxcommon -I$(PLTSRCDIR)/a-list/c-headers/ WXINC = $(WXINC_@WXVARIANT@) -NOGCINC = $(WXINC) -I$(PLTBUILDDIR)/mzscheme/ -I$(PLTSRCDIR)/mzscheme/include/ -INC = -I$(PLTSRCDIR)/mzscheme/$(GCDIRECTORY) $(NOGCINC) +NOGCINC = $(WXINC) -I$(PLTBUILDDIR)/racket/ -I$(PLTSRCDIR)/racket/include/ +INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC) CXXFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @PREFLAGS@ CFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@ LDFLAGS = @LDFLAGS@ $(XLIB) @@ -58,25 +58,25 @@ ZLIB_INC = -I$(srcdir)/../../wxcommon/zlib PNG_A = ../../wxcommon/libpng/libpng.@LIBSFX@ XFORM_INC_wx_xt = -Dwx_xt @WX_MMD_FLAG@ -I$(WXDIR)/src/XWidgets -I$(WXDIR)/src -XFORM_INC_wx_mac = -Dwx_mac -DOS_X -MMD -DWX_CARBON -I$(WXMACDIR)/../utils/image/src -I$(WXMACDIR)/../contrib/wxxpm/libxpm.34b/lib -I$(WXMACDIR)/../../mac/mzscheme +XFORM_INC_wx_mac = -Dwx_mac -DOS_X -MMD -DWX_CARBON -I$(WXMACDIR)/../utils/image/src -I$(WXMACDIR)/../contrib/wxxpm/libxpm.34b/lib -I$(WXMACDIR)/../../mac/racket -MZMMM_wx_xt = ../../mzscheme/racket@MMM@ -MZMMM_wx_mac = ../../mzscheme/racket@MMM@ +MZMMM_wx_xt = ../../racket/racket@MMM@ +MZMMM_wx_mac = ../../racket/racket@MMM@ MZMMM = $(MZMMM_@WXVARIANT@) -XFORM_CMD = $(MZMMM) -cqu $(srcdir)/../../mzscheme/gc2/xform.ss --setup ../../mzscheme/gc2 -XFORM_CPP_ARGS = -I$(srcdir)/../../mzscheme/gc2 $(NOGCINC) $(XINCLUDE) $(OPTIONS) @PREFLAGS@ $(XFORM_INC_@WXVARIANT@) @JPEG_INC@ @ZLIB_INC@ +XFORM_CMD = $(MZMMM) -cqu $(srcdir)/../../racket/gc2/xform.ss --setup ../../racket/gc2 +XFORM_CPP_ARGS = -I$(srcdir)/../../racket/gc2 $(NOGCINC) $(XINCLUDE) $(OPTIONS) @PREFLAGS@ $(XFORM_INC_@WXVARIANT@) @JPEG_INC@ @ZLIB_INC@ XFORMXX = $(XFORM_CMD) --cpp "$(CXXCPP) $(XFORM_CPP_ARGS)" @XFORMFLAGS@ -o XFORM = $(XFORM_CMD) --cpp "$(CPP) $(XFORM_CPP_ARGS)" @XFORMFLAGS@ -o -XFORMDEP = $(srcdir)/../../mzscheme/gc2/xform.ss $(srcdir)/../../mzscheme/gc2/xform-mod.ss $(srcdir)/../../mzscheme/gc2/gc2.h +XFORMDEP = $(srcdir)/../../racket/gc2/xform.ss $(srcdir)/../../racket/gc2/xform-mod.ss $(srcdir)/../../racket/gc2/gc2.h -NONPRECOMPDEP = $(srcdir)/../../mzscheme/include/schthread.h +NONPRECOMPDEP = $(srcdir)/../../racket/include/schthread.h WXBDIR=../../wxxt WXMACBDIR=../../wxmac/src -GRACKETLDFLAGS = -L$(WXBDIR)/utils/image/src -L$(WXBDIR)/contrib/xpm/lib $(LDFLAGS) -L../../mzscheme -L../wxs -L$(WXBDIR)/src +GRACKETLDFLAGS = -L$(WXBDIR)/utils/image/src -L$(WXBDIR)/contrib/xpm/lib $(LDFLAGS) -L../../racket -L../wxs -L$(WXBDIR)/src DEF_COLLECTS_DIR = +D INITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../../collects; pwd`"'"' @@ -215,8 +215,8 @@ xsrc/wx_xbm.cc: $(WXDIR)/utils/image/src/wx_xbm.cc $(XFORMDEP) MACXPRECOMP = macxsrc/xform_precomp.h MACXPRECOMPDEP = -macxsrc/xform_precomp.h : $(XFORMDEP) $(srcdir)/macprecomp.cxx $(srcdir)/../../mzscheme/src/schvers.h \ - $(srcdir)/../../mzscheme/src/schemef.h +macxsrc/xform_precomp.h : $(XFORMDEP) $(srcdir)/macprecomp.cxx $(srcdir)/../../racket/src/schvers.h \ + $(srcdir)/../../racket/src/schemef.h env XFORM_PRECOMP=yes $(XFORMXX) $(MACXPRECOMP) $(srcdir)/macprecomp.cxx @INCLUDEDEP@ macprecomp.dd @@ -362,8 +362,8 @@ macxsrc/wx_image.cc: $(WXMACDIR)/../utils/image/src/wx_image.cc $(XFORMDEP) $(MA $(XFORMWP) macxsrc/wx_image.cc $(WXMACDIR)/../utils/image/src/wx_image.cc macxsrc/wx_xbm.cc: $(WXMACDIR)/../utils/image/src/wx_xbm.cc $(XFORMDEP) $(MACXPRECOMPDEP) $(XFORMWP) macxsrc/wx_xbm.cc $(WXMACDIR)/../utils/image/src/wx_xbm.cc -macxsrc/simpledrop.cc: $(srcdir)/../../mac/mzscheme/simpledrop.cpp $(NONPRECOMPDEP) $(XFORMDEP) - $(XFORMXX) macxsrc/simpledrop.cc $(srcdir)/../../mac/mzscheme/simpledrop.cpp +macxsrc/simpledrop.cc: $(srcdir)/../../mac/racket/simpledrop.cpp $(NONPRECOMPDEP) $(XFORMDEP) + $(XFORMXX) macxsrc/simpledrop.cc $(srcdir)/../../mac/racket/simpledrop.cpp wx_xt_XFORMPRECOMP = wx_mac_XFORMPRECOMP = $(MACXPRECOMPDEP) @@ -373,20 +373,20 @@ XFORMPRECOMPDEP = xsrc/wxscheme.cc: $(srcdir)/../wxs/wxscheme.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) $(XFORMWP) xsrc/wxscheme.cc $(srcdir)/../wxs/wxscheme.cxx -xsrc/xcglue.c: $(srcdir)/../../mzscheme/utils/xcglue.c $(NONPRECOMPDEP) $(XFORMDEP) - $(XFORM) xsrc/xcglue.c $(srcdir)/../../mzscheme/utils/xcglue.c +xsrc/xcglue.c: $(srcdir)/../../racket/utils/xcglue.c $(NONPRECOMPDEP) $(XFORMDEP) + $(XFORM) xsrc/xcglue.c $(srcdir)/../../racket/utils/xcglue.c -xsrc/mred.cc: $(srcdir)/../mred.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/mred.cc $(srcdir)/../mred.cxx +xsrc/gracket.cc: $(srcdir)/../gracket.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) + $(XFORMWP) xsrc/gracket.cc $(srcdir)/../gracket.cxx -xsrc/mrmain.cc: $(srcdir)/../mrmain.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/mrmain.cc $(DEF_COLLECTS_DIR) $(srcdir)/../mrmain.cxx +xsrc/grmain.cc: $(srcdir)/../grmain.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) + $(XFORMWP) xsrc/grmain.cc $(DEF_COLLECTS_DIR) $(srcdir)/../grmain.cxx -xsrc/mredx.cc: $(srcdir)/../mredx.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/mredx.cc $(srcdir)/../mredx.cxx -xsrc/mredmac.cc: $(srcdir)/../mredmac.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) - $(XFORMWP) xsrc/mredmac.cc $(srcdir)/../mredmac.cxx +xsrc/gracketx.cc: $(srcdir)/../gracketx.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) + $(XFORMWP) xsrc/gracketx.cc $(srcdir)/../gracketx.cxx +xsrc/gracketmac.cc: $(srcdir)/../gracketmac.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) + $(XFORMWP) xsrc/gracketmac.cc $(srcdir)/../gracketmac.cxx xsrc/wxs_bmap.cc: $(srcdir)/../wxs/wxs_bmap.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) $(XFORMWP) xsrc/wxs_bmap.cc $(srcdir)/../wxs/wxs_bmap.cxx @@ -434,7 +434,7 @@ xsrc/wxs_win.cc: $(srcdir)/../wxs/wxs_win.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) xsrc/wxJPEG.cc: $(srcdir)/../../wxcommon/wxJPEG.cxx $(XFORMDEP) $(XFORMPRECOMPDEP) $(XFORMWP) xsrc/wxJPEG.cc $(srcdir)/../../wxcommon/wxJPEG.cxx -GCPREINC = -include $(srcdir)/../../mzscheme/gc2/gc2.h +GCPREINC = -include $(srcdir)/../../racket/gc2/gc2.h POSTFLAGS = $(OPTIONS) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ XXPOSTFLAGS = $(OPTIONS) @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @@ -768,21 +768,21 @@ wxs_win.@LTO@: xsrc/wxs_win.cc $(PRECOMPDEP) wxJPEG.@LTO@: xsrc/wxJPEG.cc $(PRECOMPDEP) $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o wxJPEG.@LTO@ xsrc/wxJPEG.cc -mred.@LTO@: xsrc/mred.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mred.@LTO@ xsrc/mred.cc -mrmain.@LTO@: xsrc/mrmain.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mrmain.@LTO@ xsrc/mrmain.cc -mredx.@LTO@: xsrc/mredx.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mredx.@LTO@ xsrc/mredx.cc -mredmac.@LTO@: xsrc/mredmac.cc $(PRECOMPDEP) - $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o mredmac.@LTO@ xsrc/mredmac.cc +gracket.@LTO@: xsrc/gracket.cc $(PRECOMPDEP) + $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o gracket.@LTO@ xsrc/gracket.cc +grmain.@LTO@: xsrc/grmain.cc $(PRECOMPDEP) + $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o grmain.@LTO@ xsrc/grmain.cc +gracketx.@LTO@: xsrc/gracketx.cc $(PRECOMPDEP) + $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o gracketx.@LTO@ xsrc/gracketx.cc +gracketmac.@LTO@: xsrc/gracketmac.cc $(PRECOMPDEP) + $(CXX) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(XXPOSTFLAGS) -o gracketmac.@LTO@ xsrc/gracketmac.cc xcglue.@LTO@: xsrc/xcglue.c $(CC) -DGC2_JUST_MACROS $(GCPREINC) -c $(CFLAGS) -o xcglue.@LTO@ xsrc/xcglue.c wxGC.@LTO@: $(srcdir)/../../wxcommon/wxGC.cxx $(srcdir)/../../wxcommon/wxGC.h \ - $(srcdir)/../../mzscheme/gc2/gc2.h $(srcdir)/../../mzscheme/src/stypes.h - $(CXX) -DMZ_PRECISE_GC -I$(srcdir)/../../mzscheme/gc2/ $(CXXFLAGS) -c -o wxGC.@LTO@ $(srcdir)/../../wxcommon/wxGC.cxx + $(srcdir)/../../racket/gc2/gc2.h $(srcdir)/../../racket/src/stypes.h + $(CXX) -DMZ_PRECISE_GC -I$(srcdir)/../../racket/gc2/ $(CXXFLAGS) -c -o wxGC.@LTO@ $(srcdir)/../../wxcommon/wxGC.cxx wx_xt_XSRCS = \ xsrc/Window.cc \ @@ -929,8 +929,8 @@ wx_mac_XSRCS = \ \ macxsrc/simpledrop.cc -GRACKET_wx_xt = mredx -GRACKET_wx_mac = mredmac +GRACKET_wx_xt = gracketx +GRACKET_wx_mac = gracketmac GRACKET_XSRCS = \ xsrc/wxs_bmap.cc \ @@ -959,8 +959,8 @@ GRACKET_XSRCS = \ \ xsrc/wxJPEG.cc \ \ - xsrc/mred.cc \ - xsrc/mrmain.cc \ + xsrc/gracket.cc \ + xsrc/grmain.cc \ xsrc/$(GRACKET_@WXVARIANT@).cc XSRCS = $(@WXVARIANT@_XSRCS) $(GRACKET_XSRCS) @@ -1136,7 +1136,7 @@ GRACKET_XOBJS = \ \ wxJPEG.@LTO@ \ \ - mred.@LTO@ \ + gracket.@LTO@ \ $(GRACKET_@WXVARIANT@).@LTO@ \ \ xcglue.@LTO@ \ @@ -1144,7 +1144,7 @@ GRACKET_XOBJS = \ XOBJS = $(@WXVARIANT@_XOBJS) $(GRACKET_XOBJS) -MZOBJS = ../../mzscheme/libracket3m.@LIBSFX@ +MZOBJS = ../../racket/libracket3m.@LIBSFX@ wx_xt_PLAIN_OBJS = \ ../../wxxt/src/XWidgets/xwArrow.@LTO@ \ @@ -1224,9 +1224,9 @@ FOREIGN_USED_OBJSLIB = $(FOREIGN_OBJSLIB) FOREIGN_NOT_USED_LIB = FOREIGN_NOT_USED_OBJSLIB = -EXTRA_GMP := $(if @EXTRA_GMP_OBJ@,../../mzscheme/src/@EXTRA_GMP_OBJ@,) +EXTRA_GMP := $(if @EXTRA_GMP_OBJ@,../../racket/src/@EXTRA_GMP_OBJ@,) -EXTRA_MZ_OBJS = ../../mzscheme/src/gmp.@LTO@ $(EXTRA_GMP) ../../mzscheme/src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) +EXTRA_MZ_OBJS = ../../racket/src/gmp.@LTO@ $(EXTRA_GMP) ../../racket/src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) LIBGRACKETLIBS_a = LIBGRACKETLIBS_la = $(LDFLAGS) $(LDLIBS) $(@WXVARIANT@_LIBS) @@ -1241,26 +1241,26 @@ GRACKETMZOBJS_la = $(AR) $(ARFLAGS) ../libgracket3m.@LIBSFX@ $(XOBJS) $(LIBGRACKETMZOBJS_@LIBSFX@) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) $(LIBGRACKETLIBS_@LIBSFX@) $(RANLIB) ../libgracket3m.@LIBSFX@ -../gracket@MMM@@NOT_OSX@: mrmain.@LTO@ ../libgracket3m.@LIBSFX@ - $(GRACKETLINKER) $(GRACKETLDFLAGS) -o ../gracket@MMM@ mrmain.@LTO@ ../libgracket3m.@LIBSFX@ $(GRACKETMZOBJS_@LIBSFX@) $(GRACKETLIBS_@LIBSFX@) +../gracket@MMM@@NOT_OSX@: grmain.@LTO@ ../libgracket3m.@LIBSFX@ + $(GRACKETLINKER) $(GRACKETLDFLAGS) -o ../gracket@MMM@ grmain.@LTO@ ../libgracket3m.@LIBSFX@ $(GRACKETMZOBJS_@LIBSFX@) $(GRACKETLIBS_@LIBSFX@) MRFW = GRacket.framework/Versions/$(FWVERSION)_3m/GRacket MRFWRES = GRacket.framework/Versions/$(FWVERSION)_3m/Resources/GRacket.rsrc -../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@: $(MRFWRES) $(MRFW) mrmain.@LTO@ - $(GRACKETLINKER) $(LDFLAGS) -o ../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@ mrmain.@LTO@ -Wl,-headerpad_max_install_names -F. -framework GRacket -framework Carbon -framework Cocoa +../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@: $(MRFWRES) $(MRFW) grmain.@LTO@ + $(GRACKETLINKER) $(LDFLAGS) -o ../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@ grmain.@LTO@ -Wl,-headerpad_max_install_names -F. -framework GRacket -framework Carbon -framework Cocoa mkdir -p "../GRacket.framework/Versions/$(FWVERSION)_3m" cp "$(MRFW)" "../$(MRFW)" rm -rf "../GRacket.framework/Versions/$(FWVERSION)_3m/Resources" cp -r "GRacket.framework/Versions/$(FWVERSION)_3m/Resources" "../GRacket.framework/Versions/$(FWVERSION)_3m/Resources" /usr/bin/install_name_tool -change "GRacket.framework/Versions/$(FWVERSION)_3m/GRacket" "@executable_path/../../../GRacket.framework/Versions/$(FWVERSION)_3m/GRacket" "../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@" -$(MRFW) : $(XOBJS) $(@WXVARIANT@_PLAIN_OBJS) ../../mzscheme/libracket3m.@LIBSFX@ wx_font.o wx_file_dialog.o $(MRFWRES) - $(GRACKETLINKER) $(LDFLAGS) -dynamiclib -o $(MRFW) -Wl,-headerpad_max_install_names $(XOBJS) $(@WXVARIANT@_PLAIN_OBJS) ../../mzscheme/libracket3m.@LIBSFX@ $(@WXVARIANT@_LIBS) @X_EXTRA_LIBS@ wx_font.o wx_file_dialog.o +$(MRFW) : $(XOBJS) $(@WXVARIANT@_PLAIN_OBJS) ../../racket/libracket3m.@LIBSFX@ wx_font.o wx_file_dialog.o $(MRFWRES) + $(GRACKETLINKER) $(LDFLAGS) -dynamiclib -o $(MRFW) -Wl,-headerpad_max_install_names $(XOBJS) $(@WXVARIANT@_PLAIN_OBJS) ../../racket/libracket3m.@LIBSFX@ $(@WXVARIANT@_LIBS) @X_EXTRA_LIBS@ wx_font.o wx_file_dialog.o -$(MRFWRES): $(srcdir)/../../mac/osx_appl.ss $(srcdir)/../../mac/cw/MrEd.r +$(MRFWRES): $(srcdir)/../../mac/osx_appl.ss $(srcdir)/../../mac/cw/GRacket.r rm -rf GRacket.framework/Resources GRacket.framework/GRacket - env BUILDBASE=../.. BUILDING_3M=yes ../../mzscheme/racket@CGC@ -cqu $(srcdir)/../../mac/osx_appl.ss $(srcdir)/../.. "@MMM@" + env BUILDBASE=../.. BUILDING_3M=yes ../../racket/racket@CGC@ -cqu $(srcdir)/../../mac/osx_appl.ss $(srcdir)/../.. "@MMM@" ln -s Versions/$(FWVERSION)_3m/GRacket GRacket.framework/GRacket ln -s Versions/$(FWVERSION)_3m/Resources GRacket.framework/Resources @@ -1284,12 +1284,12 @@ XSRC_EXTRA_DIR_wx_mac = macxsrc ######################################## gen-deps: - ../../mzscheme/racket@MMM@ -cqu "$(srcdir)/gen-deps.ss" + ../../racket/racket@MMM@ -cqu "$(srcdir)/gen-deps.ss" -@INCLUDEDEP@ mrmain.dd -@INCLUDEDEP@ mred.dd -@INCLUDEDEP@ mredx.dd -@INCLUDEDEP@ mredmac.dd +@INCLUDEDEP@ grmain.dd +@INCLUDEDEP@ gracket.dd +@INCLUDEDEP@ gracketx.dd +@INCLUDEDEP@ gracketmac.dd @INCLUDEDEP@ wb_item.dd @INCLUDEDEP@ wb_panel.dd @INCLUDEDEP@ wb_timer.dd diff --git a/src/mred/gc2/gen-deps.ss b/src/gracket/gc2/gen-deps.ss similarity index 100% rename from src/mred/gc2/gen-deps.ss rename to src/gracket/gc2/gen-deps.ss diff --git a/src/mred/gc2/macprecomp.cxx b/src/gracket/gc2/macprecomp.cxx similarity index 100% rename from src/mred/gc2/macprecomp.cxx rename to src/gracket/gc2/macprecomp.cxx diff --git a/src/mred/gc2/precomp.cxx b/src/gracket/gc2/precomp.cxx similarity index 100% rename from src/mred/gc2/precomp.cxx rename to src/gracket/gc2/precomp.cxx diff --git a/src/mred/mred.cxx b/src/gracket/gracket.cxx similarity index 99% rename from src/mred/mred.cxx rename to src/gracket/gracket.cxx index 94f8b6f6aa..8fdd7ba464 100644 --- a/src/mred/mred.cxx +++ b/src/gracket/gracket.cxx @@ -103,7 +103,7 @@ extern "C" void _signal_nobind(...); #define INTERRUPT_CHECK_ON 0 # include "wxs/wxscheme.h" -# include "wxs/wxsmred.h" +# include "wxs/wxsgracket.h" # include "wxs/wxs_fram.h" # include "wxs/wxs_obj.h" @@ -120,7 +120,7 @@ extern void wxMouseEventHandled(void); extern int wx_single_instance; #endif -#include "mred.h" +#include "gracket.h" #ifdef MPW_CPLUS extern "C" { diff --git a/src/mred/mred.h b/src/gracket/gracket.h similarity index 99% rename from src/mred/mred.h rename to src/gracket/gracket.h index 5d28ba8cbc..f723f06a30 100644 --- a/src/mred/mred.h +++ b/src/gracket/gracket.h @@ -176,7 +176,7 @@ MRED_EXTERN void mred_set_finish_cmd_line_run(MrEd_Finish_Cmd_Line_Run_Proc); MRED_EXTERN MrEd_Run_From_Cmd_Line_Proc mred_run_from_cmd_line; MRED_EXTERN void mred_set_run_from_cmd_line(MrEd_Run_From_Cmd_Line_Proc); -# include "../mzscheme/src/schvers.h" +# include "../racket/src/schvers.h" #ifdef MZ_PRECISE_GC /* don't print " [3m]", which is the default: */ diff --git a/src/mred/mredmac.cxx b/src/gracket/gracketmac.cxx similarity index 99% rename from src/mred/mredmac.cxx rename to src/gracket/gracketmac.cxx index 9dea7170f0..b44b4ae715 100644 --- a/src/mred/mredmac.cxx +++ b/src/gracket/gracketmac.cxx @@ -18,7 +18,7 @@ #include "wx_macevents.h" #include "wx_het.h" -#include "mred.h" +#include "gracket.h" #include #include diff --git a/src/mred/mredmsw.cxx b/src/gracket/gracketmsw.cxx similarity index 99% rename from src/mred/mredmsw.cxx rename to src/gracket/gracketmsw.cxx index 1a2b1425e9..ef55c423c8 100644 --- a/src/mred/mredmsw.cxx +++ b/src/gracket/gracketmsw.cxx @@ -16,7 +16,7 @@ #include "scheme.h" #include "wx_dialg.h" -#include "mred.h" +#include "gracket.h" #pragma optimize("", off) @@ -33,7 +33,7 @@ void mred_log_msg(const char *msg, ...); #define OS_SEMAPHORE_TYPE HANDLE -#include "../mzscheme/src/schwinfd.h" +#include "../racket/src/schwinfd.h" #include diff --git a/src/mred/mredx.cxx b/src/gracket/gracketx.cxx similarity index 99% rename from src/mred/mredx.cxx rename to src/gracket/gracketx.cxx index 6a9c44447d..5a7a813d2f 100644 --- a/src/mred/mredx.cxx +++ b/src/gracket/gracketx.cxx @@ -16,7 +16,7 @@ #include "wx_clipb.h" #include "scheme.h" -#include "mred.h" +#include "gracket.h" #include diff --git a/src/mred/mrmain.cxx b/src/gracket/grmain.cxx similarity index 99% rename from src/mred/mrmain.cxx rename to src/gracket/grmain.cxx index 5ec59cf904..f440ebe4c3 100644 --- a/src/mred/mrmain.cxx +++ b/src/gracket/grmain.cxx @@ -34,9 +34,9 @@ class wxStandardSnipClassList; class wxBufferDataClassList; #include "wxs/wxscheme.h" -#include "wxs/wxsmred.h" +#include "wxs/wxsgracket.h" -#include "mred.h" +#include "gracket.h" #ifdef wx_mac extern char *wx_original_argv_zero; @@ -143,7 +143,7 @@ static char *pltcollects_from_resource; #define YIELD_BEFORE_EXIT #define INITIAL_NAMESPACE_MODULE "racket/gui/init" -# include "../mzscheme/cmdline.inc" +# include "../racket/cmdline.inc" #ifdef wx_x #if INTERRUPT_CHECK_ON diff --git a/src/mred/misc/checkm.c b/src/gracket/misc/checkm.c similarity index 100% rename from src/mred/misc/checkm.c rename to src/gracket/misc/checkm.c diff --git a/src/mred/misc/dl_stub.c b/src/gracket/misc/dl_stub.c similarity index 100% rename from src/mred/misc/dl_stub.c rename to src/gracket/misc/dl_stub.c diff --git a/src/mred/misc/sgilinkhack.cxx b/src/gracket/misc/sgilinkhack.cxx similarity index 100% rename from src/mred/misc/sgilinkhack.cxx rename to src/gracket/misc/sgilinkhack.cxx diff --git a/src/mred/wxs/Makefile.in b/src/gracket/wxs/Makefile.in similarity index 95% rename from src/mred/wxs/Makefile.in rename to src/gracket/wxs/Makefile.in index bf7dfd28cb..0f127598bf 100644 --- a/src/mred/wxs/Makefile.in +++ b/src/gracket/wxs/Makefile.in @@ -27,8 +27,8 @@ WXINC_wx_xt = -I$(PLTSRCDIR)/wxxt/src/AIAI-include -I$(PLTSRCDIR)/wxxt/src WXINC_wx_mac = -I$(PLTSRCDIR)/wxmac/include/base -I$(PLTSRCDIR)/wxmac/include/mac -I$(PLTSRCDIR)/wxcommon -I$(PLTSRCDIR)/a-list/c-headers/ WXINC = $(WXINC_@WXVARIANT@) -NOGCINC = $(WXINC) -I$(PLTSRCDIR)/mred/wxme/ -I$(PLTBUILDDIR)/mzscheme/ -I$(PLTSRCDIR)/mzscheme/include/ -INC = -I$(PLTSRCDIR)/mzscheme/$(GCDIRECTORY) $(NOGCINC) +NOGCINC = $(WXINC) -I$(PLTSRCDIR)/gracket/wxme/ -I$(PLTBUILDDIR)/racket/ -I$(PLTSRCDIR)/racket/include/ +INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC) CXXFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @PREFLAGS@ CFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@ LDFLAGS = $(XLIB) @@ -54,8 +54,8 @@ OBJECTHEADER_wx_xt = $(srcdir)/../../wxxt/src/DataStructures/Object.h OBJECTHEADER_wx_mac = $(srcdir)/../../wxmac/include/base/wx_obj.h WXPRECOMPDIR = ../../wxmac/src -WXSCHEMEHEADERS = $(srcdir)/wxscheme.h $(srcdir)/../../mzscheme/src/stypes.h $(srcdir)/../../mzscheme/utils/xcglue.h \ - $(srcdir)/../../mzscheme/include/scheme.h $(OBJECTHEADER_@WXVARIANT@) \ +WXSCHEMEHEADERS = $(srcdir)/wxscheme.h $(srcdir)/../../racket/src/stypes.h $(srcdir)/../../racket/utils/xcglue.h \ + $(srcdir)/../../racket/include/scheme.h $(OBJECTHEADER_@WXVARIANT@) \ $(srcdir)/../../wxcommon/wxGC.h $(srcdir)/../../wxcommon/wx_list.h @WXPRECOMP@ @@ -147,8 +147,8 @@ repatriate: mv $(HIDEDIR)/wxs_objects/objects . rmdir $(HIDEDIR)/wxs_objects -XCTOCXX = $(PERL) $(srcdir)/../../mzscheme/utils/xctocc -cxx -XCDEPEND = $(srcdir)/../../mzscheme/utils/xctocc $(srcdir)/wxs.xci $(srcdir)/prefix.xci +XCTOCXX = $(PERL) $(srcdir)/../../racket/utils/xctocc -cxx +XCDEPEND = $(srcdir)/../../racket/utils/xctocc $(srcdir)/wxs.xci $(srcdir)/prefix.xci CB_DEPEND = $(srcdir)/cb_start.xci $(srcdir)/cb_end.xci $(srcdir)/cbgen_s.xci LIST_DEPEND = $(srcdir)/list.xci @@ -202,11 +202,11 @@ $(srcdir)/wxs_win.cxx : $(srcdir)/wxs_win.xc $(srcdir)/wxs_win.xci $(XCDEPEND) WXSCC = $(CXX) @USE_WXPRECOMP@ $(WXSCXXFLAGS) $(CXXDEPFLAGS) $(LOCALFLAGS) -c -wxscheme.@LTO@ : $(srcdir)/wxscheme.cxx $(WXSCHEMEHEADERS) $(DCHEADERS) $(srcdir)/wxsmred.h +wxscheme.@LTO@ : $(srcdir)/wxscheme.cxx $(WXSCHEMEHEADERS) $(DCHEADERS) $(srcdir)/wxsgracket.h $(WXSCC) $(srcdir)/wxscheme.cxx -o wxscheme.@LTO@ -xcglue.@LTO@ : $(srcdir)/../../mzscheme/utils/xcglue.c $(srcdir)/../../mzscheme/utils/xcglue.h $(WXSCHEMEHEADERS) - $(CC) $(WXSCFLAGS) $(CDEPFLAGS) $(LOCALFLAGS) -c $(srcdir)/../../mzscheme/utils/xcglue.c -o xcglue.@LTO@ +xcglue.@LTO@ : $(srcdir)/../../racket/utils/xcglue.c $(srcdir)/../../racket/utils/xcglue.h $(WXSCHEMEHEADERS) + $(CC) $(WXSCFLAGS) $(CDEPFLAGS) $(LOCALFLAGS) -c $(srcdir)/../../racket/utils/xcglue.c -o xcglue.@LTO@ wxs_bmap.@LTO@ : $(srcdir)/wxs_bmap.cxx $(WXSCHEMEHEADERS) $(WXSCC) $(srcdir)/wxs_bmap.cxx -o wxs_bmap.@LTO@ diff --git a/src/mred/wxs/cb_end.xci b/src/gracket/wxs/cb_end.xci similarity index 100% rename from src/mred/wxs/cb_end.xci rename to src/gracket/wxs/cb_end.xci diff --git a/src/mred/wxs/cb_start.xci b/src/gracket/wxs/cb_start.xci similarity index 100% rename from src/mred/wxs/cb_start.xci rename to src/gracket/wxs/cb_start.xci diff --git a/src/mred/wxs/cbgen_s.xci b/src/gracket/wxs/cbgen_s.xci similarity index 100% rename from src/mred/wxs/cbgen_s.xci rename to src/gracket/wxs/cbgen_s.xci diff --git a/src/mred/wxs/danger.tst b/src/gracket/wxs/danger.tst similarity index 100% rename from src/mred/wxs/danger.tst rename to src/gracket/wxs/danger.tst diff --git a/src/mred/wxs/khead.ss b/src/gracket/wxs/khead.ss similarity index 100% rename from src/mred/wxs/khead.ss rename to src/gracket/wxs/khead.ss diff --git a/src/mred/wxs/ktail.ss b/src/gracket/wxs/ktail.ss similarity index 100% rename from src/mred/wxs/ktail.ss rename to src/gracket/wxs/ktail.ss diff --git a/src/mred/wxs/list.xci b/src/gracket/wxs/list.xci similarity index 100% rename from src/mred/wxs/list.xci rename to src/gracket/wxs/list.xci diff --git a/src/mred/wxs/mrdispatch.h b/src/gracket/wxs/mrdispatch.h similarity index 100% rename from src/mred/wxs/mrdispatch.h rename to src/gracket/wxs/mrdispatch.h diff --git a/src/mred/wxs/prefix.xci b/src/gracket/wxs/prefix.xci similarity index 100% rename from src/mred/wxs/prefix.xci rename to src/gracket/wxs/prefix.xci diff --git a/src/mred/wxs/range.xci b/src/gracket/wxs/range.xci similarity index 100% rename from src/mred/wxs/range.xci rename to src/gracket/wxs/range.xci diff --git a/src/mred/wxs/vector.xci b/src/gracket/wxs/vector.xci similarity index 100% rename from src/mred/wxs/vector.xci rename to src/gracket/wxs/vector.xci diff --git a/src/mred/wxs/wxs.xci b/src/gracket/wxs/wxs.xci similarity index 100% rename from src/mred/wxs/wxs.xci rename to src/gracket/wxs/wxs.xci diff --git a/src/mred/wxs/wxs_bkt.xci b/src/gracket/wxs/wxs_bkt.xci similarity index 100% rename from src/mred/wxs/wxs_bkt.xci rename to src/gracket/wxs/wxs_bkt.xci diff --git a/src/mred/wxs/wxs_bmap.cxx b/src/gracket/wxs/wxs_bmap.cxx similarity index 100% rename from src/mred/wxs/wxs_bmap.cxx rename to src/gracket/wxs/wxs_bmap.cxx diff --git a/src/mred/wxs/wxs_bmap.h b/src/gracket/wxs/wxs_bmap.h similarity index 100% rename from src/mred/wxs/wxs_bmap.h rename to src/gracket/wxs/wxs_bmap.h diff --git a/src/mred/wxs/wxs_bmap.xc b/src/gracket/wxs/wxs_bmap.xc similarity index 100% rename from src/mred/wxs/wxs_bmap.xc rename to src/gracket/wxs/wxs_bmap.xc diff --git a/src/mred/wxs/wxs_bmt.xci b/src/gracket/wxs/wxs_bmt.xci similarity index 100% rename from src/mred/wxs/wxs_bmt.xci rename to src/gracket/wxs/wxs_bmt.xci diff --git a/src/mred/wxs/wxs_butn.cxx b/src/gracket/wxs/wxs_butn.cxx similarity index 100% rename from src/mred/wxs/wxs_butn.cxx rename to src/gracket/wxs/wxs_butn.cxx diff --git a/src/mred/wxs/wxs_butn.h b/src/gracket/wxs/wxs_butn.h similarity index 100% rename from src/mred/wxs/wxs_butn.h rename to src/gracket/wxs/wxs_butn.h diff --git a/src/mred/wxs/wxs_butn.xc b/src/gracket/wxs/wxs_butn.xc similarity index 100% rename from src/mred/wxs/wxs_butn.xc rename to src/gracket/wxs/wxs_butn.xc diff --git a/src/mred/wxs/wxs_char.xci b/src/gracket/wxs/wxs_char.xci similarity index 100% rename from src/mred/wxs/wxs_char.xci rename to src/gracket/wxs/wxs_char.xci diff --git a/src/mred/wxs/wxs_chce.cxx b/src/gracket/wxs/wxs_chce.cxx similarity index 100% rename from src/mred/wxs/wxs_chce.cxx rename to src/gracket/wxs/wxs_chce.cxx diff --git a/src/mred/wxs/wxs_chce.h b/src/gracket/wxs/wxs_chce.h similarity index 100% rename from src/mred/wxs/wxs_chce.h rename to src/gracket/wxs/wxs_chce.h diff --git a/src/mred/wxs/wxs_chce.xc b/src/gracket/wxs/wxs_chce.xc similarity index 100% rename from src/mred/wxs/wxs_chce.xc rename to src/gracket/wxs/wxs_chce.xc diff --git a/src/mred/wxs/wxs_ckbx.cxx b/src/gracket/wxs/wxs_ckbx.cxx similarity index 100% rename from src/mred/wxs/wxs_ckbx.cxx rename to src/gracket/wxs/wxs_ckbx.cxx diff --git a/src/mred/wxs/wxs_ckbx.h b/src/gracket/wxs/wxs_ckbx.h similarity index 100% rename from src/mred/wxs/wxs_ckbx.h rename to src/gracket/wxs/wxs_ckbx.h diff --git a/src/mred/wxs/wxs_ckbx.xc b/src/gracket/wxs/wxs_ckbx.xc similarity index 100% rename from src/mred/wxs/wxs_ckbx.xc rename to src/gracket/wxs/wxs_ckbx.xc diff --git a/src/mred/wxs/wxs_cnvs.cxx b/src/gracket/wxs/wxs_cnvs.cxx similarity index 100% rename from src/mred/wxs/wxs_cnvs.cxx rename to src/gracket/wxs/wxs_cnvs.cxx diff --git a/src/mred/wxs/wxs_cnvs.h b/src/gracket/wxs/wxs_cnvs.h similarity index 100% rename from src/mred/wxs/wxs_cnvs.h rename to src/gracket/wxs/wxs_cnvs.h diff --git a/src/mred/wxs/wxs_cnvs.xc b/src/gracket/wxs/wxs_cnvs.xc similarity index 100% rename from src/mred/wxs/wxs_cnvs.xc rename to src/gracket/wxs/wxs_cnvs.xc diff --git a/src/mred/wxs/wxs_cnvs.xci b/src/gracket/wxs/wxs_cnvs.xci similarity index 100% rename from src/mred/wxs/wxs_cnvs.xci rename to src/gracket/wxs/wxs_cnvs.xci diff --git a/src/mred/wxs/wxs_dc.cxx b/src/gracket/wxs/wxs_dc.cxx similarity index 100% rename from src/mred/wxs/wxs_dc.cxx rename to src/gracket/wxs/wxs_dc.cxx diff --git a/src/mred/wxs/wxs_dc.h b/src/gracket/wxs/wxs_dc.h similarity index 100% rename from src/mred/wxs/wxs_dc.h rename to src/gracket/wxs/wxs_dc.h diff --git a/src/mred/wxs/wxs_dc.xc b/src/gracket/wxs/wxs_dc.xc similarity index 100% rename from src/mred/wxs/wxs_dc.xc rename to src/gracket/wxs/wxs_dc.xc diff --git a/src/mred/wxs/wxs_dorf.xci b/src/gracket/wxs/wxs_dorf.xci similarity index 100% rename from src/mred/wxs/wxs_dorf.xci rename to src/gracket/wxs/wxs_dorf.xci diff --git a/src/mred/wxs/wxs_draw.xci b/src/gracket/wxs/wxs_draw.xci similarity index 100% rename from src/mred/wxs/wxs_draw.xci rename to src/gracket/wxs/wxs_draw.xci diff --git a/src/mred/wxs/wxs_drwf.xci b/src/gracket/wxs/wxs_drwf.xci similarity index 100% rename from src/mred/wxs/wxs_drwf.xci rename to src/gracket/wxs/wxs_drwf.xci diff --git a/src/mred/wxs/wxs_drws.xci b/src/gracket/wxs/wxs_drws.xci similarity index 100% rename from src/mred/wxs/wxs_drws.xci rename to src/gracket/wxs/wxs_drws.xci diff --git a/src/mred/wxs/wxs_eop.xci b/src/gracket/wxs/wxs_eop.xci similarity index 100% rename from src/mred/wxs/wxs_eop.xci rename to src/gracket/wxs/wxs_eop.xci diff --git a/src/mred/wxs/wxs_espc.xci b/src/gracket/wxs/wxs_espc.xci similarity index 100% rename from src/mred/wxs/wxs_espc.xci rename to src/gracket/wxs/wxs_espc.xci diff --git a/src/mred/wxs/wxs_evnt.cxx b/src/gracket/wxs/wxs_evnt.cxx similarity index 100% rename from src/mred/wxs/wxs_evnt.cxx rename to src/gracket/wxs/wxs_evnt.cxx diff --git a/src/mred/wxs/wxs_evnt.h b/src/gracket/wxs/wxs_evnt.h similarity index 100% rename from src/mred/wxs/wxs_evnt.h rename to src/gracket/wxs/wxs_evnt.h diff --git a/src/mred/wxs/wxs_evnt.xc b/src/gracket/wxs/wxs_evnt.xc similarity index 100% rename from src/mred/wxs/wxs_evnt.xc rename to src/gracket/wxs/wxs_evnt.xc diff --git a/src/mred/wxs/wxs_fram.cxx b/src/gracket/wxs/wxs_fram.cxx similarity index 100% rename from src/mred/wxs/wxs_fram.cxx rename to src/gracket/wxs/wxs_fram.cxx diff --git a/src/mred/wxs/wxs_fram.h b/src/gracket/wxs/wxs_fram.h similarity index 100% rename from src/mred/wxs/wxs_fram.h rename to src/gracket/wxs/wxs_fram.h diff --git a/src/mred/wxs/wxs_fram.xc b/src/gracket/wxs/wxs_fram.xc similarity index 100% rename from src/mred/wxs/wxs_fram.xc rename to src/gracket/wxs/wxs_fram.xc diff --git a/src/mred/wxs/wxs_fram.xci b/src/gracket/wxs/wxs_fram.xci similarity index 100% rename from src/mred/wxs/wxs_fram.xci rename to src/gracket/wxs/wxs_fram.xci diff --git a/src/mred/wxs/wxs_gage.cxx b/src/gracket/wxs/wxs_gage.cxx similarity index 100% rename from src/mred/wxs/wxs_gage.cxx rename to src/gracket/wxs/wxs_gage.cxx diff --git a/src/mred/wxs/wxs_gage.h b/src/gracket/wxs/wxs_gage.h similarity index 100% rename from src/mred/wxs/wxs_gage.h rename to src/gracket/wxs/wxs_gage.h diff --git a/src/mred/wxs/wxs_gage.xc b/src/gracket/wxs/wxs_gage.xc similarity index 100% rename from src/mred/wxs/wxs_gage.xc rename to src/gracket/wxs/wxs_gage.xc diff --git a/src/mred/wxs/wxs_gdi.cxx b/src/gracket/wxs/wxs_gdi.cxx similarity index 100% rename from src/mred/wxs/wxs_gdi.cxx rename to src/gracket/wxs/wxs_gdi.cxx diff --git a/src/mred/wxs/wxs_gdi.h b/src/gracket/wxs/wxs_gdi.h similarity index 100% rename from src/mred/wxs/wxs_gdi.h rename to src/gracket/wxs/wxs_gdi.h diff --git a/src/mred/wxs/wxs_gdi.xc b/src/gracket/wxs/wxs_gdi.xc similarity index 100% rename from src/mred/wxs/wxs_gdi.xc rename to src/gracket/wxs/wxs_gdi.xc diff --git a/src/mred/wxs/wxs_gdistyle.xci b/src/gracket/wxs/wxs_gdistyle.xci similarity index 100% rename from src/mred/wxs/wxs_gdistyle.xci rename to src/gracket/wxs/wxs_gdistyle.xci diff --git a/src/mred/wxs/wxs_glob.cxx b/src/gracket/wxs/wxs_glob.cxx similarity index 100% rename from src/mred/wxs/wxs_glob.cxx rename to src/gracket/wxs/wxs_glob.cxx diff --git a/src/mred/wxs/wxs_glob.h b/src/gracket/wxs/wxs_glob.h similarity index 100% rename from src/mred/wxs/wxs_glob.h rename to src/gracket/wxs/wxs_glob.h diff --git a/src/mred/wxs/wxs_glob.xc b/src/gracket/wxs/wxs_glob.xc similarity index 100% rename from src/mred/wxs/wxs_glob.xc rename to src/gracket/wxs/wxs_glob.xc diff --git a/src/mred/wxs/wxs_icol.xci b/src/gracket/wxs/wxs_icol.xci similarity index 100% rename from src/mred/wxs/wxs_icol.xci rename to src/gracket/wxs/wxs_icol.xci diff --git a/src/mred/wxs/wxs_ifnt.xci b/src/gracket/wxs/wxs_ifnt.xci similarity index 100% rename from src/mred/wxs/wxs_ifnt.xci rename to src/gracket/wxs/wxs_ifnt.xci diff --git a/src/mred/wxs/wxs_item.cxx b/src/gracket/wxs/wxs_item.cxx similarity index 100% rename from src/mred/wxs/wxs_item.cxx rename to src/gracket/wxs/wxs_item.cxx diff --git a/src/mred/wxs/wxs_item.h b/src/gracket/wxs/wxs_item.h similarity index 100% rename from src/mred/wxs/wxs_item.h rename to src/gracket/wxs/wxs_item.h diff --git a/src/mred/wxs/wxs_item.xc b/src/gracket/wxs/wxs_item.xc similarity index 100% rename from src/mred/wxs/wxs_item.xc rename to src/gracket/wxs/wxs_item.xc diff --git a/src/mred/wxs/wxs_item.xci b/src/gracket/wxs/wxs_item.xci similarity index 100% rename from src/mred/wxs/wxs_item.xci rename to src/gracket/wxs/wxs_item.xci diff --git a/src/mred/wxs/wxs_lbox.cxx b/src/gracket/wxs/wxs_lbox.cxx similarity index 100% rename from src/mred/wxs/wxs_lbox.cxx rename to src/gracket/wxs/wxs_lbox.cxx diff --git a/src/mred/wxs/wxs_lbox.h b/src/gracket/wxs/wxs_lbox.h similarity index 100% rename from src/mred/wxs/wxs_lbox.h rename to src/gracket/wxs/wxs_lbox.h diff --git a/src/mred/wxs/wxs_lbox.xc b/src/gracket/wxs/wxs_lbox.xc similarity index 100% rename from src/mred/wxs/wxs_lbox.xc rename to src/gracket/wxs/wxs_lbox.xc diff --git a/src/mred/wxs/wxs_menu.cxx b/src/gracket/wxs/wxs_menu.cxx similarity index 100% rename from src/mred/wxs/wxs_menu.cxx rename to src/gracket/wxs/wxs_menu.cxx diff --git a/src/mred/wxs/wxs_menu.h b/src/gracket/wxs/wxs_menu.h similarity index 100% rename from src/mred/wxs/wxs_menu.h rename to src/gracket/wxs/wxs_menu.h diff --git a/src/mred/wxs/wxs_menu.xc b/src/gracket/wxs/wxs_menu.xc similarity index 100% rename from src/mred/wxs/wxs_menu.xc rename to src/gracket/wxs/wxs_menu.xc diff --git a/src/mred/wxs/wxs_misc.cxx b/src/gracket/wxs/wxs_misc.cxx similarity index 100% rename from src/mred/wxs/wxs_misc.cxx rename to src/gracket/wxs/wxs_misc.cxx diff --git a/src/mred/wxs/wxs_misc.h b/src/gracket/wxs/wxs_misc.h similarity index 100% rename from src/mred/wxs/wxs_misc.h rename to src/gracket/wxs/wxs_misc.h diff --git a/src/mred/wxs/wxs_misc.xc b/src/gracket/wxs/wxs_misc.xc similarity index 100% rename from src/mred/wxs/wxs_misc.xc rename to src/gracket/wxs/wxs_misc.xc diff --git a/src/mred/wxs/wxs_obj.cxx b/src/gracket/wxs/wxs_obj.cxx similarity index 100% rename from src/mred/wxs/wxs_obj.cxx rename to src/gracket/wxs/wxs_obj.cxx diff --git a/src/mred/wxs/wxs_obj.h b/src/gracket/wxs/wxs_obj.h similarity index 100% rename from src/mred/wxs/wxs_obj.h rename to src/gracket/wxs/wxs_obj.h diff --git a/src/mred/wxs/wxs_obj.xc b/src/gracket/wxs/wxs_obj.xc similarity index 100% rename from src/mred/wxs/wxs_obj.xc rename to src/gracket/wxs/wxs_obj.xc diff --git a/src/mred/wxs/wxs_ornt.xci b/src/gracket/wxs/wxs_ornt.xci similarity index 100% rename from src/mred/wxs/wxs_ornt.xci rename to src/gracket/wxs/wxs_ornt.xci diff --git a/src/mred/wxs/wxs_panl.cxx b/src/gracket/wxs/wxs_panl.cxx similarity index 100% rename from src/mred/wxs/wxs_panl.cxx rename to src/gracket/wxs/wxs_panl.cxx diff --git a/src/mred/wxs/wxs_panl.h b/src/gracket/wxs/wxs_panl.h similarity index 100% rename from src/mred/wxs/wxs_panl.h rename to src/gracket/wxs/wxs_panl.h diff --git a/src/mred/wxs/wxs_panl.xc b/src/gracket/wxs/wxs_panl.xc similarity index 100% rename from src/mred/wxs/wxs_panl.xc rename to src/gracket/wxs/wxs_panl.xc diff --git a/src/mred/wxs/wxs_panl.xci b/src/gracket/wxs/wxs_panl.xci similarity index 100% rename from src/mred/wxs/wxs_panl.xci rename to src/gracket/wxs/wxs_panl.xci diff --git a/src/mred/wxs/wxs_rado.cxx b/src/gracket/wxs/wxs_rado.cxx similarity index 100% rename from src/mred/wxs/wxs_rado.cxx rename to src/gracket/wxs/wxs_rado.cxx diff --git a/src/mred/wxs/wxs_rado.h b/src/gracket/wxs/wxs_rado.h similarity index 100% rename from src/mred/wxs/wxs_rado.h rename to src/gracket/wxs/wxs_rado.h diff --git a/src/mred/wxs/wxs_rado.xc b/src/gracket/wxs/wxs_rado.xc similarity index 100% rename from src/mred/wxs/wxs_rado.xc rename to src/gracket/wxs/wxs_rado.xc diff --git a/src/mred/wxs/wxs_slid.cxx b/src/gracket/wxs/wxs_slid.cxx similarity index 100% rename from src/mred/wxs/wxs_slid.cxx rename to src/gracket/wxs/wxs_slid.cxx diff --git a/src/mred/wxs/wxs_slid.h b/src/gracket/wxs/wxs_slid.h similarity index 100% rename from src/mred/wxs/wxs_slid.h rename to src/gracket/wxs/wxs_slid.h diff --git a/src/mred/wxs/wxs_slid.xc b/src/gracket/wxs/wxs_slid.xc similarity index 100% rename from src/mred/wxs/wxs_slid.xc rename to src/gracket/wxs/wxs_slid.xc diff --git a/src/mred/wxs/wxs_tabc.cxx b/src/gracket/wxs/wxs_tabc.cxx similarity index 100% rename from src/mred/wxs/wxs_tabc.cxx rename to src/gracket/wxs/wxs_tabc.cxx diff --git a/src/mred/wxs/wxs_tabc.h b/src/gracket/wxs/wxs_tabc.h similarity index 100% rename from src/mred/wxs/wxs_tabc.h rename to src/gracket/wxs/wxs_tabc.h diff --git a/src/mred/wxs/wxs_tabc.xc b/src/gracket/wxs/wxs_tabc.xc similarity index 100% rename from src/mred/wxs/wxs_tabc.xc rename to src/gracket/wxs/wxs_tabc.xc diff --git a/src/mred/wxs/wxs_win.cxx b/src/gracket/wxs/wxs_win.cxx similarity index 100% rename from src/mred/wxs/wxs_win.cxx rename to src/gracket/wxs/wxs_win.cxx diff --git a/src/mred/wxs/wxs_win.h b/src/gracket/wxs/wxs_win.h similarity index 100% rename from src/mred/wxs/wxs_win.h rename to src/gracket/wxs/wxs_win.h diff --git a/src/mred/wxs/wxs_win.xc b/src/gracket/wxs/wxs_win.xc similarity index 100% rename from src/mred/wxs/wxs_win.xc rename to src/gracket/wxs/wxs_win.xc diff --git a/src/mred/wxs/wxs_win.xci b/src/gracket/wxs/wxs_win.xci similarity index 100% rename from src/mred/wxs/wxs_win.xci rename to src/gracket/wxs/wxs_win.xci diff --git a/src/mred/wxs/wxscheme.cxx b/src/gracket/wxs/wxscheme.cxx similarity index 99% rename from src/mred/wxs/wxscheme.cxx rename to src/gracket/wxs/wxscheme.cxx index 655e88645a..824ea2878e 100644 --- a/src/mred/wxs/wxscheme.cxx +++ b/src/gracket/wxs/wxscheme.cxx @@ -17,7 +17,7 @@ #include "wx_print.h" #include "wx_dcmem.h" #include "mrdispatch.h" -#include "wxsmred.h" +#include "wxsgracket.h" #include "wxs_obj.h" #define WXS_SETUP_ONLY 1 diff --git a/src/mred/wxs/wxscheme.h b/src/gracket/wxs/wxscheme.h similarity index 79% rename from src/mred/wxs/wxscheme.h rename to src/gracket/wxs/wxscheme.h index 048a003958..a70edc20f0 100644 --- a/src/mred/wxs/wxscheme.h +++ b/src/gracket/wxs/wxscheme.h @@ -1,5 +1,5 @@ -# include "../../mzscheme/utils/xcglue.h" +# include "../../racket/utils/xcglue.h" void wxsScheme_setup(Scheme_Env *env); void wxscheme_prepare_hooks(int argc, char **argv); diff --git a/src/mred/wxs/wxsmred.h b/src/gracket/wxs/wxsgracket.h similarity index 100% rename from src/mred/wxs/wxsmred.h rename to src/gracket/wxs/wxsgracket.h diff --git a/src/mac/cw/MrEd.r b/src/mac/cw/GRacket.r similarity index 100% rename from src/mac/cw/MrEd.r rename to src/mac/cw/GRacket.r diff --git a/src/mac/cw/MrEd_classic.r b/src/mac/cw/MrEd_classic.r deleted file mode 100644 index 1deaf36e7a..0000000000 --- a/src/mac/cw/MrEd_classic.r +++ /dev/null @@ -1,517 +0,0 @@ -data 'BNDL' (128) { - $"6D52 6544 0000 0001 4652 4546 0004 0000" /* mReD....FREF.... */ - $"0080 0001 0081 0002 0082 0003 0083 0004" /* ............ */ - $"0084 4943 4E23 0004 0000 0080 0001 0000" /* .ICN#......... */ - $"0002 0081 0003 0081 0004 0082" /* ......... */ -}; - -data 'mReD' (0, "Owner resource") { - $"00" /* . */ -}; - -data 'FREF' (128) { - $"4150 504C 0000 00" /* APPL... */ -}; - -data 'FREF' (129) { - $"2A2A 2A2A 0001 00" /* ****... */ -}; - -data 'FREF' (130) { - $"5445 5854 0002 00" /* TEXT... */ -}; - -data 'FREF' (131) { - $"5758 4D45 0003 00" /* WXME... */ -}; - -data 'FREF' (132) { - $"4D72 4170 0004 00" /* MrAp... */ -}; - -data 'ics8' (128) { - $"0000 0000 00FF FFFF FFFF FF00 0000 0000" /* .......... */ - $"0000 00FF FFD2 D2D2 D2D2 D2FF FF00 0000" /* ...... */ - $"0000 FF23 2300 00D2 D2D2 D2D2 D2FF 0000" /* ..##.... */ - $"00FF 2323 2323 2300 D2D2 D2D2 D2D2 FF00" /* .#####.. */ - $"00FF 2323 2323 2300 00D2 D2D2 D2D2 FF00" /* .#####... */ - $"FF23 2323 2323 2323 00D2 D2D2 D2D2 D2FF" /* #######. */ - $"FF23 2323 2323 2323 0000 D2D2 D2D2 D2FF" /* #######.. */ - $"FF23 2323 2323 2300 0000 D2D2 D2D2 D2FF" /* ######... */ - $"FF23 2323 2323 0000 2300 00D2 D2D2 D2FF" /* #####..#.. */ - $"FF23 2323 2323 0023 2323 00D2 D2D2 D2FF" /* #####.###. */ - $"FF23 2323 2300 0023 2323 0000 D2D2 D2FF" /* ####..###.. */ - $"00FF 2323 2300 2323 2323 2300 D2D2 FF00" /* .###.#####.. */ - $"00FF 2323 0000 2323 2323 2300 00D2 FF00" /* .##..#####... */ - $"0000 FF23 0023 2323 2323 2323 00FF 0000" /* ..#.#######... */ - $"0000 00FF FF23 2323 2323 23FF FF00 0000" /* ...######... */ - $"0000 0000 00FF FFFF FFFF FF00 0000 0000" /* .......... */ -}; - -data 'ics8' (129) { - $"00FF FFFF FFFF FFFF FFFF FFFF 0000 0000" /* ..... */ - $"00FF 2B2B 2B2B 2B2B 2B2B 2BFF FF00 0000" /* .+++++++++... */ - $"00FF 2B2B 2B2B 2B2B 2B2B 2BFF F9FF 0000" /* .+++++++++.. */ - $"00FF 2B2B 2B2B 2B2B 2B2B 2BFF FFFF FF00" /* .+++++++++. */ - $"00FF 2B2B 2BFF FFFF FFFF FF2B 2B2B FF00" /* .++++++. */ - $"00FF 2B2B FFFF 2323 D2D2 FFFF 2B2B FF00" /* .++##++. */ - $"00FF 2B2B FF23 2323 D2D2 D2FF 2B2B FF00" /* .++###++. */ - $"00FF 2B2B FF23 2323 D2D2 D2FF 2B2B FF00" /* .++###++. */ - $"00FF 2B2B FF23 2300 23D2 D2FF 2B2B FF00" /* .++##.#++. */ - $"00FF 2B2B FF23 2323 23D2 D2FF 2B2B FF00" /* .++####++. */ - $"00FF 2B2B FFFF 0023 2323 FFFF 2B2B FF00" /* .++.###++. */ - $"00FF 2B2B 2BE0 FFFF FFFF FF2B 2B2B FF00" /* .++++++. */ - $"00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FF00" /* .++++++++++++. */ - $"00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FF00" /* .++++++++++++. */ - $"00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FF00" /* .++++++++++++. */ - $"00FF FFFF FFFF FFFF FFFF FFFF FFFF FF00" /* .. */ -}; - -data 'ics8' (130) { - $"0000 0000 00FF FFFF FFFF FF00 0000 0000" /* .......... */ - $"0000 00FF FFD2 D2D2 D2D2 D2FF FF00 0000" /* ...... */ - $"0000 FF23 2300 00D2 D2D2 D2D2 D2FF 0000" /* ..##.... */ - $"00FF 2323 2323 2300 D2D2 D2D2 D2D2 FF00" /* .#####.. */ - $"00FF 2323 2323 2300 00D2 D2D2 D2D2 FF00" /* .#####... */ - $"FF23 2323 2323 2323 00D2 D2D2 D2D2 D2FF" /* #######. */ - $"FF23 2323 2323 2323 0000 D2D2 D2D2 D2FF" /* #######.. */ - $"FF23 2323 2323 2300 0000 D2D2 D2D2 D2FF" /* ######... */ - $"FF23 2323 2323 0000 2300 00D2 D2D2 D2FF" /* #####..#.. */ - $"FF23 2323 2323 0023 2323 00D2 D2D2 D2FF" /* #####.###. */ - $"FF23 2323 2300 0023 2323 0000 D2D2 D2FF" /* ####..###.. */ - $"00FF 2323 2300 2323 2323 2300 ECE3 FF00" /* .###.#####.. */ - $"00FF 2323 0000 2323 2323 E3E3 E3CB E300" /* .##..####. */ - $"0000 FF23 0023 2323 2323 E3CB CBCB CBE3" /* ..#.##### */ - $"0000 00FF FF23 2323 2323 E3E3 E3CB E300" /* ...#####. */ - $"0000 0000 00FF FFFF FFFF FF00 00E3 0000" /* ......... */ -}; - -data 'ics#' (128) { - $"07E0 1FF8 39FC 7EFE 7E7E FF7F FF3F FE3F" /* ..9~~~.?? */ - $"FC9F FDDF F9CF 7BEE 73E6 37F4 1FF8 07E0" /* {s7.. */ - $"07E0 1FF8 3FFC 7FFE 7FFE FFFF FFFF FFFF" /* ..?.. */ - $"FFFF FFFF FFFF 7FFE 7FFE 3FFC 1FF8 07E0" /* ..?.. */ -}; - -data 'ics#' (129) { - $"7FF0 4018 4014 401E 47E2 4FF2 4FF2 4FF2" /* .@.@.@.GOOO */ - $"4EF2 4FF2 4DF2 47E2 4002 4002 4002 7FFE" /* NOMG@.@.@.. */ - $"7FF0 7FF8 7FFC 7FFE 7FFE 7FFE 7FFE 7FFE" /* ........ */ - $"7FFE 7FFE 7FFE 7FFE 7FFE 7FFE 7FFE 7FFE" /* ........ */ -}; - -data 'ics#' (130) { - $"07E0 1FF8 39FC 7EFE 7E7E FF7F FF3F FE3F" /* ..9~~~.?? */ - $"FC9F FDDF F9CF 7BEE 73FA 37E1 1FFA 07E4" /* {s7.. */ - $"07E0 1FF8 3FFC 7FFE 7FFE FFFF FFFF FFFF" /* ..?.. */ - $"FFFF FFFF FFFF 7FFE 7FFE 3FFF 1FFE 07E4" /* ..?.. */ -}; - -data 'ics4' (128) { - $"0000 0FFF FFF0 0000 000F F666 666F F000" /* .......ffo. */ - $"00F3 3006 6666 6F00 0F33 3330 6666 66F0" /* .0.ffo..330fff */ - $"0F33 3330 0666 66F0 F333 3333 0666 666F" /* .330.ff333.ffo */ - $"F333 3333 0066 666F F333 3330 0066 666F" /* 333.ffo330.ffo */ - $"F333 3300 3006 666F F333 3303 3306 666F" /* 33.0.fo33.3.fo */ - $"F333 3003 3300 666F 0F33 3033 3330 66F0" /* 30.3.fo.30330f */ - $"0F33 0033 3330 06F0 00F3 0333 3333 0F00" /* .3.330...333.. */ - $"000F F333 333F F000 0000 0FFF FFF0 0000" /* ..33?...... */ -}; - -data 'ics4' (129) { - $"0FFF FFFF FFFF 0000 0FCC CCCC CCCF F000" /* ..... */ - $"0FCC CCCC CCCF DF00 0FCC CCCC CCCF FFF0" /* ... */ - $"0FCC CFFF FFFC CCF0 0FCC FF33 66FF CCF0" /* ..3f */ - $"0FCC F333 666F CCF0 0FCC F333 666F CCF0" /* .3fo.3fo */ - $"0FCC F330 366F CCF0 0FCC F333 366F CCF0" /* .06o.36o */ - $"0FCC FF03 33FF CCF0 0FCC CFFF FFFC CCF0" /* ..3. */ - $"0FCC CCCC CCCC CCF0 0FCC CCCC CCCC CCF0" /* .. */ - $"0FCC CCCC CCCC CCF0 0FFF FFFF FFFF FFF0" /* .. */ -}; - -data 'ics4' (130) { - $"0000 0FFF FFF0 0000 000F F666 666F F000" /* .......ffo. */ - $"00F3 3006 6666 6F00 0F33 3330 6666 66F0" /* .0.ffo..330fff */ - $"0F33 3330 0666 66F0 F333 3333 0666 666F" /* .330.ff333.ffo */ - $"F333 3333 0066 666F F333 3330 0066 666F" /* 333.ffo330.ffo */ - $"F333 3300 3006 666F F333 3303 3306 666F" /* 33.0.fo33.3.fo */ - $"F333 3003 3300 666F 0F33 3033 3330 68F0" /* 30.3.fo.30330h */ - $"0F33 0033 3388 8980 00F3 0333 3389 9998" /* .3.33..33 */ - $"000F F333 3388 8980 0000 0FFF FFF0 0800" /* ..33..... */ -}; - -data 'icl4' (128) { - $"0000 0000 0000 00CC CC00 0000 0000 0000" /* .............. */ - $"0000 0000 00CE FF66 6665 DC00 0000 0000" /* .....ffe..... */ - $"0000 0000 DEDC 00CE 6666 665C 0000 0000" /* .....fff\.... */ - $"0000 00CE EBBB D000 5666 6666 E000 0000" /* ....Vfff... */ - $"0000 0C33 3333 3C00 C666 6666 65C0 0000" /* ...333<.fffe.. */ - $"0000 C333 3333 3300 0566 6666 666C 0000" /* ..3333..ffffl.. */ - $"000C 3333 3333 33C0 0D66 6666 666E 0000" /* ..33333.ffffn.. */ - $"000E 3333 3333 33B0 0C66 6666 6666 D000" /* ..33333.fffff. */ - $"00D3 3333 3333 3330 0056 6666 6666 6C00" /* .333330.Vffffl. */ - $"0033 3333 3333 333C 00D6 6666 6666 6500" /* .333333<.ffffe. */ - $"0C33 3333 3333 333C 00C6 6666 6666 66C0" /* .333333<.fffff */ - $"0B33 3333 3333 333C 0005 6666 6666 66D0" /* .333333<..fffff */ - $"0333 3333 3333 333C 000C 6666 6666 6650" /* .333333<..fffffP */ - $"C333 3333 3333 3330 C000 6666 6666 6660" /* 3333330.fffff` */ - $"C333 3333 3333 33DB 3C00 D666 6666 666C" /* 333333<.ffffl */ - $"D333 3333 3333 33C3 3B00 C666 6666 666C" /* 333333;.ffffl */ - $"D333 3333 3333 3BD3 3300 0566 6666 666C" /* 33333;3..ffffl */ - $"C333 3333 3333 3CB3 33D0 0C66 6666 6660" /* 33333<3.ffff` */ - $"C333 3333 3333 DC33 33B0 0066 6666 6660" /* 3333333.ffff` */ - $"0333 3333 3333 0B33 333C 00D6 6666 6650" /* .33333.33<.fffP */ - $"0B33 3333 333D C333 333B 0006 6666 66D0" /* .3333=33;..fff */ - $"0C33 3333 33B0 B333 3333 000D 6666 66C0" /* .3333333..fff */ - $"0033 3333 33C0 3333 3333 D000 6666 6E00" /* .33333333.ffn. */ - $"00D3 3333 3E0D 3333 3333 B000 D666 6C00" /* .33>.3333.fl. */ - $"000E 3333 3C0B 3333 3333 3C00 0666 D000" /* ..33<.3333<..f. */ - $"000C 3333 B0C3 3333 3333 3D00 0D6E 0000" /* ..333333=..n.. */ - $"0000 C333 00B3 3333 3333 3300 00FC 0000" /* ..3.33333.... */ - $"0000 0C3D 0C33 3333 3333 33C0 CEC0 0000" /* ...=.333333.. */ - $"0000 00CE A333 3333 3333 33BE E000 0000" /* ...Σ333333... */ - $"0000 0000 CB33 3333 3333 33EC 0000 0000" /* ....333333.... */ - $"0000 0000 00CB 3333 333B BC00 0000 0000" /* .....333;..... */ - $"0000 0000 0000 00CC CC00 0000 0000 0000" /* .............. */ -}; - -data 'icl4' (129) { - $"000F FFFF FFFF FFFF FFFF FFF0 0000 0000" /* ...... */ - $"000F CCCC CCCC CCCC CCCC CCFF 0000 0000" /* ...... */ - $"000F CCCC CCCC CCCC CCCC CCFD F000 0000" /* ..... */ - $"000F CCCC CCCC CCCC CCCC CCFD DF00 0000" /* ..... */ - $"000F CCCC CCCC CCCC CCCC CCFD DDF0 0000" /* .... */ - $"000F CCCC CCCC CCCC CCCC CCFD DDDF 0000" /* .... */ - $"000F CCCC CCCC CCCC CCCC CCFF FFFF F000" /* ... */ - $"000F CCCC CCCC CCCC CCCC CCCC CCCC F000" /* ... */ - $"000F CCCC CCCC CFFF FFFC CCCC CCCC F000" /* ... */ - $"000F CCCC CCCF F666 666F FCCC CCCC F000" /* ..ffo. */ - $"000F CCCC CCF3 3006 6666 6FCC CCCC F000" /* ..0.ffo. */ - $"000F CCCC CF33 3330 6666 66FC CCCC F000" /* ..330fff. */ - $"000F CCCC CF33 3330 0666 66FC CCCC F000" /* ..330.ff. */ - $"000F CCCC F333 3333 0666 666F CCCC F000" /* ..333.ffo. */ - $"000F CCCC F333 3333 0066 666F CCCC F000" /* ..333.ffo. */ - $"000F CCCC F333 3330 0066 666F CCCC F000" /* ..330.ffo. */ - $"000F CCCC F333 3300 3006 666F CCCC F000" /* ..33.0.fo. */ - $"000F CCCC F333 3303 3306 666F CCCC F000" /* ..33.3.fo. */ - $"000F CCCC F333 3003 3300 666F CCCC F000" /* ..30.3.fo. */ - $"000F CCCC CF33 3033 3330 66FC CCCC F000" /* ..30330f. */ - $"000F CCCC CF33 0033 3330 06FC CCCC F000" /* ..3.330.. */ - $"000F CCCC CCF3 0333 3333 0FCC CCCC F000" /* ...333.. */ - $"000F CCCC CCCF F333 333F FCCC CCCC F000" /* ..33?. */ - $"000F CCCC CCCC CFFF FFFC CCCC CCCC F000" /* ... */ - $"000F CCCC CCCC CCCC CCCC CCCC CCCC F000" /* ... */ - $"000F CCCC CCCC CCCC CCCC CCCC CCCC F000" /* ... */ - $"000F CCCC CCCC CCCC CCCC CCCC CCCC F000" /* ... */ - $"000F CCCC CCCC CCCC CCCC CCCC CCCC F000" /* ... */ - $"000F CCCC CCCC CCCC CCCC CCCC CCCC F000" /* ... */ - $"000F CCCC CCCC CCCC CCCC CCCC CCCC F000" /* ... */ - $"000F CCCC CCCC CCCC CCCC CCCC CCCC F000" /* ... */ - $"000F FFFF FFFF FFFF FFFF FFFF FFFF F000" /* ... */ -}; - -data 'icl4' (130) { - $"0000 0000 000F FFFF FFFF F000 0000 0000" /* ........... */ - $"0000 0000 0FF6 6666 6666 6FF0 0000 0000" /* .....ffffo.... */ - $"0000 000F FFFF FFF6 6666 666F F000 0000" /* ....fffo... */ - $"0000 00F3 3F00 000F 6666 6666 6F00 0000" /* ...?...ffffo... */ - $"0000 0F33 33FF F000 F666 6666 66F0 0000" /* ...33.ffff.. */ - $"0000 F333 3333 3F00 F666 6666 666F 0000" /* ..333?.ffffo.. */ - $"000F 3333 3333 3F00 0F66 6666 6666 F000" /* ..3333?..fffff. */ - $"00F3 3333 3333 33F0 0F66 6666 6666 6F00" /* .33333.fffffo. */ - $"00F3 3333 3333 33F0 00F6 6666 6666 6F00" /* .33333.ffffo. */ - $"0F33 3333 3333 333F 00F6 6666 6666 66F0" /* .333333?.fffff */ - $"0F33 3333 3333 333F 000F 6666 6666 66F0" /* .333333?..fffff */ - $"F333 3333 3333 333F 000F 6666 6666 666F" /* 333333?..fffffo */ - $"F333 3333 3333 333F 0000 F666 6666 666F" /* 333333?..ffffo */ - $"F333 3333 3333 333F 0000 F666 6666 666F" /* 333333?..ffffo */ - $"F333 3333 3333 33F0 0F00 0F66 6666 666F" /* 333333...ffffo */ - $"F333 3333 3333 33F0 FF00 0F66 6666 666F" /* 333333..ffffo */ - $"F333 3333 3333 3F00 F3F0 00F6 6666 666F" /* 33333?..fffo */ - $"F333 3333 3333 3F0F 33F0 00F6 6666 666F" /* 33333?.3.fffo */ - $"F333 3333 3333 F00F 33F0 000F 6666 666F" /* 33333.3..fffo */ - $"F333 3333 3333 F0F3 333F 000F 6666 666F" /* 333333?..fffo */ - $"F333 3333 333F 00F3 333F 0000 F666 666F" /* 3333?.3?..ffo */ - $"0F33 3333 333F 0F33 3333 F000 F666 66F0" /* .3333?.333.ff */ - $"0F33 3333 33F0 0F33 3333 F000 0F66 66F0" /* .3333.333..ff */ - $"00F3 3333 33F0 F333 3333 3F00 0F88 FF00" /* .333333?... */ - $"00F3 3333 3F00 F333 3333 3F00 0089 8F00" /* .33?.333?... */ - $"000F 3333 3F0F 3333 3333 3888 8889 9800" /* ..33?.33338. */ - $"0000 F333 F00F 3333 3333 3899 9999 9980" /* ..3.33338 */ - $"0000 0F33 F0F3 3333 3333 3899 9999 9998" /* ...333338 */ - $"0000 00FF FFF3 3333 3333 3899 9999 9980" /* ...33338 */ - $"0000 000F FF33 3333 3333 3888 8889 9800" /* ....333338. */ - $"0000 0000 0FF3 3333 3333 33FF 0089 8000" /* .....33333.. */ - $"0000 0000 000F FFFF FFFF FF00 0088 0000" /* .......... */ -}; - -data 'icl8' (128) { - $"0000 0000 0000 0000 0000 0000 00F5 2BF7" /* .............+ */ - $"F7F7 F500 0000 0000 0000 0000 0000 0000" /* ............. */ - $"0000 0000 0000 0000 0000 F8FB F2F1 D4EB" /* .......... */ - $"ECD3 EEAA 802B 0000 0000 0000 0000 0000" /* +.......... */ - $"0000 0000 0000 0000 56FB FAF7 F5F5 F7AB" /* ........V */ - $"D2D2 D2D2 D2D3 AAF7 0000 0000 0000 0000" /* Ӫ........ */ - $"0000 0000 0000 F688 885D 6464 F900 00F5" /* ......]dd.. */ - $"AAD2 D2D2 D2D2 D2D3 FBF5 0000 0000 0000" /* ...... */ - $"0000 0000 00F7 6B23 2323 2323 D9F7 0000" /* .....k#####.. */ - $"F7D3 D2D2 D2D2 D2D2 D2AA F600 0000 0000" /* Ҫ..... */ - $"0000 0000 F7DA 2323 2323 2323 23DB 0000" /* ....#######.. */ - $"00AA D2D2 D2D2 D2D2 D2D2 D4F6 0000 0000" /* ..... */ - $"0000 00F6 6B23 2323 2323 2323 23D8 F800" /* ...k########. */ - $"00F9 D2D2 D2D2 D2D2 D2D2 D2AB 0000 0000" /* .ҫ.... */ - $"0000 0088 2323 2323 2323 2323 2323 6400" /* ...##########d. */ - $"00F6 EED2 D2D2 D2D2 D2D2 D2D2 8000 0000" /* .Ҁ... */ - $"0000 56D8 2323 2323 2323 2323 2323 6B00" /* ..V##########k. */ - $"0000 AAD2 D2D2 D2D2 D2D2 D2D2 D32B 0000" /* ..+.. */ - $"0000 DB23 2323 2323 2323 2323 2323 472B" /* ..###########G+ */ - $"0000 F9D2 D2D2 D2D2 D2D2 D2D2 D2AA 0000" /* ..Ҫ.. */ - $"00F8 D723 2323 2323 2323 2323 2323 D7F8" /* .########### */ - $"0000 F6EE D2D2 D2D2 D2D2 D2D2 D2ED 2B00" /* ..+. */ - $"0064 2323 2323 2323 2323 2323 2323 D7F8" /* .d############ */ - $"0000 00AA D2D2 D2D2 D2D2 D2D2 D2D2 FA00" /* .... */ - $"006B 2323 2323 2323 2323 2323 2323 D9F6" /* .k############ */ - $"0000 00F8 ECD2 D2D2 D2D2 D2D2 D2D2 AA00" /* ...Ҫ. */ - $"F6D9 2323 2323 2323 2323 2323 2323 DB00" /* ############. */ - $"F600 0000 D4D2 D2D2 D2D2 D2D2 D2D2 D400" /* .... */ - $"F7D7 2323 2323 2323 2323 2323 2323 FA5D" /* ############] */ - $"DBF6 0000 FAD2 D2D2 D2D2 D2D2 D2D2 EDF6" /* .. */ - $"56D7 2323 2323 2323 2323 2323 23DA 2B6B" /* V###########+k */ - $"235D 0000 F6ED D2D2 D2D2 D2D2 D2D2 D32B" /* #]..+ */ - $"56D7 2323 2323 2323 2323 2323 235D F9D7" /* V###########] */ - $"236B F500 00AA D2D2 D2D2 D2D2 D2D2 D32B" /* #k..+ */ - $"F7D8 2323 2323 2323 2323 2323 6BF6 6423" /* ##########kd# */ - $"2323 F900 00F8 EBD2 D2D2 D2D2 D2D2 EEF5" /* ##.. */ - $"F6D9 2323 2323 2323 2323 23D7 FAF8 D823" /* ########## */ - $"2323 6400 0000 EFD2 D2D2 D2D2 D2D2 D400" /* ##d.... */ - $"006B 2323 2323 2323 2323 23DB 0064 2323" /* .k#########.d## */ - $"2323 47F7 0000 F9EB D2D2 D2D2 D2D2 AA00" /* ##G..Ҫ. */ - $"0064 2323 2323 2323 2323 D856 F6DA 2323" /* .d########V## */ - $"2323 235D 0000 00D4 D2D2 D2D2 D2D2 8000" /* ###]...Ҁ. */ - $"00F8 D823 2323 2323 2323 6400 5D23 2323" /* .#######d.]### */ - $"2323 236B F500 00F9 EBD2 D2D2 D2ED 2B00" /* ###k..+. */ - $"0000 DB23 2323 2323 2347 F7F5 6B23 2323" /* ..######Gk### */ - $"2323 23D7 5600 00F5 D4D2 D2D2 D2AB 0000" /* ###V..ҫ.. */ - $"0000 56D8 2323 2323 2388 00F9 D723 2323" /* ..V#####.### */ - $"2323 2323 6400 0000 F9EB D2D2 ED2B 0000" /* ####d...+.. */ - $"0000 0088 2323 2323 DA2B 0064 2323 2323" /* ...####+.d#### */ - $"2323 2323 D9F6 0000 F5EF D2D2 8000 0000" /* ####..Ҁ... */ - $"0000 00F6 6B23 2323 5D00 F7D8 2323 2323" /* ...k###].#### */ - $"2323 2323 23FA 0000 00FA D2AB 0000 0000" /* #####...ҫ.... */ - $"0000 0000 F7DA 236B F500 6423 2323 2323" /* ....#k.d##### */ - $"2323 2323 23DB 0000 00F5 F2F6 0000 0000" /* #####....... */ - $"0000 0000 00F7 DB56 00F7 D923 2323 2323" /* .....V.##### */ - $"2323 2323 2347 F700 F7FB F600 0000 0000" /* #####G...... */ - $"0000 0000 0000 F6FC 8FD9 2323 2323 2323" /* ......###### */ - $"2323 2323 2323 64FC FB00 0000 0000 0000" /* ######d....... */ - $"0000 0000 0000 0000 F864 4723 2323 2323" /* ........dG##### */ - $"2323 2323 2347 88F7 0000 0000 0000 0000" /* #####G........ */ - $"0000 0000 0000 0000 0000 F75D DBDA 47D7" /* ..........]G */ - $"D747 6B64 5D2B 0000 0000 0000 0000 0000" /* Gkd]+.......... */ - $"0000 0000 0000 0000 0000 0000 00F5 2B2B" /* .............++ */ - $"2B2B 0000 0000 0000 0000 0000 0000 0000" /* ++.............. */ -}; - -data 'icl8' (129) { - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" /* ... */ - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" /* ......... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B FFFF 0000 0000 0000 0000" /* ++++++........ */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B FFF9 FF00 0000 0000 0000" /* ++++++....... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B FFF9 F9FF 0000 0000 0000" /* ++++++...... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B FFF9 F9F9 FF00 0000 0000" /* ++++++..... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B FFF9 F9F9 F9FF 0000 0000" /* ++++++.... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B FFFF FFFF FFFF FF00 0000" /* ++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FF00 0000" /* ++++++++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2BFF FFFF" /* ...+++++++++ */ - $"FFFF FF2B 2B2B 2B2B 2B2B 2B2B FF00 0000" /* +++++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B 2BFF FFD2 D2D2" /* ...+++++++ */ - $"D2D2 D2FF FF2B 2B2B 2B2B 2B2B FF00 0000" /* +++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B FF23 2300 00D2" /* ...++++++##.. */ - $"D2D2 D2D2 D2FF 2B2B 2B2B 2B2B FF00 0000" /* ++++++... */ - $"0000 00FF 2B2B 2B2B 2BFF 2323 2323 2300" /* ...+++++#####. */ - $"D2D2 D2D2 D2D2 FF2B 2B2B 2B2B FF00 0000" /* +++++... */ - $"0000 00FF 2B2B 2B2B 2BFF 2323 2323 2300" /* ...+++++#####. */ - $"00D2 D2D2 D2D2 FF2B 2B2B 2B2B FF00 0000" /* .+++++... */ - $"0000 00FF 2B2B 2B2B FF23 2323 2323 2323" /* ...++++####### */ - $"00D2 D2D2 D2D2 D2FF 2B2B 2B2B FF00 0000" /* .++++... */ - $"0000 00FF 2B2B 2B2B FF23 2323 2323 2323" /* ...++++####### */ - $"0000 D2D2 D2D2 D2FF 2B2B 2B2B FF00 0000" /* ..++++... */ - $"0000 00FF 2B2B 2B2B FF23 2323 2323 2300" /* ...++++######. */ - $"0000 D2D2 D2D2 D2FF 2B2B 2B2B FF00 0000" /* ..++++... */ - $"0000 00FF 2B2B 2B2B FF23 2323 2323 0000" /* ...++++#####.. */ - $"2300 00D2 D2D2 D2FF 2B2B 2B2B FF00 0000" /* #..++++... */ - $"0000 00FF 2B2B 2B2B FF23 2323 2323 0023" /* ...++++#####.# */ - $"2323 00D2 D2D2 D2FF 2B2B 2B2B FF00 0000" /* ##.++++... */ - $"0000 00FF 2B2B 2B2B FF23 2323 2300 0023" /* ...++++####..# */ - $"2323 0000 D2D2 D2FF 2B2B 2B2B FF00 0000" /* ##..++++... */ - $"0000 00FF 2B2B 2B2B 2BFF 2323 2300 2323" /* ...+++++###.## */ - $"2323 2300 D2D2 FF2B 2B2B 2B2B FF00 0000" /* ###.+++++... */ - $"0000 00FF 2B2B 2B2B 2BFF 2323 0000 2323" /* ...+++++##..## */ - $"2323 2300 00D2 FF2B 2B2B 2B2B FF00 0000" /* ###..+++++... */ - $"0000 00FF 2B2B 2B2B 2B2B FF23 0023 2323" /* ...++++++#.### */ - $"2323 2323 00FF 2B2B 2B2B 2B2B FF00 0000" /* ####.++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B 2BFF FF23 2323" /* ...+++++++### */ - $"2323 23FF FF2B 2B2B 2B2B 2B2B FF00 0000" /* ###+++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2BFF FFFF" /* ...+++++++++ */ - $"FFFF FF2B 2B2B 2B2B 2B2B 2B2B FF00 0000" /* +++++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FF00 0000" /* ++++++++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FF00 0000" /* ++++++++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FF00 0000" /* ++++++++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FF00 0000" /* ++++++++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FF00 0000" /* ++++++++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FF00 0000" /* ++++++++++++... */ - $"0000 00FF 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B" /* ...++++++++++++ */ - $"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FF00 0000" /* ++++++++++++... */ - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" /* ... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000" /* ... */ -}; - -data 'icl8' (130) { - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" /* ........... */ - $"FFFF FFFF FF00 0000 0000 0000 0000 0000" /* ........... */ - $"0000 0000 0000 0000 00FF FFEC ECEC ECEC" /* ......... */ - $"ECEC ECEC ECFF FF00 0000 0000 0000 0000" /* ......... */ - $"0000 0000 0000 00FF FFFF FFFF FFFF FFEC" /* ....... */ - $"ECEC ECEC ECEC ECFF FF00 0000 0000 0000" /* ....... */ - $"0000 0000 0000 FFD8 D8FF 0000 0000 00FF" /* ........... */ - $"ECEC ECEC ECEC ECEC ECFF 0000 0000 0000" /* ...... */ - $"0000 0000 00FF D8D8 D8D8 FFFF FF00 0000" /* ........ */ - $"FFEC ECEC ECEC ECEC ECEC FF00 0000 0000" /* ..... */ - $"0000 0000 FFD8 D8D8 D8D8 D8D8 D8FF 0000" /* ...... */ - $"FFEC ECEC ECEC ECEC ECEC ECFF 0000 0000" /* .... */ - $"0000 00FF D8D8 D8D8 D8D8 D8D8 D8FF 0000" /* ..... */ - $"00FF ECEC ECEC ECEC ECEC ECEC FF00 0000" /* .... */ - $"0000 FFD8 D8D8 D8D8 D8D8 D8D8 D8D8 FF00" /* ... */ - $"00FF ECEC ECEC ECEC ECEC ECEC ECFF 0000" /* ... */ - $"0000 FFD8 D8D8 D8D8 D8D8 D8D8 D8D8 FF00" /* ... */ - $"0000 FFEC ECEC ECEC ECEC ECEC ECFF 0000" /* .... */ - $"00FF D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8FF" /* . */ - $"0000 FFEC ECEC ECEC ECEC ECEC ECEC FF00" /* ... */ - $"00FF D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8FF" /* . */ - $"0000 00FF ECEC ECEC ECEC ECEC ECEC FF00" /* .... */ - $"FFD8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8FF" /* */ - $"0000 00FF ECEC ECEC ECEC ECEC ECEC ECFF" /* ... */ - $"FFD8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8FF" /* */ - $"0000 0000 FFEC ECEC ECEC ECEC ECEC ECFF" /* .... */ - $"FFD8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8FF" /* */ - $"0000 0000 FFEC ECEC ECEC ECEC ECEC ECFF" /* .... */ - $"FFD8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 FF00" /* . */ - $"00FF 0000 00FF ECEC ECEC ECEC ECEC ECFF" /* .... */ - $"FFD8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 FF00" /* . */ - $"FFFF 0000 00FF ECEC ECEC ECEC ECEC ECFF" /* ... */ - $"FFD8 D8D8 D8D8 D8D8 D8D8 D8D8 D8FF 0000" /* .. */ - $"FFD8 FF00 0000 FFEC ECEC ECEC ECEC ECFF" /* ... */ - $"FFD8 D8D8 D8D8 D8D8 D8D8 D8D8 D8FF 00FF" /* . */ - $"D8D8 FF00 0000 FFEC ECEC ECEC ECEC ECFF" /* ... */ - $"FFD8 D8D8 D8D8 D8D8 D8D8 D8D8 FF00 00FF" /* .. */ - $"D8D8 FF00 0000 00FF ECEC ECEC ECEC ECFF" /* .... */ - $"FFD8 D8D8 D8D8 D8D8 D8D8 D8D8 FF00 FFD8" /* . */ - $"D8D8 D8FF 0000 00FF ECEC ECEC ECEC ECFF" /* ... */ - $"FFD8 D8D8 D8D8 D8D8 D8D8 D8FF 0000 FFD8" /* .. */ - $"D8D8 D8FF 0000 0000 FFEC ECEC ECEC ECFF" /* .... */ - $"00FF D8D8 D8D8 D8D8 D8D8 D8FF 00FF D8D8" /* .. */ - $"D8D8 D8D8 FF00 0000 FFEC ECEC ECEC FF00" /* .... */ - $"00FF D8D8 D8D8 D8D8 D8D8 FF00 00FF D8D8" /* ... */ - $"D8D8 D8D8 FF00 0000 00FF ECEC ECEC FF00" /* ..... */ - $"0000 FFD8 D8D8 D8D8 D8D8 FF00 FFD8 D8D8" /* ... */ - $"D8D8 D8D8 D8FF 0000 00FF E3E3 FFFF 0000" /* ..... */ - $"0000 FFD8 D8D8 D8D8 D8FF 0000 FFD8 D8D8" /* .... */ - $"D8D8 D8D8 D8FF 0000 0000 E3CB E3FF 0000" /* ...... */ - $"0000 00FF D8D8 D8D8 D8FF 00FF D8D8 D8D8" /* .... */ - $"D8D8 D8D8 D8E3 E3E3 E3E3 E3CB CBE3 0000" /* .. */ - $"0000 0000 FFD8 D8D8 FF00 00FF D8D8 D8D8" /* ...... */ - $"D8D8 D8D8 D8E3 CBCB CBCB CBCB CBCB E300" /* . */ - $"0000 0000 00FF D8D8 FF00 FFD8 D8D8 D8D8" /* ...... */ - $"D8D8 D8D8 D8E3 CBCB CBCB CBCB CBCB CBE3" /* */ - $"0000 0000 0000 FFFF FFFF FFD8 D8D8 D8D8" /* ...... */ - $"D8D8 D8D8 D8E3 CBCB CBCB CBCB CBCB E300" /* . */ - $"0000 0000 0000 00FF FFFF D8D8 D8D8 D8D8" /* ....... */ - $"D8D8 D8D8 D8E3 E3E3 E3E3 E3CB CBE3 0000" /* .. */ - $"0000 0000 0000 0000 00FF FFD8 D8D8 D8D8" /* ......... */ - $"D8D8 D8D8 D8D8 FFFF 0000 E3CB E300 0000" /* ..... */ - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" /* ........... */ - $"FFFF FFFF FFFF 0000 0000 E3E3 0000 0000" /* ........ */ -}; - -data 'ICN#' (128) { - $"001F F800 0075 5600 01FE AB80 0341 5540" /* ....uV...AU@ */ - $"06B8 AAA0 0D54 D550 1AAC 6AA8 3556 5554" /* ..TP.j5VUT */ - $"2AAA 2AAC 5555 3556 6AAB 1AAA D555 1555" /* **UU5Vj.U.U */ - $"AAAB 0AAB D555 0D55 AAAA 46AB D556 C555" /* «U.UFVU */ - $"AAAC A2AB D555 6355 AAA9 A1AB D55B 5155" /* UcU[QU */ - $"AAB2 B0AB 5555 58D6 6AA6 A86A 356D 5854" /* UUXjj5mXT */ - $"2ACA AC2C 1555 5438 0A9A AC30 05B5 5620" /* *ʬ,.UT8š0.V */ - $"03EA ABC0 01D5 5580 006A AE00 001F F800" /* ..U.j.... */ - $"001F F800 007F FE00 01FF FF80 03FF FFC0" /* ........ */ - $"07FF FFE0 0FFF FFF0 1FFF FFF8 3FFF FFFC" /* ...? */ - $"3FFF FFFC 7FFF FFFE 7FFF FFFE FFFF FFFF" /* ?.. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF 7FFF FFFE 7FFF FFFE 3FFF FFFC" /* ..? */ - $"3FFF FFFC 1FFF FFF8 0FFF FFF0 07FF FFE0" /* ?... */ - $"03FF FFC0 01FF FF80 007F FE00 001F F800" /* ........ */ -}; - -data 'ICN#' (129) { - $"1FFF FE00 1000 0300 1000 0280 1000 0240" /* ............@ */ - $"1000 0220 1000 0210 1000 03F8 1000 0008" /* ... ........... */ - $"1007 E008 101F F808 1039 FC08 107E FE08" /* .......9..~. */ - $"107E 7E08 10FF 7F08 10FF 3F08 10FE 3F08" /* .~~.....?..?. */ - $"10FC 9F08 10FD DF08 10F9 CF08 107B EE08" /* .......{. */ - $"1073 E608 1037 F408 101F F808 1007 E008" /* .s..7....... */ - $"1000 0008 1000 0008 1000 0008 1000 0008" /* ................ */ - $"1000 0008 1000 0008 1000 0008 1FFF FFF8" /* ............. */ - $"1FFF FE00 1FFF FF00 1FFF FF80 1FFF FFC0" /* ...... */ - $"1FFF FFE0 1FFF FFF0 1FFF FFF8 1FFF FFF8" /* .... */ - $"1FFF FFF8 1FFF FFF8 1FFF FFF8 1FFF FFF8" /* .... */ - $"1FFF FFF8 1FFF FFF8 1FFF FFF8 1FFF FFF8" /* .... */ - $"1FFF FFF8 1FFF FFF8 1FFF FFF8 1FFF FFF8" /* .... */ - $"1FFF FFF8 1FFF FFF8 1FFF FFF8 1FFF FFF8" /* .... */ - $"1FFF FFF8 1FFF FFF8 1FFF FFF8 1FFF FFF8" /* .... */ - $"1FFF FFF8 1FFF FFF8 1FFF FFF8 1FFF FFF8" /* .... */ -}; - -data 'ICN#' (130) { - $"001F F800 0075 5600 01FE AB80 0341 5540" /* ....uV...AU@ */ - $"06B8 AAA0 0D54 D550 1AAC 6AA8 3556 5554" /* ..TP.j5VUT */ - $"2AAA 2AAC 5555 3556 6AAB 1AAA D555 1555" /* **UU5Vj.U.U */ - $"AAAB 0AAB D555 0D55 AAAA 46AB D556 C555" /* «U.UFVU */ - $"AAAC A2AB D555 6355 AAA9 A1AB D55B 5155" /* UcU[QU */ - $"AAB2 B0AB 5555 58D6 6AA6 A86A 356D 547C" /* UUXjj5mT| */ - $"2ACA AC2C 1555 57E4 0A9A AC02 05B5 5401" /* *ʬ,.UWš..T. */ - $"03EA AC02 01D5 57E4 006A AB28 001F FC30" /* ...W.j(..0 */ - $"001F F800 007F FE00 01FF FF80 03FF FFC0" /* ........ */ - $"07FF FFE0 0FFF FFF0 1FFF FFF8 3FFF FFFC" /* ...? */ - $"3FFF FFFC 7FFF FFFE 7FFF FFFE FFFF FFFF" /* ?.. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF 7FFF FFFE 7FFF FFFE 3FFF FFFC" /* ..? */ - $"3FFF FFFC 1FFF FFFC 0FFF FFFE 07FF FFFF" /* ?... */ - $"03FF FFFE 01FF FFFC 007F FF38 001F FC30" /* ....8..0 */ -}; - -data 'cfrg' (0) { - $"0000 0000 0000 0000 0000 0001 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0001" /* ................ */ - $"7077 7063 0000 0000 0000 0000 0000 0000" /* pwpc............ */ - $"0008 0000 0000 0101 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0030 046D 5265 4400" /* .........0.mReD. */ -}; - -data 'SIZE' (-1) { - $"58F0 02FA F080 0098 9680" /* X.. */ -}; - diff --git a/src/mac/icon/MrEd.icns b/src/mac/icon/GRacket.icns similarity index 100% rename from src/mac/icon/MrEd.icns rename to src/mac/icon/GRacket.icns diff --git a/src/mac/osx_appl.ss b/src/mac/osx_appl.ss index 8ba4f63a53..d6b210752c 100644 --- a/src/mac/osx_appl.ss +++ b/src/mac/osx_appl.ss @@ -31,8 +31,8 @@ "-UseDF" "-o" (path->string (path-replace-suffix app #".rsrc.OSX"))))]) - ; (rez-it "MzScheme") ; useless under OS X... - (rez-it "GRacket" "MrEd")) + ; (rez-it "Racket") ; useless under OS X... + (rez-it "GRacket" "GRacket")) ; make .app templates in the right places: @@ -122,7 +122,7 @@ (create-app (build-path (current-directory) (if for-3m? 'up 'same)) (string-append "GRacket" suffix) - "MrEd" + "GRacket" "APPLmReD" (make-info-plist (string-append "GRacket" suffix) "mReD" #t)) diff --git a/src/mac/mzscheme/simpledrop.cpp b/src/mac/racket/simpledrop.cpp similarity index 100% rename from src/mac/mzscheme/simpledrop.cpp rename to src/mac/racket/simpledrop.cpp diff --git a/src/mac/mzscheme/simpledrop.h b/src/mac/racket/simpledrop.h similarity index 100% rename from src/mac/mzscheme/simpledrop.h rename to src/mac/racket/simpledrop.h diff --git a/src/mred/README b/src/mred/README deleted file mode 100644 index 4d06c89d14..0000000000 --- a/src/mred/README +++ /dev/null @@ -1,8 +0,0 @@ - -This is the MrEd source code directory. See ../README for information -on compiling it. - -Compiled binaries, documentation, and up-to-date information about -MrEd are at - http://www.plt-scheme.org/software/mred/ - diff --git a/src/mzcom/mzcom.cxx b/src/mzcom/mzcom.cxx index 99e29eee1f..05656a84af 100644 --- a/src/mzcom/mzcom.cxx +++ b/src/mzcom/mzcom.cxx @@ -96,7 +96,7 @@ LPCTSTR FindOneOf(LPCTSTR p1, LPCTSTR p2) } #define DLL_RELATIVE_PATH L"lib" -#include "../mzscheme/delayed.inc" +#include "../racket/delayed.inc" ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/mzscheme/version.mak b/src/mzscheme/version.mak deleted file mode 100644 index 07c498975e..0000000000 --- a/src/mzscheme/version.mak +++ /dev/null @@ -1,2 +0,0 @@ - -FWVERSION = $(shell grep ' MZSCHEME_VERSION ' $(mainsrcdir)/mzscheme/src/schvers.h | cut -d '"' -f 2) diff --git a/src/mzscheme/Makefile.in b/src/racket/Makefile.in similarity index 95% rename from src/mzscheme/Makefile.in rename to src/racket/Makefile.in index 10d3cd44a6..fbbe644e96 100644 --- a/src/mzscheme/Makefile.in +++ b/src/racket/Makefile.in @@ -279,7 +279,7 @@ install-both: unix-install: cd ..; rm -f "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@" cd ..; rm -f "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@" - cd ..; cp mzscheme/starter "$(DESTDIR)$(libpltdir)/starter" + cd ..; cp racket/starter "$(DESTDIR)$(libpltdir)/starter" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/starter" cd ..; echo 'CC=@CC@' > "$(BUILDINFO)" cd ..; echo 'CFLAGS=@CFLAGS@ @PREFLAGS@ @COMPFLAGS@' >> "$(BUILDINFO)" @@ -289,19 +289,19 @@ unix-install: cd ..; echo 'LIBS=@LIBS@' >> "$(BUILDINFO)" unix-install-cgc: - cd ..; $(ICP) mzscheme/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" - cd ..; $(ICP) mzscheme/libracket.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket.@LIBSFX@" - cd ..; $(ICP) mzscheme/racket@CGC@ "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@" - cd ..; cp mzscheme/mzdyn.o "$(DESTDIR)$(libpltdir)/mzdyn.o" + cd ..; $(ICP) racket/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" + cd ..; $(ICP) racket/libracket.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket.@LIBSFX@" + cd ..; $(ICP) racket/racket@CGC@ "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@" + cd ..; cp racket/mzdyn.o "$(DESTDIR)$(libpltdir)/mzdyn.o" ./racket@CGC@ -cu "$(srcdir)/collects-path.ss" "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ unix-install-cgc-final: $(NOOP) unix-install-3m: - cd ..; $(ICP) mzscheme/racket@MMM@ "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@" - cd ..; $(ICP) mzscheme/libracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@" - cd ..; $(ICP) mzscheme/mzdyn3m.o "$(DESTDIR)$(libpltdir)/mzdyn3m.o" + cd ..; $(ICP) racket/racket@MMM@ "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@" + cd ..; $(ICP) racket/libracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@" + cd ..; $(ICP) racket/mzdyn3m.o "$(DESTDIR)$(libpltdir)/mzdyn3m.o" ./racket@MMM@ -cu "$(srcdir)/collects-path.ss" "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ unix-install-3m-final: diff --git a/src/mzscheme/README b/src/racket/README similarity index 100% rename from src/mzscheme/README rename to src/racket/README diff --git a/src/mzscheme/cmdline.inc b/src/racket/cmdline.inc similarity index 100% rename from src/mzscheme/cmdline.inc rename to src/racket/cmdline.inc diff --git a/src/mzscheme/collects-path.ss b/src/racket/collects-path.ss similarity index 100% rename from src/mzscheme/collects-path.ss rename to src/racket/collects-path.ss diff --git a/src/mzscheme/configure.ac b/src/racket/configure.ac similarity index 98% rename from src/mzscheme/configure.ac rename to src/racket/configure.ac index d4223f47e3..5e3955c731 100644 --- a/src/mzscheme/configure.ac +++ b/src/racket/configure.ac @@ -21,8 +21,8 @@ # hence PREFLAGS, which is initialized to the original CPPFLAGS. AC_INIT([PLT Scheme]) -AC_CONFIG_SRCDIR(mzscheme/src/bignum.c) -AC_CONFIG_HEADERS([mzscheme/mzconfig.h]) +AC_CONFIG_SRCDIR(racket/src/bignum.c) +AC_CONFIG_HEADERS([racket/mzconfig.h]) AC_ARG_ENABLE(gracket, [ --enable-gracket compile GRacket as well as Racket (enabled by default)], , enable_gracket=yes ) @@ -246,7 +246,7 @@ fi ###### Make sure GRacket is really there ###### if test "${enable_gracket}" = "yes" ; then - if test ! -d $srcdir/mred ; then + if test ! -d $srcdir/gracket ; then enable_gracket=no fi fi @@ -555,7 +555,7 @@ case $OS in ;; AIX) enable_cgcdefault="yes" - EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../mzscheme/include/racket.exp" + EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../racket/include/racket.exp" ;; FreeBSD) LIBS="$LIBS -rdynamic" @@ -636,7 +636,7 @@ case $OS in if test "${enable_shared}" = "yes" ; then ar_libtool_no_undefined=" -no-undefined" LIBRACKET_DEP="libmzgc.la -liconv" - LIBGRACKET_DEP="../mzscheme/libmzgc.la ../mzscheme/libgracket.la" + LIBGRACKET_DEP="../racket/libmzgc.la ../racket/libgracket.la" fi EXE_SUFFIX=".exe" ;; @@ -1394,7 +1394,7 @@ if test "${enable_shared}" = "yes" ; then if test "$INCLUDEDEP" = "-include" ; then plt_lib_version="\$(FWVERSION)" else - plt_lib_version=`grep " MZSCHEME_VERSION " ${srcdir}/mzscheme/src/schvers.h | cut -d '"' -f 2` + plt_lib_version=`grep " MZSCHEME_VERSION " ${srcdir}/racket/src/schvers.h | cut -d '"' -f 2` fi AR="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc}${ar_libtool_no_undefined} -release ${plt_lib_version} -rpath ${abslibdir} \$(ARLIBFLAGS) -o" @@ -1549,10 +1549,10 @@ mk_needed_dir() } makefiles="Makefile - mzscheme/Makefile - mzscheme/src/Makefile mzscheme/dynsrc/Makefile - mzscheme/gc/Makefile mzscheme/sgc/Makefile - mzscheme/gc2/Makefile" + racket/Makefile + racket/src/Makefile racket/dynsrc/Makefile + racket/gc/Makefile racket/sgc/Makefile + racket/gc2/Makefile" # Make sure the --enable-shared default is propagated: if test "${enable_shared}" = "yes" ; then @@ -1560,8 +1560,8 @@ if test "${enable_shared}" = "yes" ; then fi if test "${LIBATOM}" = "LIBATOM_USE" ; then - AC_CONFIG_AUX_DIR( mzscheme/gc/libatomic_ops ) - AC_CONFIG_SUBDIRS( mzscheme/gc/libatomic_ops ) + AC_CONFIG_AUX_DIR( racket/gc/libatomic_ops ) + AC_CONFIG_SUBDIRS( racket/gc/libatomic_ops ) fi FOREIGNTARGET= @@ -1595,9 +1595,9 @@ if test "${enable_gracket}" = "yes" ; then fi makefiles="$makefiles - mred/Makefile - mred/wxs/Makefile - mred/gc2/Makefile" + gracket/Makefile + gracket/wxs/Makefile + gracket/gc2/Makefile" if test "${enable_libpng}" != "yes" ; then makefiles="$makefiles diff --git a/src/mzscheme/delayed.inc b/src/racket/delayed.inc similarity index 100% rename from src/mzscheme/delayed.inc rename to src/racket/delayed.inc diff --git a/src/mzscheme/dynsrc/Makefile.in b/src/racket/dynsrc/Makefile.in similarity index 100% rename from src/mzscheme/dynsrc/Makefile.in rename to src/racket/dynsrc/Makefile.in diff --git a/src/mzscheme/dynsrc/dynexmpl.c b/src/racket/dynsrc/dynexmpl.c similarity index 100% rename from src/mzscheme/dynsrc/dynexmpl.c rename to src/racket/dynsrc/dynexmpl.c diff --git a/src/mzscheme/dynsrc/fixup.c b/src/racket/dynsrc/fixup.c similarity index 100% rename from src/mzscheme/dynsrc/fixup.c rename to src/racket/dynsrc/fixup.c diff --git a/src/mzscheme/dynsrc/init.cc b/src/racket/dynsrc/init.cc similarity index 100% rename from src/mzscheme/dynsrc/init.cc rename to src/racket/dynsrc/init.cc diff --git a/src/mzscheme/dynsrc/mkbordyn.bat b/src/racket/dynsrc/mkbordyn.bat similarity index 100% rename from src/mzscheme/dynsrc/mkbordyn.bat rename to src/racket/dynsrc/mkbordyn.bat diff --git a/src/mzscheme/dynsrc/mkmzdyn.bat b/src/racket/dynsrc/mkmzdyn.bat similarity index 100% rename from src/mzscheme/dynsrc/mkmzdyn.bat rename to src/racket/dynsrc/mkmzdyn.bat diff --git a/src/mzscheme/dynsrc/mkmzdynd.bat b/src/racket/dynsrc/mkmzdynd.bat similarity index 100% rename from src/mzscheme/dynsrc/mkmzdynd.bat rename to src/racket/dynsrc/mkmzdynd.bat diff --git a/src/mzscheme/dynsrc/mzdyn.c b/src/racket/dynsrc/mzdyn.c similarity index 100% rename from src/mzscheme/dynsrc/mzdyn.c rename to src/racket/dynsrc/mzdyn.c diff --git a/src/mzscheme/dynsrc/mzdyn.def b/src/racket/dynsrc/mzdyn.def similarity index 100% rename from src/mzscheme/dynsrc/mzdyn.def rename to src/racket/dynsrc/mzdyn.def diff --git a/src/mzscheme/dynsrc/mzdynb.def b/src/racket/dynsrc/mzdynb.def similarity index 100% rename from src/mzscheme/dynsrc/mzdynb.def rename to src/racket/dynsrc/mzdynb.def diff --git a/src/mzscheme/dynsrc/start.c b/src/racket/dynsrc/start.c similarity index 100% rename from src/mzscheme/dynsrc/start.c rename to src/racket/dynsrc/start.c diff --git a/src/mzscheme/dynsrc/ustart.c b/src/racket/dynsrc/ustart.c similarity index 100% rename from src/mzscheme/dynsrc/ustart.c rename to src/racket/dynsrc/ustart.c diff --git a/src/mzscheme/gc/AmigaOS.c b/src/racket/gc/AmigaOS.c similarity index 100% rename from src/mzscheme/gc/AmigaOS.c rename to src/racket/gc/AmigaOS.c diff --git a/src/mzscheme/gc/BCC_MAKEFILE b/src/racket/gc/BCC_MAKEFILE similarity index 100% rename from src/mzscheme/gc/BCC_MAKEFILE rename to src/racket/gc/BCC_MAKEFILE diff --git a/src/mzscheme/gc/ChangeLog b/src/racket/gc/ChangeLog similarity index 100% rename from src/mzscheme/gc/ChangeLog rename to src/racket/gc/ChangeLog diff --git a/src/mzscheme/gc/EMX_MAKEFILE b/src/racket/gc/EMX_MAKEFILE similarity index 100% rename from src/mzscheme/gc/EMX_MAKEFILE rename to src/racket/gc/EMX_MAKEFILE diff --git a/src/mzscheme/gc/MacOS.c b/src/racket/gc/MacOS.c similarity index 100% rename from src/mzscheme/gc/MacOS.c rename to src/racket/gc/MacOS.c diff --git a/src/mzscheme/gc/MacProjects.sit.hqx b/src/racket/gc/MacProjects.sit.hqx similarity index 100% rename from src/mzscheme/gc/MacProjects.sit.hqx rename to src/racket/gc/MacProjects.sit.hqx diff --git a/src/mzscheme/gc/Mac_files/MacOS_Test_config.h b/src/racket/gc/Mac_files/MacOS_Test_config.h similarity index 100% rename from src/mzscheme/gc/Mac_files/MacOS_Test_config.h rename to src/racket/gc/Mac_files/MacOS_Test_config.h diff --git a/src/mzscheme/gc/Mac_files/MacOS_config.h b/src/racket/gc/Mac_files/MacOS_config.h similarity index 100% rename from src/mzscheme/gc/Mac_files/MacOS_config.h rename to src/racket/gc/Mac_files/MacOS_config.h diff --git a/src/mzscheme/gc/Mac_files/dataend.c b/src/racket/gc/Mac_files/dataend.c similarity index 100% rename from src/mzscheme/gc/Mac_files/dataend.c rename to src/racket/gc/Mac_files/dataend.c diff --git a/src/mzscheme/gc/Mac_files/datastart.c b/src/racket/gc/Mac_files/datastart.c similarity index 100% rename from src/mzscheme/gc/Mac_files/datastart.c rename to src/racket/gc/Mac_files/datastart.c diff --git a/src/mzscheme/gc/Makefile.DLLs b/src/racket/gc/Makefile.DLLs similarity index 100% rename from src/mzscheme/gc/Makefile.DLLs rename to src/racket/gc/Makefile.DLLs diff --git a/src/mzscheme/gc/Makefile.am b/src/racket/gc/Makefile.am similarity index 100% rename from src/mzscheme/gc/Makefile.am rename to src/racket/gc/Makefile.am diff --git a/src/mzscheme/gc/Makefile.direct b/src/racket/gc/Makefile.direct similarity index 100% rename from src/mzscheme/gc/Makefile.direct rename to src/racket/gc/Makefile.direct diff --git a/src/mzscheme/gc/Makefile.dj b/src/racket/gc/Makefile.dj similarity index 100% rename from src/mzscheme/gc/Makefile.dj rename to src/racket/gc/Makefile.dj diff --git a/src/mzscheme/gc/Makefile.in b/src/racket/gc/Makefile.in similarity index 100% rename from src/mzscheme/gc/Makefile.in rename to src/racket/gc/Makefile.in diff --git a/src/mzscheme/gc/NT_MAKEFILE b/src/racket/gc/NT_MAKEFILE similarity index 100% rename from src/mzscheme/gc/NT_MAKEFILE rename to src/racket/gc/NT_MAKEFILE diff --git a/src/mzscheme/gc/NT_STATIC_THREADS_MAKEFILE b/src/racket/gc/NT_STATIC_THREADS_MAKEFILE similarity index 100% rename from src/mzscheme/gc/NT_STATIC_THREADS_MAKEFILE rename to src/racket/gc/NT_STATIC_THREADS_MAKEFILE diff --git a/src/mzscheme/gc/NT_THREADS_MAKEFILE b/src/racket/gc/NT_THREADS_MAKEFILE similarity index 100% rename from src/mzscheme/gc/NT_THREADS_MAKEFILE rename to src/racket/gc/NT_THREADS_MAKEFILE diff --git a/src/mzscheme/gc/NT_X64_STATIC_THREADS_MAKEFILE b/src/racket/gc/NT_X64_STATIC_THREADS_MAKEFILE similarity index 100% rename from src/mzscheme/gc/NT_X64_STATIC_THREADS_MAKEFILE rename to src/racket/gc/NT_X64_STATIC_THREADS_MAKEFILE diff --git a/src/mzscheme/gc/NT_X64_THREADS_MAKEFILE b/src/racket/gc/NT_X64_THREADS_MAKEFILE similarity index 100% rename from src/mzscheme/gc/NT_X64_THREADS_MAKEFILE rename to src/racket/gc/NT_X64_THREADS_MAKEFILE diff --git a/src/mzscheme/gc/OS2_MAKEFILE b/src/racket/gc/OS2_MAKEFILE similarity index 100% rename from src/mzscheme/gc/OS2_MAKEFILE rename to src/racket/gc/OS2_MAKEFILE diff --git a/src/mzscheme/gc/PCR-Makefile b/src/racket/gc/PCR-Makefile similarity index 100% rename from src/mzscheme/gc/PCR-Makefile rename to src/racket/gc/PCR-Makefile diff --git a/src/mzscheme/gc/README.QUICK b/src/racket/gc/README.QUICK similarity index 100% rename from src/mzscheme/gc/README.QUICK rename to src/racket/gc/README.QUICK diff --git a/src/mzscheme/gc/SMakefile.amiga b/src/racket/gc/SMakefile.amiga similarity index 100% rename from src/mzscheme/gc/SMakefile.amiga rename to src/racket/gc/SMakefile.amiga diff --git a/src/mzscheme/gc/WCC_MAKEFILE b/src/racket/gc/WCC_MAKEFILE similarity index 100% rename from src/mzscheme/gc/WCC_MAKEFILE rename to src/racket/gc/WCC_MAKEFILE diff --git a/src/mzscheme/gc/acinclude.m4 b/src/racket/gc/acinclude.m4 similarity index 100% rename from src/mzscheme/gc/acinclude.m4 rename to src/racket/gc/acinclude.m4 diff --git a/src/mzscheme/gc/aclocal.m4 b/src/racket/gc/aclocal.m4 similarity index 100% rename from src/mzscheme/gc/aclocal.m4 rename to src/racket/gc/aclocal.m4 diff --git a/src/mzscheme/gc/add_gc_prefix.c b/src/racket/gc/add_gc_prefix.c similarity index 100% rename from src/mzscheme/gc/add_gc_prefix.c rename to src/racket/gc/add_gc_prefix.c diff --git a/src/mzscheme/gc/allchblk.c b/src/racket/gc/allchblk.c similarity index 100% rename from src/mzscheme/gc/allchblk.c rename to src/racket/gc/allchblk.c diff --git a/src/mzscheme/gc/alloc.c b/src/racket/gc/alloc.c similarity index 100% rename from src/mzscheme/gc/alloc.c rename to src/racket/gc/alloc.c diff --git a/src/mzscheme/gc/alpha_mach_dep.S b/src/racket/gc/alpha_mach_dep.S similarity index 100% rename from src/mzscheme/gc/alpha_mach_dep.S rename to src/racket/gc/alpha_mach_dep.S diff --git a/src/mzscheme/gc/backgraph.c b/src/racket/gc/backgraph.c similarity index 100% rename from src/mzscheme/gc/backgraph.c rename to src/racket/gc/backgraph.c diff --git a/src/mzscheme/gc/blacklst.c b/src/racket/gc/blacklst.c similarity index 100% rename from src/mzscheme/gc/blacklst.c rename to src/racket/gc/blacklst.c diff --git a/src/mzscheme/gc/callprocs b/src/racket/gc/callprocs similarity index 100% rename from src/mzscheme/gc/callprocs rename to src/racket/gc/callprocs diff --git a/src/mzscheme/gc/checksums.c b/src/racket/gc/checksums.c similarity index 100% rename from src/mzscheme/gc/checksums.c rename to src/racket/gc/checksums.c diff --git a/src/mzscheme/gc/config.guess b/src/racket/gc/config.guess similarity index 100% rename from src/mzscheme/gc/config.guess rename to src/racket/gc/config.guess diff --git a/src/mzscheme/gc/config.sub b/src/racket/gc/config.sub similarity index 100% rename from src/mzscheme/gc/config.sub rename to src/racket/gc/config.sub diff --git a/src/mzscheme/gc/configure b/src/racket/gc/configure similarity index 100% rename from src/mzscheme/gc/configure rename to src/racket/gc/configure diff --git a/src/mzscheme/gc/configure.host b/src/racket/gc/configure.host similarity index 100% rename from src/mzscheme/gc/configure.host rename to src/racket/gc/configure.host diff --git a/src/mzscheme/gc/configure.in b/src/racket/gc/configure.in similarity index 100% rename from src/mzscheme/gc/configure.in rename to src/racket/gc/configure.in diff --git a/src/mzscheme/gc/cord/cordbscs.c b/src/racket/gc/cord/cordbscs.c similarity index 100% rename from src/mzscheme/gc/cord/cordbscs.c rename to src/racket/gc/cord/cordbscs.c diff --git a/src/mzscheme/gc/cord/cordprnt.c b/src/racket/gc/cord/cordprnt.c similarity index 100% rename from src/mzscheme/gc/cord/cordprnt.c rename to src/racket/gc/cord/cordprnt.c diff --git a/src/mzscheme/gc/cord/cordtest.c b/src/racket/gc/cord/cordtest.c similarity index 100% rename from src/mzscheme/gc/cord/cordtest.c rename to src/racket/gc/cord/cordtest.c diff --git a/src/mzscheme/gc/cord/cordxtra.c b/src/racket/gc/cord/cordxtra.c similarity index 100% rename from src/mzscheme/gc/cord/cordxtra.c rename to src/racket/gc/cord/cordxtra.c diff --git a/src/mzscheme/gc/cord/de.c b/src/racket/gc/cord/de.c similarity index 100% rename from src/mzscheme/gc/cord/de.c rename to src/racket/gc/cord/de.c diff --git a/src/mzscheme/gc/cord/de_cmds.h b/src/racket/gc/cord/de_cmds.h similarity index 100% rename from src/mzscheme/gc/cord/de_cmds.h rename to src/racket/gc/cord/de_cmds.h diff --git a/src/mzscheme/gc/cord/de_win.ICO b/src/racket/gc/cord/de_win.ICO similarity index 100% rename from src/mzscheme/gc/cord/de_win.ICO rename to src/racket/gc/cord/de_win.ICO diff --git a/src/mzscheme/gc/cord/de_win.RC b/src/racket/gc/cord/de_win.RC similarity index 100% rename from src/mzscheme/gc/cord/de_win.RC rename to src/racket/gc/cord/de_win.RC diff --git a/src/mzscheme/gc/cord/de_win.c b/src/racket/gc/cord/de_win.c similarity index 100% rename from src/mzscheme/gc/cord/de_win.c rename to src/racket/gc/cord/de_win.c diff --git a/src/mzscheme/gc/cord/de_win.h b/src/racket/gc/cord/de_win.h similarity index 100% rename from src/mzscheme/gc/cord/de_win.h rename to src/racket/gc/cord/de_win.h diff --git a/src/mzscheme/gc/darwin_stop_world.c b/src/racket/gc/darwin_stop_world.c similarity index 100% rename from src/mzscheme/gc/darwin_stop_world.c rename to src/racket/gc/darwin_stop_world.c diff --git a/src/mzscheme/gc/dbg_mlc.c b/src/racket/gc/dbg_mlc.c similarity index 100% rename from src/mzscheme/gc/dbg_mlc.c rename to src/racket/gc/dbg_mlc.c diff --git a/src/mzscheme/gc/depcomp b/src/racket/gc/depcomp similarity index 100% rename from src/mzscheme/gc/depcomp rename to src/racket/gc/depcomp diff --git a/src/mzscheme/gc/digimars.mak b/src/racket/gc/digimars.mak similarity index 100% rename from src/mzscheme/gc/digimars.mak rename to src/racket/gc/digimars.mak diff --git a/src/mzscheme/gc/doc/Makefile.am b/src/racket/gc/doc/Makefile.am similarity index 100% rename from src/mzscheme/gc/doc/Makefile.am rename to src/racket/gc/doc/Makefile.am diff --git a/src/mzscheme/gc/doc/Makefile.in b/src/racket/gc/doc/Makefile.in similarity index 100% rename from src/mzscheme/gc/doc/Makefile.in rename to src/racket/gc/doc/Makefile.in diff --git a/src/mzscheme/gc/doc/README b/src/racket/gc/doc/README similarity index 100% rename from src/mzscheme/gc/doc/README rename to src/racket/gc/doc/README diff --git a/src/mzscheme/gc/doc/README.DGUX386 b/src/racket/gc/doc/README.DGUX386 similarity index 100% rename from src/mzscheme/gc/doc/README.DGUX386 rename to src/racket/gc/doc/README.DGUX386 diff --git a/src/mzscheme/gc/doc/README.Mac b/src/racket/gc/doc/README.Mac similarity index 100% rename from src/mzscheme/gc/doc/README.Mac rename to src/racket/gc/doc/README.Mac diff --git a/src/mzscheme/gc/doc/README.MacOSX b/src/racket/gc/doc/README.MacOSX similarity index 100% rename from src/mzscheme/gc/doc/README.MacOSX rename to src/racket/gc/doc/README.MacOSX diff --git a/src/mzscheme/gc/doc/README.OS2 b/src/racket/gc/doc/README.OS2 similarity index 100% rename from src/mzscheme/gc/doc/README.OS2 rename to src/racket/gc/doc/README.OS2 diff --git a/src/mzscheme/gc/doc/README.amiga b/src/racket/gc/doc/README.amiga similarity index 100% rename from src/mzscheme/gc/doc/README.amiga rename to src/racket/gc/doc/README.amiga diff --git a/src/mzscheme/gc/doc/README.arm.cross b/src/racket/gc/doc/README.arm.cross similarity index 100% rename from src/mzscheme/gc/doc/README.arm.cross rename to src/racket/gc/doc/README.arm.cross diff --git a/src/mzscheme/gc/doc/README.autoconf b/src/racket/gc/doc/README.autoconf similarity index 100% rename from src/mzscheme/gc/doc/README.autoconf rename to src/racket/gc/doc/README.autoconf diff --git a/src/mzscheme/gc/doc/README.changes b/src/racket/gc/doc/README.changes similarity index 100% rename from src/mzscheme/gc/doc/README.changes rename to src/racket/gc/doc/README.changes diff --git a/src/mzscheme/gc/doc/README.contributors b/src/racket/gc/doc/README.contributors similarity index 100% rename from src/mzscheme/gc/doc/README.contributors rename to src/racket/gc/doc/README.contributors diff --git a/src/mzscheme/gc/doc/README.cords b/src/racket/gc/doc/README.cords similarity index 100% rename from src/mzscheme/gc/doc/README.cords rename to src/racket/gc/doc/README.cords diff --git a/src/mzscheme/gc/doc/README.darwin b/src/racket/gc/doc/README.darwin similarity index 100% rename from src/mzscheme/gc/doc/README.darwin rename to src/racket/gc/doc/README.darwin diff --git a/src/mzscheme/gc/doc/README.dj b/src/racket/gc/doc/README.dj similarity index 100% rename from src/mzscheme/gc/doc/README.dj rename to src/racket/gc/doc/README.dj diff --git a/src/mzscheme/gc/doc/README.environment b/src/racket/gc/doc/README.environment similarity index 100% rename from src/mzscheme/gc/doc/README.environment rename to src/racket/gc/doc/README.environment diff --git a/src/mzscheme/gc/doc/README.ews4800 b/src/racket/gc/doc/README.ews4800 similarity index 100% rename from src/mzscheme/gc/doc/README.ews4800 rename to src/racket/gc/doc/README.ews4800 diff --git a/src/mzscheme/gc/doc/README.hp b/src/racket/gc/doc/README.hp similarity index 100% rename from src/mzscheme/gc/doc/README.hp rename to src/racket/gc/doc/README.hp diff --git a/src/mzscheme/gc/doc/README.linux b/src/racket/gc/doc/README.linux similarity index 100% rename from src/mzscheme/gc/doc/README.linux rename to src/racket/gc/doc/README.linux diff --git a/src/mzscheme/gc/doc/README.macros b/src/racket/gc/doc/README.macros similarity index 100% rename from src/mzscheme/gc/doc/README.macros rename to src/racket/gc/doc/README.macros diff --git a/src/mzscheme/gc/doc/README.rs6000 b/src/racket/gc/doc/README.rs6000 similarity index 100% rename from src/mzscheme/gc/doc/README.rs6000 rename to src/racket/gc/doc/README.rs6000 diff --git a/src/mzscheme/gc/doc/README.sgi b/src/racket/gc/doc/README.sgi similarity index 100% rename from src/mzscheme/gc/doc/README.sgi rename to src/racket/gc/doc/README.sgi diff --git a/src/mzscheme/gc/doc/README.solaris2 b/src/racket/gc/doc/README.solaris2 similarity index 100% rename from src/mzscheme/gc/doc/README.solaris2 rename to src/racket/gc/doc/README.solaris2 diff --git a/src/mzscheme/gc/doc/README.uts b/src/racket/gc/doc/README.uts similarity index 100% rename from src/mzscheme/gc/doc/README.uts rename to src/racket/gc/doc/README.uts diff --git a/src/mzscheme/gc/doc/README.win32 b/src/racket/gc/doc/README.win32 similarity index 100% rename from src/mzscheme/gc/doc/README.win32 rename to src/racket/gc/doc/README.win32 diff --git a/src/mzscheme/gc/doc/README.win64 b/src/racket/gc/doc/README.win64 similarity index 100% rename from src/mzscheme/gc/doc/README.win64 rename to src/racket/gc/doc/README.win64 diff --git a/src/mzscheme/gc/doc/barrett_diagram b/src/racket/gc/doc/barrett_diagram similarity index 100% rename from src/mzscheme/gc/doc/barrett_diagram rename to src/racket/gc/doc/barrett_diagram diff --git a/src/mzscheme/gc/doc/debugging.html b/src/racket/gc/doc/debugging.html similarity index 100% rename from src/mzscheme/gc/doc/debugging.html rename to src/racket/gc/doc/debugging.html diff --git a/src/mzscheme/gc/doc/gc.man b/src/racket/gc/doc/gc.man similarity index 100% rename from src/mzscheme/gc/doc/gc.man rename to src/racket/gc/doc/gc.man diff --git a/src/mzscheme/gc/doc/gcdescr.html b/src/racket/gc/doc/gcdescr.html similarity index 100% rename from src/mzscheme/gc/doc/gcdescr.html rename to src/racket/gc/doc/gcdescr.html diff --git a/src/mzscheme/gc/doc/gcinterface.html b/src/racket/gc/doc/gcinterface.html similarity index 100% rename from src/mzscheme/gc/doc/gcinterface.html rename to src/racket/gc/doc/gcinterface.html diff --git a/src/mzscheme/gc/doc/leak.html b/src/racket/gc/doc/leak.html similarity index 100% rename from src/mzscheme/gc/doc/leak.html rename to src/racket/gc/doc/leak.html diff --git a/src/mzscheme/gc/doc/overview.html b/src/racket/gc/doc/overview.html similarity index 100% rename from src/mzscheme/gc/doc/overview.html rename to src/racket/gc/doc/overview.html diff --git a/src/mzscheme/gc/doc/porting.html b/src/racket/gc/doc/porting.html similarity index 100% rename from src/mzscheme/gc/doc/porting.html rename to src/racket/gc/doc/porting.html diff --git a/src/mzscheme/gc/doc/scale.html b/src/racket/gc/doc/scale.html similarity index 100% rename from src/mzscheme/gc/doc/scale.html rename to src/racket/gc/doc/scale.html diff --git a/src/mzscheme/gc/doc/simple_example.html b/src/racket/gc/doc/simple_example.html similarity index 100% rename from src/mzscheme/gc/doc/simple_example.html rename to src/racket/gc/doc/simple_example.html diff --git a/src/mzscheme/gc/doc/tree.html b/src/racket/gc/doc/tree.html similarity index 100% rename from src/mzscheme/gc/doc/tree.html rename to src/racket/gc/doc/tree.html diff --git a/src/mzscheme/gc/dyn_load.c b/src/racket/gc/dyn_load.c similarity index 100% rename from src/mzscheme/gc/dyn_load.c rename to src/racket/gc/dyn_load.c diff --git a/src/mzscheme/gc/finalize.c b/src/racket/gc/finalize.c similarity index 100% rename from src/mzscheme/gc/finalize.c rename to src/racket/gc/finalize.c diff --git a/src/mzscheme/gc/gc.h b/src/racket/gc/gc.h similarity index 100% rename from src/mzscheme/gc/gc.h rename to src/racket/gc/gc.h diff --git a/src/mzscheme/gc/gc.mak b/src/racket/gc/gc.mak similarity index 100% rename from src/mzscheme/gc/gc.mak rename to src/racket/gc/gc.mak diff --git a/src/mzscheme/gc/gc_cpp.cc b/src/racket/gc/gc_cpp.cc similarity index 100% rename from src/mzscheme/gc/gc_cpp.cc rename to src/racket/gc/gc_cpp.cc diff --git a/src/mzscheme/gc/gc_cpp.cpp b/src/racket/gc/gc_cpp.cpp similarity index 100% rename from src/mzscheme/gc/gc_cpp.cpp rename to src/racket/gc/gc_cpp.cpp diff --git a/src/mzscheme/gc/gc_dlopen.c b/src/racket/gc/gc_dlopen.c similarity index 100% rename from src/mzscheme/gc/gc_dlopen.c rename to src/racket/gc/gc_dlopen.c diff --git a/src/mzscheme/gc/gcc_support.c b/src/racket/gc/gcc_support.c similarity index 100% rename from src/mzscheme/gc/gcc_support.c rename to src/racket/gc/gcc_support.c diff --git a/src/mzscheme/gc/gcj_mlc.c b/src/racket/gc/gcj_mlc.c similarity index 100% rename from src/mzscheme/gc/gcj_mlc.c rename to src/racket/gc/gcj_mlc.c diff --git a/src/mzscheme/gc/gcname.c b/src/racket/gc/gcname.c similarity index 100% rename from src/mzscheme/gc/gcname.c rename to src/racket/gc/gcname.c diff --git a/src/mzscheme/gc/headers.c b/src/racket/gc/headers.c similarity index 100% rename from src/mzscheme/gc/headers.c rename to src/racket/gc/headers.c diff --git a/src/mzscheme/gc/hpux_test_and_clear.s b/src/racket/gc/hpux_test_and_clear.s similarity index 100% rename from src/mzscheme/gc/hpux_test_and_clear.s rename to src/racket/gc/hpux_test_and_clear.s diff --git a/src/mzscheme/gc/ia64_save_regs_in_stack.s b/src/racket/gc/ia64_save_regs_in_stack.s similarity index 100% rename from src/mzscheme/gc/ia64_save_regs_in_stack.s rename to src/racket/gc/ia64_save_regs_in_stack.s diff --git a/src/mzscheme/gc/if_mach.c b/src/racket/gc/if_mach.c similarity index 100% rename from src/mzscheme/gc/if_mach.c rename to src/racket/gc/if_mach.c diff --git a/src/mzscheme/gc/if_not_there.c b/src/racket/gc/if_not_there.c similarity index 100% rename from src/mzscheme/gc/if_not_there.c rename to src/racket/gc/if_not_there.c diff --git a/src/mzscheme/gc/include/Makefile.am b/src/racket/gc/include/Makefile.am similarity index 100% rename from src/mzscheme/gc/include/Makefile.am rename to src/racket/gc/include/Makefile.am diff --git a/src/mzscheme/gc/include/Makefile.in b/src/racket/gc/include/Makefile.in similarity index 100% rename from src/mzscheme/gc/include/Makefile.in rename to src/racket/gc/include/Makefile.in diff --git a/src/mzscheme/gc/include/cord.h b/src/racket/gc/include/cord.h similarity index 100% rename from src/mzscheme/gc/include/cord.h rename to src/racket/gc/include/cord.h diff --git a/src/mzscheme/gc/include/ec.h b/src/racket/gc/include/ec.h similarity index 100% rename from src/mzscheme/gc/include/ec.h rename to src/racket/gc/include/ec.h diff --git a/src/mzscheme/gc/include/extra/gc.h b/src/racket/gc/include/extra/gc.h similarity index 100% rename from src/mzscheme/gc/include/extra/gc.h rename to src/racket/gc/include/extra/gc.h diff --git a/src/mzscheme/gc/include/extra/gc_cpp.h b/src/racket/gc/include/extra/gc_cpp.h similarity index 100% rename from src/mzscheme/gc/include/extra/gc_cpp.h rename to src/racket/gc/include/extra/gc_cpp.h diff --git a/src/mzscheme/gc/include/gc.h b/src/racket/gc/include/gc.h similarity index 100% rename from src/mzscheme/gc/include/gc.h rename to src/racket/gc/include/gc.h diff --git a/src/mzscheme/gc/include/gc_alloc.h b/src/racket/gc/include/gc_alloc.h similarity index 100% rename from src/mzscheme/gc/include/gc_alloc.h rename to src/racket/gc/include/gc_alloc.h diff --git a/src/mzscheme/gc/include/gc_allocator.h b/src/racket/gc/include/gc_allocator.h similarity index 100% rename from src/mzscheme/gc/include/gc_allocator.h rename to src/racket/gc/include/gc_allocator.h diff --git a/src/mzscheme/gc/include/gc_amiga_redirects.h b/src/racket/gc/include/gc_amiga_redirects.h similarity index 100% rename from src/mzscheme/gc/include/gc_amiga_redirects.h rename to src/racket/gc/include/gc_amiga_redirects.h diff --git a/src/mzscheme/gc/include/gc_backptr.h b/src/racket/gc/include/gc_backptr.h similarity index 100% rename from src/mzscheme/gc/include/gc_backptr.h rename to src/racket/gc/include/gc_backptr.h diff --git a/src/mzscheme/gc/include/gc_config_macros.h b/src/racket/gc/include/gc_config_macros.h similarity index 100% rename from src/mzscheme/gc/include/gc_config_macros.h rename to src/racket/gc/include/gc_config_macros.h diff --git a/src/mzscheme/gc/include/gc_cpp.h b/src/racket/gc/include/gc_cpp.h similarity index 100% rename from src/mzscheme/gc/include/gc_cpp.h rename to src/racket/gc/include/gc_cpp.h diff --git a/src/mzscheme/gc/include/gc_gcj.h b/src/racket/gc/include/gc_gcj.h similarity index 100% rename from src/mzscheme/gc/include/gc_gcj.h rename to src/racket/gc/include/gc_gcj.h diff --git a/src/mzscheme/gc/include/gc_inl.h b/src/racket/gc/include/gc_inl.h similarity index 100% rename from src/mzscheme/gc/include/gc_inl.h rename to src/racket/gc/include/gc_inl.h diff --git a/src/mzscheme/gc/include/gc_inline.h b/src/racket/gc/include/gc_inline.h similarity index 100% rename from src/mzscheme/gc/include/gc_inline.h rename to src/racket/gc/include/gc_inline.h diff --git a/src/mzscheme/gc/include/gc_local_alloc.h b/src/racket/gc/include/gc_local_alloc.h similarity index 100% rename from src/mzscheme/gc/include/gc_local_alloc.h rename to src/racket/gc/include/gc_local_alloc.h diff --git a/src/mzscheme/gc/include/gc_mark.h b/src/racket/gc/include/gc_mark.h similarity index 100% rename from src/mzscheme/gc/include/gc_mark.h rename to src/racket/gc/include/gc_mark.h diff --git a/src/mzscheme/gc/include/gc_pthread_redirects.h b/src/racket/gc/include/gc_pthread_redirects.h similarity index 100% rename from src/mzscheme/gc/include/gc_pthread_redirects.h rename to src/racket/gc/include/gc_pthread_redirects.h diff --git a/src/mzscheme/gc/include/gc_tiny_fl.h b/src/racket/gc/include/gc_tiny_fl.h similarity index 100% rename from src/mzscheme/gc/include/gc_tiny_fl.h rename to src/racket/gc/include/gc_tiny_fl.h diff --git a/src/mzscheme/gc/include/gc_typed.h b/src/racket/gc/include/gc_typed.h similarity index 100% rename from src/mzscheme/gc/include/gc_typed.h rename to src/racket/gc/include/gc_typed.h diff --git a/src/mzscheme/gc/include/gc_version.h b/src/racket/gc/include/gc_version.h similarity index 100% rename from src/mzscheme/gc/include/gc_version.h rename to src/racket/gc/include/gc_version.h diff --git a/src/mzscheme/gc/include/javaxfc.h b/src/racket/gc/include/javaxfc.h similarity index 100% rename from src/mzscheme/gc/include/javaxfc.h rename to src/racket/gc/include/javaxfc.h diff --git a/src/mzscheme/gc/include/leak_detector.h b/src/racket/gc/include/leak_detector.h similarity index 100% rename from src/mzscheme/gc/include/leak_detector.h rename to src/racket/gc/include/leak_detector.h diff --git a/src/mzscheme/gc/include/new_gc_alloc.h b/src/racket/gc/include/new_gc_alloc.h similarity index 100% rename from src/mzscheme/gc/include/new_gc_alloc.h rename to src/racket/gc/include/new_gc_alloc.h diff --git a/src/mzscheme/gc/include/private/cord_pos.h b/src/racket/gc/include/private/cord_pos.h similarity index 100% rename from src/mzscheme/gc/include/private/cord_pos.h rename to src/racket/gc/include/private/cord_pos.h diff --git a/src/mzscheme/gc/include/private/darwin_semaphore.h b/src/racket/gc/include/private/darwin_semaphore.h similarity index 100% rename from src/mzscheme/gc/include/private/darwin_semaphore.h rename to src/racket/gc/include/private/darwin_semaphore.h diff --git a/src/mzscheme/gc/include/private/darwin_stop_world.h b/src/racket/gc/include/private/darwin_stop_world.h similarity index 100% rename from src/mzscheme/gc/include/private/darwin_stop_world.h rename to src/racket/gc/include/private/darwin_stop_world.h diff --git a/src/mzscheme/gc/include/private/dbg_mlc.h b/src/racket/gc/include/private/dbg_mlc.h similarity index 100% rename from src/mzscheme/gc/include/private/dbg_mlc.h rename to src/racket/gc/include/private/dbg_mlc.h diff --git a/src/mzscheme/gc/include/private/gc_hdrs.h b/src/racket/gc/include/private/gc_hdrs.h similarity index 100% rename from src/mzscheme/gc/include/private/gc_hdrs.h rename to src/racket/gc/include/private/gc_hdrs.h diff --git a/src/mzscheme/gc/include/private/gc_locks.h b/src/racket/gc/include/private/gc_locks.h similarity index 100% rename from src/mzscheme/gc/include/private/gc_locks.h rename to src/racket/gc/include/private/gc_locks.h diff --git a/src/mzscheme/gc/include/private/gc_pmark.h b/src/racket/gc/include/private/gc_pmark.h similarity index 100% rename from src/mzscheme/gc/include/private/gc_pmark.h rename to src/racket/gc/include/private/gc_pmark.h diff --git a/src/mzscheme/gc/include/private/gc_priv.h b/src/racket/gc/include/private/gc_priv.h similarity index 100% rename from src/mzscheme/gc/include/private/gc_priv.h rename to src/racket/gc/include/private/gc_priv.h diff --git a/src/mzscheme/gc/include/private/gcconfig.h b/src/racket/gc/include/private/gcconfig.h similarity index 100% rename from src/mzscheme/gc/include/private/gcconfig.h rename to src/racket/gc/include/private/gcconfig.h diff --git a/src/mzscheme/gc/include/private/msvc_dbg.h b/src/racket/gc/include/private/msvc_dbg.h similarity index 100% rename from src/mzscheme/gc/include/private/msvc_dbg.h rename to src/racket/gc/include/private/msvc_dbg.h diff --git a/src/mzscheme/gc/include/private/openbsd_stop_world.h b/src/racket/gc/include/private/openbsd_stop_world.h similarity index 100% rename from src/mzscheme/gc/include/private/openbsd_stop_world.h rename to src/racket/gc/include/private/openbsd_stop_world.h diff --git a/src/mzscheme/gc/include/private/pthread_stop_world.h b/src/racket/gc/include/private/pthread_stop_world.h similarity index 100% rename from src/mzscheme/gc/include/private/pthread_stop_world.h rename to src/racket/gc/include/private/pthread_stop_world.h diff --git a/src/mzscheme/gc/include/private/pthread_support.h b/src/racket/gc/include/private/pthread_support.h similarity index 100% rename from src/mzscheme/gc/include/private/pthread_support.h rename to src/racket/gc/include/private/pthread_support.h diff --git a/src/mzscheme/gc/include/private/solaris_threads.h b/src/racket/gc/include/private/solaris_threads.h similarity index 100% rename from src/mzscheme/gc/include/private/solaris_threads.h rename to src/racket/gc/include/private/solaris_threads.h diff --git a/src/mzscheme/gc/include/private/specific.h b/src/racket/gc/include/private/specific.h similarity index 100% rename from src/mzscheme/gc/include/private/specific.h rename to src/racket/gc/include/private/specific.h diff --git a/src/mzscheme/gc/include/private/thread_local_alloc.h b/src/racket/gc/include/private/thread_local_alloc.h similarity index 100% rename from src/mzscheme/gc/include/private/thread_local_alloc.h rename to src/racket/gc/include/private/thread_local_alloc.h diff --git a/src/mzscheme/gc/include/weakpointer.h b/src/racket/gc/include/weakpointer.h similarity index 100% rename from src/mzscheme/gc/include/weakpointer.h rename to src/racket/gc/include/weakpointer.h diff --git a/src/mzscheme/gc/install-sh b/src/racket/gc/install-sh similarity index 100% rename from src/mzscheme/gc/install-sh rename to src/racket/gc/install-sh diff --git a/src/mzscheme/gc/libatomic_ops/AUTHORS b/src/racket/gc/libatomic_ops/AUTHORS similarity index 100% rename from src/mzscheme/gc/libatomic_ops/AUTHORS rename to src/racket/gc/libatomic_ops/AUTHORS diff --git a/src/mzscheme/gc/libatomic_ops/COPYING b/src/racket/gc/libatomic_ops/COPYING similarity index 100% rename from src/mzscheme/gc/libatomic_ops/COPYING rename to src/racket/gc/libatomic_ops/COPYING diff --git a/src/mzscheme/gc/libatomic_ops/ChangeLog b/src/racket/gc/libatomic_ops/ChangeLog similarity index 100% rename from src/mzscheme/gc/libatomic_ops/ChangeLog rename to src/racket/gc/libatomic_ops/ChangeLog diff --git a/src/mzscheme/gc/libatomic_ops/INSTALL b/src/racket/gc/libatomic_ops/INSTALL similarity index 100% rename from src/mzscheme/gc/libatomic_ops/INSTALL rename to src/racket/gc/libatomic_ops/INSTALL diff --git a/src/mzscheme/gc/libatomic_ops/Makefile.am b/src/racket/gc/libatomic_ops/Makefile.am similarity index 100% rename from src/mzscheme/gc/libatomic_ops/Makefile.am rename to src/racket/gc/libatomic_ops/Makefile.am diff --git a/src/mzscheme/gc/libatomic_ops/Makefile.in b/src/racket/gc/libatomic_ops/Makefile.in similarity index 100% rename from src/mzscheme/gc/libatomic_ops/Makefile.in rename to src/racket/gc/libatomic_ops/Makefile.in diff --git a/src/mzscheme/gc/libatomic_ops/NEWS b/src/racket/gc/libatomic_ops/NEWS similarity index 100% rename from src/mzscheme/gc/libatomic_ops/NEWS rename to src/racket/gc/libatomic_ops/NEWS diff --git a/src/mzscheme/gc/libatomic_ops/README b/src/racket/gc/libatomic_ops/README similarity index 100% rename from src/mzscheme/gc/libatomic_ops/README rename to src/racket/gc/libatomic_ops/README diff --git a/src/mzscheme/gc/libatomic_ops/aclocal.m4 b/src/racket/gc/libatomic_ops/aclocal.m4 similarity index 100% rename from src/mzscheme/gc/libatomic_ops/aclocal.m4 rename to src/racket/gc/libatomic_ops/aclocal.m4 diff --git a/src/mzscheme/gc/libatomic_ops/compile b/src/racket/gc/libatomic_ops/compile similarity index 100% rename from src/mzscheme/gc/libatomic_ops/compile rename to src/racket/gc/libatomic_ops/compile diff --git a/src/mzscheme/gc/libatomic_ops/config.guess b/src/racket/gc/libatomic_ops/config.guess similarity index 100% rename from src/mzscheme/gc/libatomic_ops/config.guess rename to src/racket/gc/libatomic_ops/config.guess diff --git a/src/mzscheme/gc/libatomic_ops/config.sub b/src/racket/gc/libatomic_ops/config.sub similarity index 100% rename from src/mzscheme/gc/libatomic_ops/config.sub rename to src/racket/gc/libatomic_ops/config.sub diff --git a/src/mzscheme/gc/libatomic_ops/configure b/src/racket/gc/libatomic_ops/configure similarity index 100% rename from src/mzscheme/gc/libatomic_ops/configure rename to src/racket/gc/libatomic_ops/configure diff --git a/src/mzscheme/gc/libatomic_ops/configure.ac b/src/racket/gc/libatomic_ops/configure.ac similarity index 100% rename from src/mzscheme/gc/libatomic_ops/configure.ac rename to src/racket/gc/libatomic_ops/configure.ac diff --git a/src/mzscheme/gc/libatomic_ops/depcomp b/src/racket/gc/libatomic_ops/depcomp similarity index 100% rename from src/mzscheme/gc/libatomic_ops/depcomp rename to src/racket/gc/libatomic_ops/depcomp diff --git a/src/mzscheme/gc/libatomic_ops/doc/COPYING b/src/racket/gc/libatomic_ops/doc/COPYING similarity index 100% rename from src/mzscheme/gc/libatomic_ops/doc/COPYING rename to src/racket/gc/libatomic_ops/doc/COPYING diff --git a/src/mzscheme/gc/libatomic_ops/doc/LICENSING.txt b/src/racket/gc/libatomic_ops/doc/LICENSING.txt similarity index 100% rename from src/mzscheme/gc/libatomic_ops/doc/LICENSING.txt rename to src/racket/gc/libatomic_ops/doc/LICENSING.txt diff --git a/src/mzscheme/gc/libatomic_ops/doc/Makefile.am b/src/racket/gc/libatomic_ops/doc/Makefile.am similarity index 100% rename from src/mzscheme/gc/libatomic_ops/doc/Makefile.am rename to src/racket/gc/libatomic_ops/doc/Makefile.am diff --git a/src/mzscheme/gc/libatomic_ops/doc/Makefile.in b/src/racket/gc/libatomic_ops/doc/Makefile.in similarity index 100% rename from src/mzscheme/gc/libatomic_ops/doc/Makefile.in rename to src/racket/gc/libatomic_ops/doc/Makefile.in diff --git a/src/mzscheme/gc/libatomic_ops/doc/README.txt b/src/racket/gc/libatomic_ops/doc/README.txt similarity index 100% rename from src/mzscheme/gc/libatomic_ops/doc/README.txt rename to src/racket/gc/libatomic_ops/doc/README.txt diff --git a/src/mzscheme/gc/libatomic_ops/doc/README_malloc.txt b/src/racket/gc/libatomic_ops/doc/README_malloc.txt similarity index 100% rename from src/mzscheme/gc/libatomic_ops/doc/README_malloc.txt rename to src/racket/gc/libatomic_ops/doc/README_malloc.txt diff --git a/src/mzscheme/gc/libatomic_ops/doc/README_stack.txt b/src/racket/gc/libatomic_ops/doc/README_stack.txt similarity index 100% rename from src/mzscheme/gc/libatomic_ops/doc/README_stack.txt rename to src/racket/gc/libatomic_ops/doc/README_stack.txt diff --git a/src/mzscheme/gc/libatomic_ops/doc/README_win32.txt b/src/racket/gc/libatomic_ops/doc/README_win32.txt similarity index 100% rename from src/mzscheme/gc/libatomic_ops/doc/README_win32.txt rename to src/racket/gc/libatomic_ops/doc/README_win32.txt diff --git a/src/mzscheme/gc/libatomic_ops/install-sh b/src/racket/gc/libatomic_ops/install-sh similarity index 100% rename from src/mzscheme/gc/libatomic_ops/install-sh rename to src/racket/gc/libatomic_ops/install-sh diff --git a/src/mzscheme/gc/libatomic_ops/missing b/src/racket/gc/libatomic_ops/missing similarity index 100% rename from src/mzscheme/gc/libatomic_ops/missing rename to src/racket/gc/libatomic_ops/missing diff --git a/src/mzscheme/gc/libatomic_ops/mkinstalldirs b/src/racket/gc/libatomic_ops/mkinstalldirs similarity index 100% rename from src/mzscheme/gc/libatomic_ops/mkinstalldirs rename to src/racket/gc/libatomic_ops/mkinstalldirs diff --git a/src/mzscheme/gc/libatomic_ops/src/Makefile.am b/src/racket/gc/libatomic_ops/src/Makefile.am similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/Makefile.am rename to src/racket/gc/libatomic_ops/src/Makefile.am diff --git a/src/mzscheme/gc/libatomic_ops/src/Makefile.in b/src/racket/gc/libatomic_ops/src/Makefile.in similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/Makefile.in rename to src/racket/gc/libatomic_ops/src/Makefile.in diff --git a/src/mzscheme/gc/libatomic_ops/src/Makefile.msft b/src/racket/gc/libatomic_ops/src/Makefile.msft similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/Makefile.msft rename to src/racket/gc/libatomic_ops/src/Makefile.msft diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops.c b/src/racket/gc/libatomic_ops/src/atomic_ops.c similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops.c rename to src/racket/gc/libatomic_ops/src/atomic_ops.c diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops.h b/src/racket/gc/libatomic_ops/src/atomic_ops.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops.h rename to src/racket/gc/libatomic_ops/src/atomic_ops.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/Makefile.am b/src/racket/gc/libatomic_ops/src/atomic_ops/Makefile.am similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/Makefile.am rename to src/racket/gc/libatomic_ops/src/atomic_ops/Makefile.am diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/Makefile.in b/src/racket/gc/libatomic_ops/src/atomic_ops/Makefile.in similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/Makefile.in rename to src/racket/gc/libatomic_ops/src/atomic_ops/Makefile.in diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/generalize-small.h b/src/racket/gc/libatomic_ops/src/atomic_ops/generalize-small.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/generalize-small.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/generalize-small.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/generalize-small.template b/src/racket/gc/libatomic_ops/src/atomic_ops/generalize-small.template similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/generalize-small.template rename to src/racket/gc/libatomic_ops/src/atomic_ops/generalize-small.template diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/generalize.h b/src/racket/gc/libatomic_ops/src/atomic_ops/generalize.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/generalize.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/generalize.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/Makefile.am b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/Makefile.am similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/Makefile.am rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/Makefile.am diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/Makefile.in b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/Makefile.in similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/Makefile.in rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/Makefile.in diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/README b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/README similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/README rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/README diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/acquire_release_volatile.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/acquire_release_volatile.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/acquire_release_volatile.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/acquire_release_volatile.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/aligned_atomic_load_store.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/aligned_atomic_load_store.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/aligned_atomic_load_store.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/aligned_atomic_load_store.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/all_acquire_release_volatile.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/all_acquire_release_volatile.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/all_acquire_release_volatile.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/all_acquire_release_volatile.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/all_aligned_atomic_load_store.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/all_aligned_atomic_load_store.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/all_aligned_atomic_load_store.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/all_aligned_atomic_load_store.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/all_atomic_load_store.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/all_atomic_load_store.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/all_atomic_load_store.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/all_atomic_load_store.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/ao_t_is_int.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/ao_t_is_int.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/ao_t_is_int.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/ao_t_is_int.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/armcc/arm_v6.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/armcc/arm_v6.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/armcc/arm_v6.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/armcc/arm_v6.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/atomic_load_store.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/atomic_load_store.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/atomic_load_store.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/atomic_load_store.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/char_acquire_release_volatile.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/char_acquire_release_volatile.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/char_acquire_release_volatile.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/char_acquire_release_volatile.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/char_atomic_load_store.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/char_atomic_load_store.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/char_atomic_load_store.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/char_atomic_load_store.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/emul_cas.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/emul_cas.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/emul_cas.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/emul_cas.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/alpha.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/alpha.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/alpha.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/alpha.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/arm.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/arm.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/arm.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/arm.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/cris.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/cris.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/cris.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/cris.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/hppa.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/hppa.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/hppa.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/hppa.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/ia64.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/ia64.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/ia64.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/ia64.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/m68k.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/m68k.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/m68k.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/m68k.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/powerpc.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/powerpc.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/powerpc.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/powerpc.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/s390.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/s390.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/s390.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/s390.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h.orig b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h.orig similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h.orig rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h.orig diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/generic_pthread.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/generic_pthread.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/generic_pthread.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/generic_pthread.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/hpc/hppa.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/hpc/hppa.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/hpc/hppa.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/hpc/hppa.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/hpc/ia64.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/hpc/ia64.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/hpc/ia64.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/hpc/ia64.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/ibmc/powerpc.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/ibmc/powerpc.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/ibmc/powerpc.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/ibmc/powerpc.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/icc/ia64.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/icc/ia64.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/icc/ia64.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/icc/ia64.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/int_acquire_release_volatile.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/int_acquire_release_volatile.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/int_acquire_release_volatile.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/int_acquire_release_volatile.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/int_aligned_atomic_load_store.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/int_aligned_atomic_load_store.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/int_aligned_atomic_load_store.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/int_aligned_atomic_load_store.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/int_atomic_load_store.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/int_atomic_load_store.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/int_atomic_load_store.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/int_atomic_load_store.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/msftc/x86.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/msftc/x86.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/msftc/x86.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/msftc/x86.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/msftc/x86_64.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/msftc/x86_64.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/msftc/x86_64.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/msftc/x86_64.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/ordered.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/ordered.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/ordered.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/ordered.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/ordered_except_wr.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/ordered_except_wr.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/ordered_except_wr.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/ordered_except_wr.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/read_ordered.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/read_ordered.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/read_ordered.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/read_ordered.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/short_acquire_release_volatile.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/short_acquire_release_volatile.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/short_acquire_release_volatile.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/short_acquire_release_volatile.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/short_aligned_atomic_load_store.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/short_aligned_atomic_load_store.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/short_aligned_atomic_load_store.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/short_aligned_atomic_load_store.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/short_atomic_load_store.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/short_atomic_load_store.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/short_atomic_load_store.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/short_atomic_load_store.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/standard_ao_double_t.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/standard_ao_double_t.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/standard_ao_double_t.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/standard_ao_double_t.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/sunc/sparc.S b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/sunc/sparc.S similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/sunc/sparc.S rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/sunc/sparc.S diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/sunc/sparc.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/sunc/sparc.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/sunc/sparc.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/sunc/sparc.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/test_and_set_t_is_ao_t.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/test_and_set_t_is_ao_t.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/test_and_set_t_is_ao_t.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/test_and_set_t_is_ao_t.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/test_and_set_t_is_char.h b/src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/test_and_set_t_is_char.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops/sysdeps/test_and_set_t_is_char.h rename to src/racket/gc/libatomic_ops/src/atomic_ops/sysdeps/test_and_set_t_is_char.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops_malloc.c b/src/racket/gc/libatomic_ops/src/atomic_ops_malloc.c similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops_malloc.c rename to src/racket/gc/libatomic_ops/src/atomic_ops_malloc.c diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops_malloc.h b/src/racket/gc/libatomic_ops/src/atomic_ops_malloc.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops_malloc.h rename to src/racket/gc/libatomic_ops/src/atomic_ops_malloc.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops_stack.c b/src/racket/gc/libatomic_ops/src/atomic_ops_stack.c similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops_stack.c rename to src/racket/gc/libatomic_ops/src/atomic_ops_stack.c diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops_stack.h b/src/racket/gc/libatomic_ops/src/atomic_ops_stack.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops_stack.h rename to src/racket/gc/libatomic_ops/src/atomic_ops_stack.h diff --git a/src/mzscheme/gc/libatomic_ops/src/atomic_ops_sysdeps.S b/src/racket/gc/libatomic_ops/src/atomic_ops_sysdeps.S similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/atomic_ops_sysdeps.S rename to src/racket/gc/libatomic_ops/src/atomic_ops_sysdeps.S diff --git a/src/mzscheme/gc/libatomic_ops/src/config.h.in b/src/racket/gc/libatomic_ops/src/config.h.in similarity index 100% rename from src/mzscheme/gc/libatomic_ops/src/config.h.in rename to src/racket/gc/libatomic_ops/src/config.h.in diff --git a/src/mzscheme/gc/libatomic_ops/tests/Makefile.am b/src/racket/gc/libatomic_ops/tests/Makefile.am similarity index 100% rename from src/mzscheme/gc/libatomic_ops/tests/Makefile.am rename to src/racket/gc/libatomic_ops/tests/Makefile.am diff --git a/src/mzscheme/gc/libatomic_ops/tests/Makefile.in b/src/racket/gc/libatomic_ops/tests/Makefile.in similarity index 100% rename from src/mzscheme/gc/libatomic_ops/tests/Makefile.in rename to src/racket/gc/libatomic_ops/tests/Makefile.in diff --git a/src/mzscheme/gc/libatomic_ops/tests/list_atomic.c b/src/racket/gc/libatomic_ops/tests/list_atomic.c similarity index 100% rename from src/mzscheme/gc/libatomic_ops/tests/list_atomic.c rename to src/racket/gc/libatomic_ops/tests/list_atomic.c diff --git a/src/mzscheme/gc/libatomic_ops/tests/list_atomic.template b/src/racket/gc/libatomic_ops/tests/list_atomic.template similarity index 100% rename from src/mzscheme/gc/libatomic_ops/tests/list_atomic.template rename to src/racket/gc/libatomic_ops/tests/list_atomic.template diff --git a/src/mzscheme/gc/libatomic_ops/tests/run_parallel.inc b/src/racket/gc/libatomic_ops/tests/run_parallel.inc similarity index 100% rename from src/mzscheme/gc/libatomic_ops/tests/run_parallel.inc rename to src/racket/gc/libatomic_ops/tests/run_parallel.inc diff --git a/src/mzscheme/gc/libatomic_ops/tests/test_atomic.c b/src/racket/gc/libatomic_ops/tests/test_atomic.c similarity index 100% rename from src/mzscheme/gc/libatomic_ops/tests/test_atomic.c rename to src/racket/gc/libatomic_ops/tests/test_atomic.c diff --git a/src/mzscheme/gc/libatomic_ops/tests/test_atomic.template b/src/racket/gc/libatomic_ops/tests/test_atomic.template similarity index 100% rename from src/mzscheme/gc/libatomic_ops/tests/test_atomic.template rename to src/racket/gc/libatomic_ops/tests/test_atomic.template diff --git a/src/mzscheme/gc/libatomic_ops/tests/test_atomic_include.h b/src/racket/gc/libatomic_ops/tests/test_atomic_include.h similarity index 100% rename from src/mzscheme/gc/libatomic_ops/tests/test_atomic_include.h rename to src/racket/gc/libatomic_ops/tests/test_atomic_include.h diff --git a/src/mzscheme/gc/libatomic_ops/tests/test_malloc.c b/src/racket/gc/libatomic_ops/tests/test_malloc.c similarity index 100% rename from src/mzscheme/gc/libatomic_ops/tests/test_malloc.c rename to src/racket/gc/libatomic_ops/tests/test_malloc.c diff --git a/src/mzscheme/gc/libatomic_ops/tests/test_stack.c b/src/racket/gc/libatomic_ops/tests/test_stack.c similarity index 100% rename from src/mzscheme/gc/libatomic_ops/tests/test_stack.c rename to src/racket/gc/libatomic_ops/tests/test_stack.c diff --git a/src/mzscheme/gc/libtool.m4 b/src/racket/gc/libtool.m4 similarity index 100% rename from src/mzscheme/gc/libtool.m4 rename to src/racket/gc/libtool.m4 diff --git a/src/mzscheme/gc/ltmain.sh b/src/racket/gc/ltmain.sh similarity index 100% rename from src/mzscheme/gc/ltmain.sh rename to src/racket/gc/ltmain.sh diff --git a/src/mzscheme/gc/mach_dep.c b/src/racket/gc/mach_dep.c similarity index 100% rename from src/mzscheme/gc/mach_dep.c rename to src/racket/gc/mach_dep.c diff --git a/src/mzscheme/gc/mach_dep1.c b/src/racket/gc/mach_dep1.c similarity index 100% rename from src/mzscheme/gc/mach_dep1.c rename to src/racket/gc/mach_dep1.c diff --git a/src/mzscheme/gc/malloc.c b/src/racket/gc/malloc.c similarity index 100% rename from src/mzscheme/gc/malloc.c rename to src/racket/gc/malloc.c diff --git a/src/mzscheme/gc/mallocx.c b/src/racket/gc/mallocx.c similarity index 100% rename from src/mzscheme/gc/mallocx.c rename to src/racket/gc/mallocx.c diff --git a/src/mzscheme/gc/mark.c b/src/racket/gc/mark.c similarity index 100% rename from src/mzscheme/gc/mark.c rename to src/racket/gc/mark.c diff --git a/src/mzscheme/gc/mark_rts.c b/src/racket/gc/mark_rts.c similarity index 100% rename from src/mzscheme/gc/mark_rts.c rename to src/racket/gc/mark_rts.c diff --git a/src/mzscheme/gc/mips_sgi_mach_dep.s b/src/racket/gc/mips_sgi_mach_dep.s similarity index 100% rename from src/mzscheme/gc/mips_sgi_mach_dep.s rename to src/racket/gc/mips_sgi_mach_dep.s diff --git a/src/mzscheme/gc/mips_ultrix_mach_dep.s b/src/racket/gc/mips_ultrix_mach_dep.s similarity index 100% rename from src/mzscheme/gc/mips_ultrix_mach_dep.s rename to src/racket/gc/mips_ultrix_mach_dep.s diff --git a/src/mzscheme/gc/misc.c b/src/racket/gc/misc.c similarity index 100% rename from src/mzscheme/gc/misc.c rename to src/racket/gc/misc.c diff --git a/src/mzscheme/gc/missing b/src/racket/gc/missing similarity index 100% rename from src/mzscheme/gc/missing rename to src/racket/gc/missing diff --git a/src/mzscheme/gc/mkinstalldirs b/src/racket/gc/mkinstalldirs similarity index 100% rename from src/mzscheme/gc/mkinstalldirs rename to src/racket/gc/mkinstalldirs diff --git a/src/mzscheme/gc/msvc_dbg.c b/src/racket/gc/msvc_dbg.c similarity index 100% rename from src/mzscheme/gc/msvc_dbg.c rename to src/racket/gc/msvc_dbg.c diff --git a/src/mzscheme/gc/new_hblk.c b/src/racket/gc/new_hblk.c similarity index 100% rename from src/mzscheme/gc/new_hblk.c rename to src/racket/gc/new_hblk.c diff --git a/src/mzscheme/gc/obj_map.c b/src/racket/gc/obj_map.c similarity index 100% rename from src/mzscheme/gc/obj_map.c rename to src/racket/gc/obj_map.c diff --git a/src/mzscheme/gc/openbsd_stop_world.c b/src/racket/gc/openbsd_stop_world.c similarity index 100% rename from src/mzscheme/gc/openbsd_stop_world.c rename to src/racket/gc/openbsd_stop_world.c diff --git a/src/mzscheme/gc/os_dep.c b/src/racket/gc/os_dep.c similarity index 100% rename from src/mzscheme/gc/os_dep.c rename to src/racket/gc/os_dep.c diff --git a/src/mzscheme/gc/pc_excludes b/src/racket/gc/pc_excludes similarity index 100% rename from src/mzscheme/gc/pc_excludes rename to src/racket/gc/pc_excludes diff --git a/src/mzscheme/gc/pcr_interface.c b/src/racket/gc/pcr_interface.c similarity index 100% rename from src/mzscheme/gc/pcr_interface.c rename to src/racket/gc/pcr_interface.c diff --git a/src/mzscheme/gc/powerpc_darwin_mach_dep.s b/src/racket/gc/powerpc_darwin_mach_dep.s similarity index 100% rename from src/mzscheme/gc/powerpc_darwin_mach_dep.s rename to src/racket/gc/powerpc_darwin_mach_dep.s diff --git a/src/mzscheme/gc/pthread_stop_world.c b/src/racket/gc/pthread_stop_world.c similarity index 100% rename from src/mzscheme/gc/pthread_stop_world.c rename to src/racket/gc/pthread_stop_world.c diff --git a/src/mzscheme/gc/pthread_support.c b/src/racket/gc/pthread_support.c similarity index 100% rename from src/mzscheme/gc/pthread_support.c rename to src/racket/gc/pthread_support.c diff --git a/src/mzscheme/gc/ptr_chck.c b/src/racket/gc/ptr_chck.c similarity index 100% rename from src/mzscheme/gc/ptr_chck.c rename to src/racket/gc/ptr_chck.c diff --git a/src/mzscheme/gc/real_malloc.c b/src/racket/gc/real_malloc.c similarity index 100% rename from src/mzscheme/gc/real_malloc.c rename to src/racket/gc/real_malloc.c diff --git a/src/mzscheme/gc/reclaim.c b/src/racket/gc/reclaim.c similarity index 100% rename from src/mzscheme/gc/reclaim.c rename to src/racket/gc/reclaim.c diff --git a/src/mzscheme/gc/rs6000_mach_dep.s b/src/racket/gc/rs6000_mach_dep.s similarity index 100% rename from src/mzscheme/gc/rs6000_mach_dep.s rename to src/racket/gc/rs6000_mach_dep.s diff --git a/src/mzscheme/gc/setjmp_t.c b/src/racket/gc/setjmp_t.c similarity index 100% rename from src/mzscheme/gc/setjmp_t.c rename to src/racket/gc/setjmp_t.c diff --git a/src/mzscheme/gc/solaris_pthreads.c b/src/racket/gc/solaris_pthreads.c similarity index 100% rename from src/mzscheme/gc/solaris_pthreads.c rename to src/racket/gc/solaris_pthreads.c diff --git a/src/mzscheme/gc/solaris_threads.c b/src/racket/gc/solaris_threads.c similarity index 100% rename from src/mzscheme/gc/solaris_threads.c rename to src/racket/gc/solaris_threads.c diff --git a/src/mzscheme/gc/sparc_mach_dep.S b/src/racket/gc/sparc_mach_dep.S similarity index 100% rename from src/mzscheme/gc/sparc_mach_dep.S rename to src/racket/gc/sparc_mach_dep.S diff --git a/src/mzscheme/gc/sparc_netbsd_mach_dep.s b/src/racket/gc/sparc_netbsd_mach_dep.s similarity index 100% rename from src/mzscheme/gc/sparc_netbsd_mach_dep.s rename to src/racket/gc/sparc_netbsd_mach_dep.s diff --git a/src/mzscheme/gc/sparc_sunos4_mach_dep.s b/src/racket/gc/sparc_sunos4_mach_dep.s similarity index 100% rename from src/mzscheme/gc/sparc_sunos4_mach_dep.s rename to src/racket/gc/sparc_sunos4_mach_dep.s diff --git a/src/mzscheme/gc/specific.c b/src/racket/gc/specific.c similarity index 100% rename from src/mzscheme/gc/specific.c rename to src/racket/gc/specific.c diff --git a/src/mzscheme/gc/stubborn.c b/src/racket/gc/stubborn.c similarity index 100% rename from src/mzscheme/gc/stubborn.c rename to src/racket/gc/stubborn.c diff --git a/src/mzscheme/gc/tests/huge_test.c b/src/racket/gc/tests/huge_test.c similarity index 100% rename from src/mzscheme/gc/tests/huge_test.c rename to src/racket/gc/tests/huge_test.c diff --git a/src/mzscheme/gc/tests/leak_test.c b/src/racket/gc/tests/leak_test.c similarity index 100% rename from src/mzscheme/gc/tests/leak_test.c rename to src/racket/gc/tests/leak_test.c diff --git a/src/mzscheme/gc/tests/middle.c b/src/racket/gc/tests/middle.c similarity index 100% rename from src/mzscheme/gc/tests/middle.c rename to src/racket/gc/tests/middle.c diff --git a/src/mzscheme/gc/tests/smash_test.c b/src/racket/gc/tests/smash_test.c similarity index 100% rename from src/mzscheme/gc/tests/smash_test.c rename to src/racket/gc/tests/smash_test.c diff --git a/src/mzscheme/gc/tests/test.c b/src/racket/gc/tests/test.c similarity index 100% rename from src/mzscheme/gc/tests/test.c rename to src/racket/gc/tests/test.c diff --git a/src/mzscheme/gc/tests/test_cpp.cc b/src/racket/gc/tests/test_cpp.cc similarity index 100% rename from src/mzscheme/gc/tests/test_cpp.cc rename to src/racket/gc/tests/test_cpp.cc diff --git a/src/mzscheme/gc/tests/tests.am b/src/racket/gc/tests/tests.am similarity index 100% rename from src/mzscheme/gc/tests/tests.am rename to src/racket/gc/tests/tests.am diff --git a/src/mzscheme/gc/tests/thread_leak_test.c b/src/racket/gc/tests/thread_leak_test.c similarity index 100% rename from src/mzscheme/gc/tests/thread_leak_test.c rename to src/racket/gc/tests/thread_leak_test.c diff --git a/src/mzscheme/gc/tests/trace_test.c b/src/racket/gc/tests/trace_test.c similarity index 100% rename from src/mzscheme/gc/tests/trace_test.c rename to src/racket/gc/tests/trace_test.c diff --git a/src/mzscheme/gc/thread_local_alloc.c b/src/racket/gc/thread_local_alloc.c similarity index 100% rename from src/mzscheme/gc/thread_local_alloc.c rename to src/racket/gc/thread_local_alloc.c diff --git a/src/mzscheme/gc/threadlibs.c b/src/racket/gc/threadlibs.c similarity index 100% rename from src/mzscheme/gc/threadlibs.c rename to src/racket/gc/threadlibs.c diff --git a/src/mzscheme/gc/typd_mlc.c b/src/racket/gc/typd_mlc.c similarity index 100% rename from src/mzscheme/gc/typd_mlc.c rename to src/racket/gc/typd_mlc.c diff --git a/src/mzscheme/gc/upgrade.ss b/src/racket/gc/upgrade.ss similarity index 100% rename from src/mzscheme/gc/upgrade.ss rename to src/racket/gc/upgrade.ss diff --git a/src/mzscheme/gc/version.h b/src/racket/gc/version.h similarity index 100% rename from src/mzscheme/gc/version.h rename to src/racket/gc/version.h diff --git a/src/mzscheme/gc/win32_threads.c b/src/racket/gc/win32_threads.c similarity index 100% rename from src/mzscheme/gc/win32_threads.c rename to src/racket/gc/win32_threads.c diff --git a/src/mzscheme/gc2/Makefile.in b/src/racket/gc2/Makefile.in similarity index 99% rename from src/mzscheme/gc2/Makefile.in rename to src/racket/gc2/Makefile.in index ed6a08e4a9..0fb8cae12c 100644 --- a/src/mzscheme/gc2/Makefile.in +++ b/src/racket/gc2/Makefile.in @@ -231,7 +231,7 @@ $(XSRCDIR)/type.c: ../src/type.@LTO@ $(XFORMDEP) $(XSRCDIR)/vector.c: ../src/vector.@LTO@ $(XFORMDEP) $(XFORM) $(XSRCDIR)/vector.c $(SRCDIR)/vector.c $(XSRCDIR)/foreign.c: ../../foreign/foreign.@LTO@ $(XFORMDEP) - $(XFORM_SETUP) --cpp "$(CPP) $(CPPFLAGS) -I../../foreign/gcc/libffi/include -I${SRCDIR}/../../mzscheme/src" -o $(XSRCDIR)/foreign.c $(SRCDIR)/../../foreign/foreign.c + $(XFORM_SETUP) --cpp "$(CPP) $(CPPFLAGS) -I../../foreign/gcc/libffi/include -I${SRCDIR}/../../racket/src" -o $(XSRCDIR)/foreign.c $(SRCDIR)/../../foreign/foreign.c $(XSRCDIR)/main.c: ../main.@LTO@ $(XFORMDEP) $(XFORM_NOPRECOMP) $(XSRCDIR)/main.c $(DEF_COLLECTS_DIR) $(srcdir)/../main.c diff --git a/src/mzscheme/gc2/README b/src/racket/gc2/README similarity index 100% rename from src/mzscheme/gc2/README rename to src/racket/gc2/README diff --git a/src/mzscheme/gc2/alloc_cache.c b/src/racket/gc2/alloc_cache.c similarity index 100% rename from src/mzscheme/gc2/alloc_cache.c rename to src/racket/gc2/alloc_cache.c diff --git a/src/mzscheme/gc2/backtrace.c b/src/racket/gc2/backtrace.c similarity index 100% rename from src/mzscheme/gc2/backtrace.c rename to src/racket/gc2/backtrace.c diff --git a/src/mzscheme/gc2/commongc_internal.h b/src/racket/gc2/commongc_internal.h similarity index 100% rename from src/mzscheme/gc2/commongc_internal.h rename to src/racket/gc2/commongc_internal.h diff --git a/src/mzscheme/gc2/fnls.c b/src/racket/gc2/fnls.c similarity index 100% rename from src/mzscheme/gc2/fnls.c rename to src/racket/gc2/fnls.c diff --git a/src/mzscheme/gc2/gc.h b/src/racket/gc2/gc.h similarity index 100% rename from src/mzscheme/gc2/gc.h rename to src/racket/gc2/gc.h diff --git a/src/mzscheme/gc2/gc2.c b/src/racket/gc2/gc2.c similarity index 100% rename from src/mzscheme/gc2/gc2.c rename to src/racket/gc2/gc2.c diff --git a/src/mzscheme/gc2/gc2.h b/src/racket/gc2/gc2.h similarity index 100% rename from src/mzscheme/gc2/gc2.h rename to src/racket/gc2/gc2.h diff --git a/src/mzscheme/gc2/gc2_dump.h b/src/racket/gc2/gc2_dump.h similarity index 100% rename from src/mzscheme/gc2/gc2_dump.h rename to src/racket/gc2/gc2_dump.h diff --git a/src/mzscheme/gc2/gc2_obj.h b/src/racket/gc2/gc2_obj.h similarity index 100% rename from src/mzscheme/gc2/gc2_obj.h rename to src/racket/gc2/gc2_obj.h diff --git a/src/mzscheme/gc2/immobile_boxes.c b/src/racket/gc2/immobile_boxes.c similarity index 100% rename from src/mzscheme/gc2/immobile_boxes.c rename to src/racket/gc2/immobile_boxes.c diff --git a/src/mzscheme/gc2/mem_account.c b/src/racket/gc2/mem_account.c similarity index 100% rename from src/mzscheme/gc2/mem_account.c rename to src/racket/gc2/mem_account.c diff --git a/src/mzscheme/gc2/msgprint.c b/src/racket/gc2/msgprint.c similarity index 100% rename from src/mzscheme/gc2/msgprint.c rename to src/racket/gc2/msgprint.c diff --git a/src/mzscheme/gc2/my_qsort.c b/src/racket/gc2/my_qsort.c similarity index 100% rename from src/mzscheme/gc2/my_qsort.c rename to src/racket/gc2/my_qsort.c diff --git a/src/mzscheme/gc2/newgc.c b/src/racket/gc2/newgc.c similarity index 100% rename from src/mzscheme/gc2/newgc.c rename to src/racket/gc2/newgc.c diff --git a/src/mzscheme/gc2/newgc.h b/src/racket/gc2/newgc.h similarity index 100% rename from src/mzscheme/gc2/newgc.h rename to src/racket/gc2/newgc.h diff --git a/src/mzscheme/gc2/page_range.c b/src/racket/gc2/page_range.c similarity index 100% rename from src/mzscheme/gc2/page_range.c rename to src/racket/gc2/page_range.c diff --git a/src/mzscheme/gc2/platforms.h b/src/racket/gc2/platforms.h similarity index 100% rename from src/mzscheme/gc2/platforms.h rename to src/racket/gc2/platforms.h diff --git a/src/mzscheme/gc2/precomp.c b/src/racket/gc2/precomp.c similarity index 100% rename from src/mzscheme/gc2/precomp.c rename to src/racket/gc2/precomp.c diff --git a/src/mzscheme/gc2/protect_range.c b/src/racket/gc2/protect_range.c similarity index 100% rename from src/mzscheme/gc2/protect_range.c rename to src/racket/gc2/protect_range.c diff --git a/src/mzscheme/gc2/rlimit_heapsize.c b/src/racket/gc2/rlimit_heapsize.c similarity index 100% rename from src/mzscheme/gc2/rlimit_heapsize.c rename to src/racket/gc2/rlimit_heapsize.c diff --git a/src/mzscheme/gc2/roots.c b/src/racket/gc2/roots.c similarity index 100% rename from src/mzscheme/gc2/roots.c rename to src/racket/gc2/roots.c diff --git a/src/mzscheme/gc2/setup.ss b/src/racket/gc2/setup.ss similarity index 96% rename from src/mzscheme/gc2/setup.ss rename to src/racket/gc2/setup.ss index e7939961c5..d2b69fa04d 100644 --- a/src/mzscheme/gc2/setup.ss +++ b/src/racket/gc2/setup.ss @@ -83,7 +83,11 @@ '(s-exp/lang/reader mzscheme/lang/reader scheme/base/lang/reader - scheme/lang/reader)) + scheme/lang/reader + scheme/private/provider/lang/reader + racket/base/lang/reader + racket/private/lang/reader + racket/lang/reader)) (current-library-collection-paths (list (build-path (current-directory) "xform-collects"))) diff --git a/src/mzscheme/gc2/sighand.c b/src/racket/gc2/sighand.c similarity index 100% rename from src/mzscheme/gc2/sighand.c rename to src/racket/gc2/sighand.c diff --git a/src/mzscheme/gc2/stack_comp.c b/src/racket/gc2/stack_comp.c similarity index 100% rename from src/mzscheme/gc2/stack_comp.c rename to src/racket/gc2/stack_comp.c diff --git a/src/mzscheme/gc2/testing.c b/src/racket/gc2/testing.c similarity index 100% rename from src/mzscheme/gc2/testing.c rename to src/racket/gc2/testing.c diff --git a/src/mzscheme/gc2/var_stack.c b/src/racket/gc2/var_stack.c similarity index 100% rename from src/mzscheme/gc2/var_stack.c rename to src/racket/gc2/var_stack.c diff --git a/src/mzscheme/gc2/vm.c b/src/racket/gc2/vm.c similarity index 100% rename from src/mzscheme/gc2/vm.c rename to src/racket/gc2/vm.c diff --git a/src/mzscheme/gc2/vm_memalign.c b/src/racket/gc2/vm_memalign.c similarity index 100% rename from src/mzscheme/gc2/vm_memalign.c rename to src/racket/gc2/vm_memalign.c diff --git a/src/mzscheme/gc2/vm_mmap.c b/src/racket/gc2/vm_mmap.c similarity index 100% rename from src/mzscheme/gc2/vm_mmap.c rename to src/racket/gc2/vm_mmap.c diff --git a/src/mzscheme/gc2/vm_osk.c b/src/racket/gc2/vm_osk.c similarity index 100% rename from src/mzscheme/gc2/vm_osk.c rename to src/racket/gc2/vm_osk.c diff --git a/src/mzscheme/gc2/vm_osx.c b/src/racket/gc2/vm_osx.c similarity index 100% rename from src/mzscheme/gc2/vm_osx.c rename to src/racket/gc2/vm_osx.c diff --git a/src/mzscheme/gc2/vm_win.c b/src/racket/gc2/vm_win.c similarity index 100% rename from src/mzscheme/gc2/vm_win.c rename to src/racket/gc2/vm_win.c diff --git a/src/mzscheme/gc2/weak.c b/src/racket/gc2/weak.c similarity index 100% rename from src/mzscheme/gc2/weak.c rename to src/racket/gc2/weak.c diff --git a/src/mzscheme/gc2/xform-mod.ss b/src/racket/gc2/xform-mod.ss similarity index 100% rename from src/mzscheme/gc2/xform-mod.ss rename to src/racket/gc2/xform-mod.ss diff --git a/src/mzscheme/gc2/xform.ss b/src/racket/gc2/xform.ss similarity index 100% rename from src/mzscheme/gc2/xform.ss rename to src/racket/gc2/xform.ss diff --git a/src/mzscheme/include/cgc2.h b/src/racket/include/cgc2.h similarity index 100% rename from src/mzscheme/include/cgc2.h rename to src/racket/include/cgc2.h diff --git a/src/mzscheme/include/escheme.h b/src/racket/include/escheme.h similarity index 100% rename from src/mzscheme/include/escheme.h rename to src/racket/include/escheme.h diff --git a/src/mzscheme/include/ext.exp b/src/racket/include/ext.exp similarity index 100% rename from src/mzscheme/include/ext.exp rename to src/racket/include/ext.exp diff --git a/src/mzscheme/include/gmzwin.def b/src/racket/include/gmzwin.def similarity index 100% rename from src/mzscheme/include/gmzwin.def rename to src/racket/include/gmzwin.def diff --git a/src/mzscheme/include/mzscheme.exp b/src/racket/include/mzscheme.exp similarity index 100% rename from src/mzscheme/include/mzscheme.exp rename to src/racket/include/mzscheme.exp diff --git a/src/mzscheme/include/mzscheme3m.exp b/src/racket/include/mzscheme3m.exp similarity index 100% rename from src/mzscheme/include/mzscheme3m.exp rename to src/racket/include/mzscheme3m.exp diff --git a/src/mzscheme/include/mzwin.def b/src/racket/include/mzwin.def similarity index 100% rename from src/mzscheme/include/mzwin.def rename to src/racket/include/mzwin.def diff --git a/src/mzscheme/include/mzwin3m.def b/src/racket/include/mzwin3m.def similarity index 100% rename from src/mzscheme/include/mzwin3m.def rename to src/racket/include/mzwin3m.def diff --git a/src/mzscheme/include/racket.exp b/src/racket/include/racket.exp similarity index 100% rename from src/mzscheme/include/racket.exp rename to src/racket/include/racket.exp diff --git a/src/mzscheme/include/racket3m.exp b/src/racket/include/racket3m.exp similarity index 100% rename from src/mzscheme/include/racket3m.exp rename to src/racket/include/racket3m.exp diff --git a/src/mzscheme/include/scheme.h b/src/racket/include/scheme.h similarity index 100% rename from src/mzscheme/include/scheme.h rename to src/racket/include/scheme.h diff --git a/src/mzscheme/include/schthread.h b/src/racket/include/schthread.h similarity index 100% rename from src/mzscheme/include/schthread.h rename to src/racket/include/schthread.h diff --git a/src/mzscheme/main.c b/src/racket/main.c similarity index 100% rename from src/mzscheme/main.c rename to src/racket/main.c diff --git a/src/mzscheme/make-configure b/src/racket/make-configure similarity index 95% rename from src/mzscheme/make-configure rename to src/racket/make-configure index 273bf6b2e9..08b57ead7b 100755 --- a/src/mzscheme/make-configure +++ b/src/racket/make-configure @@ -8,7 +8,7 @@ echo "Creating $tgt from $src" if [ -e "$tgt" ]; then /bin/echo -n "overwriting $tgt, Ctrl-C to abort, enter to continue "; read R; fi -autoconf "$src" | mzscheme -qr "$0" > "$tgt" +autoconf "$src" | racket -qr "$0" > "$tgt" chmod +x "$tgt" exit 0 |# diff --git a/src/mzscheme/mk-gdbinit.ss b/src/racket/mk-gdbinit.ss similarity index 100% rename from src/mzscheme/mk-gdbinit.ss rename to src/racket/mk-gdbinit.ss diff --git a/src/mzscheme/mkincludes.ss b/src/racket/mkincludes.ss similarity index 100% rename from src/mzscheme/mkincludes.ss rename to src/racket/mkincludes.ss diff --git a/src/mzscheme/mzconfig.h.in b/src/racket/mzconfig.h.in similarity index 100% rename from src/mzscheme/mzconfig.h.in rename to src/racket/mzconfig.h.in diff --git a/src/mzscheme/oskglue.inc b/src/racket/oskglue.inc similarity index 100% rename from src/mzscheme/oskglue.inc rename to src/racket/oskglue.inc diff --git a/src/mzscheme/sconfig.h b/src/racket/sconfig.h similarity index 100% rename from src/mzscheme/sconfig.h rename to src/racket/sconfig.h diff --git a/src/mzscheme/sgc/Makefile.in b/src/racket/sgc/Makefile.in similarity index 100% rename from src/mzscheme/sgc/Makefile.in rename to src/racket/sgc/Makefile.in diff --git a/src/mzscheme/sgc/README b/src/racket/sgc/README similarity index 100% rename from src/mzscheme/sgc/README rename to src/racket/sgc/README diff --git a/src/mzscheme/sgc/autostat.inc b/src/racket/sgc/autostat.inc similarity index 100% rename from src/mzscheme/sgc/autostat.inc rename to src/racket/sgc/autostat.inc diff --git a/src/mzscheme/sgc/checkreg b/src/racket/sgc/checkreg similarity index 100% rename from src/mzscheme/sgc/checkreg rename to src/racket/sgc/checkreg diff --git a/src/mzscheme/sgc/collect.inc b/src/racket/sgc/collect.inc similarity index 100% rename from src/mzscheme/sgc/collect.inc rename to src/racket/sgc/collect.inc diff --git a/src/mzscheme/sgc/gc.h b/src/racket/sgc/gc.h similarity index 100% rename from src/mzscheme/sgc/gc.h rename to src/racket/sgc/gc.h diff --git a/src/mzscheme/sgc/sgc.c b/src/racket/sgc/sgc.c similarity index 100% rename from src/mzscheme/sgc/sgc.c rename to src/racket/sgc/sgc.c diff --git a/src/mzscheme/sgc/sgc.h b/src/racket/sgc/sgc.h similarity index 100% rename from src/mzscheme/sgc/sgc.h rename to src/racket/sgc/sgc.h diff --git a/src/mzscheme/sgc/sgcdiff b/src/racket/sgc/sgcdiff similarity index 100% rename from src/mzscheme/sgc/sgcdiff rename to src/racket/sgc/sgcdiff diff --git a/src/mzscheme/sgc/test.c b/src/racket/sgc/test.c similarity index 100% rename from src/mzscheme/sgc/test.c rename to src/racket/sgc/test.c diff --git a/src/mzscheme/src/Makefile.in b/src/racket/src/Makefile.in similarity index 100% rename from src/mzscheme/src/Makefile.in rename to src/racket/src/Makefile.in diff --git a/src/mzscheme/src/bgnfloat.inc b/src/racket/src/bgnfloat.inc similarity index 100% rename from src/mzscheme/src/bgnfloat.inc rename to src/racket/src/bgnfloat.inc diff --git a/src/mzscheme/src/bignum.c b/src/racket/src/bignum.c similarity index 100% rename from src/mzscheme/src/bignum.c rename to src/racket/src/bignum.c diff --git a/src/mzscheme/src/bool.c b/src/racket/src/bool.c similarity index 100% rename from src/mzscheme/src/bool.c rename to src/racket/src/bool.c diff --git a/src/mzscheme/src/builtin.c b/src/racket/src/builtin.c similarity index 100% rename from src/mzscheme/src/builtin.c rename to src/racket/src/builtin.c diff --git a/src/mzscheme/src/char.c b/src/racket/src/char.c similarity index 100% rename from src/mzscheme/src/char.c rename to src/racket/src/char.c diff --git a/src/mzscheme/src/codetab.inc b/src/racket/src/codetab.inc similarity index 100% rename from src/mzscheme/src/codetab.inc rename to src/racket/src/codetab.inc diff --git a/src/mzscheme/src/complex.c b/src/racket/src/complex.c similarity index 100% rename from src/mzscheme/src/complex.c rename to src/racket/src/complex.c diff --git a/src/mzscheme/src/cstartup.inc b/src/racket/src/cstartup.inc similarity index 100% rename from src/mzscheme/src/cstartup.inc rename to src/racket/src/cstartup.inc diff --git a/src/mzscheme/src/dlcompat.inc b/src/racket/src/dlcompat.inc similarity index 100% rename from src/mzscheme/src/dlcompat.inc rename to src/racket/src/dlcompat.inc diff --git a/src/mzscheme/src/dynext.c b/src/racket/src/dynext.c similarity index 100% rename from src/mzscheme/src/dynext.c rename to src/racket/src/dynext.c diff --git a/src/mzscheme/src/dynext.inc b/src/racket/src/dynext.inc similarity index 100% rename from src/mzscheme/src/dynext.inc rename to src/racket/src/dynext.inc diff --git a/src/mzscheme/src/env.c b/src/racket/src/env.c similarity index 100% rename from src/mzscheme/src/env.c rename to src/racket/src/env.c diff --git a/src/mzscheme/src/error.c b/src/racket/src/error.c similarity index 100% rename from src/mzscheme/src/error.c rename to src/racket/src/error.c diff --git a/src/mzscheme/src/eval.c b/src/racket/src/eval.c similarity index 100% rename from src/mzscheme/src/eval.c rename to src/racket/src/eval.c diff --git a/src/mzscheme/src/file.c b/src/racket/src/file.c similarity index 100% rename from src/mzscheme/src/file.c rename to src/racket/src/file.c diff --git a/src/mzscheme/src/fun.c b/src/racket/src/fun.c similarity index 100% rename from src/mzscheme/src/fun.c rename to src/racket/src/fun.c diff --git a/src/mzscheme/src/future.c b/src/racket/src/future.c similarity index 100% rename from src/mzscheme/src/future.c rename to src/racket/src/future.c diff --git a/src/mzscheme/src/future.h b/src/racket/src/future.h similarity index 100% rename from src/mzscheme/src/future.h rename to src/racket/src/future.h diff --git a/src/mzscheme/src/gen-jit-ts.ss b/src/racket/src/gen-jit-ts.ss similarity index 100% rename from src/mzscheme/src/gen-jit-ts.ss rename to src/racket/src/gen-jit-ts.ss diff --git a/src/mzscheme/src/gmp/README b/src/racket/src/gmp/README similarity index 100% rename from src/mzscheme/src/gmp/README rename to src/racket/src/gmp/README diff --git a/src/mzscheme/src/gmp/gmp-impl.h b/src/racket/src/gmp/gmp-impl.h similarity index 100% rename from src/mzscheme/src/gmp/gmp-impl.h rename to src/racket/src/gmp/gmp-impl.h diff --git a/src/mzscheme/src/gmp/gmp-mparam.h b/src/racket/src/gmp/gmp-mparam.h similarity index 100% rename from src/mzscheme/src/gmp/gmp-mparam.h rename to src/racket/src/gmp/gmp-mparam.h diff --git a/src/mzscheme/src/gmp/gmp.c b/src/racket/src/gmp/gmp.c similarity index 100% rename from src/mzscheme/src/gmp/gmp.c rename to src/racket/src/gmp/gmp.c diff --git a/src/mzscheme/src/gmp/gmp.h b/src/racket/src/gmp/gmp.h similarity index 100% rename from src/mzscheme/src/gmp/gmp.h rename to src/racket/src/gmp/gmp.h diff --git a/src/mzscheme/src/gmp/gmp_alpha_gcc.s b/src/racket/src/gmp/gmp_alpha_gcc.s similarity index 100% rename from src/mzscheme/src/gmp/gmp_alpha_gcc.s rename to src/racket/src/gmp/gmp_alpha_gcc.s diff --git a/src/mzscheme/src/gmp/gmplonglong.h b/src/racket/src/gmp/gmplonglong.h similarity index 100% rename from src/mzscheme/src/gmp/gmplonglong.h rename to src/racket/src/gmp/gmplonglong.h diff --git a/src/mzscheme/src/hash.c b/src/racket/src/hash.c similarity index 100% rename from src/mzscheme/src/hash.c rename to src/racket/src/hash.c diff --git a/src/mzscheme/src/jit.c b/src/racket/src/jit.c similarity index 100% rename from src/mzscheme/src/jit.c rename to src/racket/src/jit.c diff --git a/src/mzscheme/src/jit_ts.c b/src/racket/src/jit_ts.c similarity index 100% rename from src/mzscheme/src/jit_ts.c rename to src/racket/src/jit_ts.c diff --git a/src/mzscheme/src/jit_ts_def.c b/src/racket/src/jit_ts_def.c similarity index 100% rename from src/mzscheme/src/jit_ts_def.c rename to src/racket/src/jit_ts_def.c diff --git a/src/mzscheme/src/jit_ts_future_glue.c b/src/racket/src/jit_ts_future_glue.c similarity index 100% rename from src/mzscheme/src/jit_ts_future_glue.c rename to src/racket/src/jit_ts_future_glue.c diff --git a/src/mzscheme/src/jit_ts_protos.h b/src/racket/src/jit_ts_protos.h similarity index 100% rename from src/mzscheme/src/jit_ts_protos.h rename to src/racket/src/jit_ts_protos.h diff --git a/src/mzscheme/src/jit_ts_runtime_glue.c b/src/racket/src/jit_ts_runtime_glue.c similarity index 100% rename from src/mzscheme/src/jit_ts_runtime_glue.c rename to src/racket/src/jit_ts_runtime_glue.c diff --git a/src/mzscheme/src/lightning/README b/src/racket/src/lightning/README similarity index 100% rename from src/mzscheme/src/lightning/README rename to src/racket/src/lightning/README diff --git a/src/mzscheme/src/lightning/i386/asm-common.h b/src/racket/src/lightning/i386/asm-common.h similarity index 100% rename from src/mzscheme/src/lightning/i386/asm-common.h rename to src/racket/src/lightning/i386/asm-common.h diff --git a/src/mzscheme/src/lightning/i386/asm.h b/src/racket/src/lightning/i386/asm.h similarity index 100% rename from src/mzscheme/src/lightning/i386/asm.h rename to src/racket/src/lightning/i386/asm.h diff --git a/src/mzscheme/src/lightning/i386/core-common.h b/src/racket/src/lightning/i386/core-common.h similarity index 100% rename from src/mzscheme/src/lightning/i386/core-common.h rename to src/racket/src/lightning/i386/core-common.h diff --git a/src/mzscheme/src/lightning/i386/core.h b/src/racket/src/lightning/i386/core.h similarity index 100% rename from src/mzscheme/src/lightning/i386/core.h rename to src/racket/src/lightning/i386/core.h diff --git a/src/mzscheme/src/lightning/i386/fp-common.h b/src/racket/src/lightning/i386/fp-common.h similarity index 100% rename from src/mzscheme/src/lightning/i386/fp-common.h rename to src/racket/src/lightning/i386/fp-common.h diff --git a/src/mzscheme/src/lightning/i386/fp.h b/src/racket/src/lightning/i386/fp.h similarity index 100% rename from src/mzscheme/src/lightning/i386/fp.h rename to src/racket/src/lightning/i386/fp.h diff --git a/src/mzscheme/src/lightning/i386/funcs-common.h b/src/racket/src/lightning/i386/funcs-common.h similarity index 100% rename from src/mzscheme/src/lightning/i386/funcs-common.h rename to src/racket/src/lightning/i386/funcs-common.h diff --git a/src/mzscheme/src/lightning/i386/funcs.h b/src/racket/src/lightning/i386/funcs.h similarity index 100% rename from src/mzscheme/src/lightning/i386/funcs.h rename to src/racket/src/lightning/i386/funcs.h diff --git a/src/mzscheme/src/lightning/lightning.h b/src/racket/src/lightning/lightning.h similarity index 100% rename from src/mzscheme/src/lightning/lightning.h rename to src/racket/src/lightning/lightning.h diff --git a/src/mzscheme/src/lightning/ppc/asm-common.h b/src/racket/src/lightning/ppc/asm-common.h similarity index 100% rename from src/mzscheme/src/lightning/ppc/asm-common.h rename to src/racket/src/lightning/ppc/asm-common.h diff --git a/src/mzscheme/src/lightning/ppc/asm.h b/src/racket/src/lightning/ppc/asm.h similarity index 100% rename from src/mzscheme/src/lightning/ppc/asm.h rename to src/racket/src/lightning/ppc/asm.h diff --git a/src/mzscheme/src/lightning/ppc/core-common.h b/src/racket/src/lightning/ppc/core-common.h similarity index 100% rename from src/mzscheme/src/lightning/ppc/core-common.h rename to src/racket/src/lightning/ppc/core-common.h diff --git a/src/mzscheme/src/lightning/ppc/core.h b/src/racket/src/lightning/ppc/core.h similarity index 100% rename from src/mzscheme/src/lightning/ppc/core.h rename to src/racket/src/lightning/ppc/core.h diff --git a/src/mzscheme/src/lightning/ppc/fp-common.h b/src/racket/src/lightning/ppc/fp-common.h similarity index 100% rename from src/mzscheme/src/lightning/ppc/fp-common.h rename to src/racket/src/lightning/ppc/fp-common.h diff --git a/src/mzscheme/src/lightning/ppc/fp.h b/src/racket/src/lightning/ppc/fp.h similarity index 100% rename from src/mzscheme/src/lightning/ppc/fp.h rename to src/racket/src/lightning/ppc/fp.h diff --git a/src/mzscheme/src/lightning/ppc/funcs-common.h b/src/racket/src/lightning/ppc/funcs-common.h similarity index 100% rename from src/mzscheme/src/lightning/ppc/funcs-common.h rename to src/racket/src/lightning/ppc/funcs-common.h diff --git a/src/mzscheme/src/lightning/ppc/funcs.h b/src/racket/src/lightning/ppc/funcs.h similarity index 100% rename from src/mzscheme/src/lightning/ppc/funcs.h rename to src/racket/src/lightning/ppc/funcs.h diff --git a/src/mzscheme/src/list.c b/src/racket/src/list.c similarity index 100% rename from src/mzscheme/src/list.c rename to src/racket/src/list.c diff --git a/src/mzscheme/src/mac_roman.inc b/src/racket/src/mac_roman.inc similarity index 100% rename from src/mzscheme/src/mac_roman.inc rename to src/racket/src/mac_roman.inc diff --git a/src/mzscheme/src/macdnr.inc b/src/racket/src/macdnr.inc similarity index 100% rename from src/mzscheme/src/macdnr.inc rename to src/racket/src/macdnr.inc diff --git a/src/mzscheme/src/makeexn b/src/racket/src/makeexn similarity index 99% rename from src/mzscheme/src/makeexn rename to src/racket/src/makeexn index 562cc93e4a..2ab689797e 100755 --- a/src/mzscheme/src/makeexn +++ b/src/racket/src/makeexn @@ -172,8 +172,8 @@ Not an exception in the above sense: (define (gen-kernstruct filename) (define preamble '(module kernstruct '#%kernel (#%require (for-syntax '#%kernel)) - (#%require "define.ss") - (#%require (for-syntax "struct-info.ss")) + (#%require "define.rkt") + (#%require (for-syntax "struct-info.rkt")) (#%provide (all-defined)))) diff --git a/src/mzscheme/src/makex b/src/racket/src/makex similarity index 100% rename from src/mzscheme/src/makex rename to src/racket/src/makex diff --git a/src/mzscheme/src/mk-uchar.ss b/src/racket/src/mk-uchar.ss similarity index 100% rename from src/mzscheme/src/mk-uchar.ss rename to src/racket/src/mk-uchar.ss diff --git a/src/mzscheme/src/mkmark.ss b/src/racket/src/mkmark.ss similarity index 100% rename from src/mzscheme/src/mkmark.ss rename to src/racket/src/mkmark.ss diff --git a/src/mzscheme/src/module.c b/src/racket/src/module.c similarity index 100% rename from src/mzscheme/src/module.c rename to src/racket/src/module.c diff --git a/src/mzscheme/src/mzeqchk.inc b/src/racket/src/mzeqchk.inc similarity index 100% rename from src/mzscheme/src/mzeqchk.inc rename to src/racket/src/mzeqchk.inc diff --git a/src/mzscheme/src/mzhashchk.inc b/src/racket/src/mzhashchk.inc similarity index 100% rename from src/mzscheme/src/mzhashchk.inc rename to src/racket/src/mzhashchk.inc diff --git a/src/mzscheme/src/mzmark.c b/src/racket/src/mzmark.c similarity index 100% rename from src/mzscheme/src/mzmark.c rename to src/racket/src/mzmark.c diff --git a/src/mzscheme/src/mzmarksrc.c b/src/racket/src/mzmarksrc.c similarity index 100% rename from src/mzscheme/src/mzmarksrc.c rename to src/racket/src/mzmarksrc.c diff --git a/src/mzscheme/src/mzrt.c b/src/racket/src/mzrt.c similarity index 100% rename from src/mzscheme/src/mzrt.c rename to src/racket/src/mzrt.c diff --git a/src/mzscheme/src/mzrt.h b/src/racket/src/mzrt.h similarity index 100% rename from src/mzscheme/src/mzrt.h rename to src/racket/src/mzrt.h diff --git a/src/mzscheme/src/mzsj86.c b/src/racket/src/mzsj86.c similarity index 100% rename from src/mzscheme/src/mzsj86.c rename to src/racket/src/mzsj86.c diff --git a/src/mzscheme/src/mzstkchk.h b/src/racket/src/mzstkchk.h similarity index 100% rename from src/mzscheme/src/mzstkchk.h rename to src/racket/src/mzstkchk.h diff --git a/src/mzscheme/src/network.c b/src/racket/src/network.c similarity index 100% rename from src/mzscheme/src/network.c rename to src/racket/src/network.c diff --git a/src/mzscheme/src/newrandom.inc b/src/racket/src/newrandom.inc similarity index 100% rename from src/mzscheme/src/newrandom.inc rename to src/racket/src/newrandom.inc diff --git a/src/mzscheme/src/numarith.c b/src/racket/src/numarith.c similarity index 100% rename from src/mzscheme/src/numarith.c rename to src/racket/src/numarith.c diff --git a/src/mzscheme/src/number.c b/src/racket/src/number.c similarity index 100% rename from src/mzscheme/src/number.c rename to src/racket/src/number.c diff --git a/src/mzscheme/src/numcomp.c b/src/racket/src/numcomp.c similarity index 100% rename from src/mzscheme/src/numcomp.c rename to src/racket/src/numcomp.c diff --git a/src/mzscheme/src/nummacs.h b/src/racket/src/nummacs.h similarity index 100% rename from src/mzscheme/src/nummacs.h rename to src/racket/src/nummacs.h diff --git a/src/mzscheme/src/numstr.c b/src/racket/src/numstr.c similarity index 100% rename from src/mzscheme/src/numstr.c rename to src/racket/src/numstr.c diff --git a/src/mzscheme/src/pc_keys.inc b/src/racket/src/pc_keys.inc similarity index 100% rename from src/mzscheme/src/pc_keys.inc rename to src/racket/src/pc_keys.inc diff --git a/src/mzscheme/src/places.c b/src/racket/src/places.c similarity index 99% rename from src/mzscheme/src/places.c rename to src/racket/src/places.c index 98bfb012b7..bdfcc6ff86 100644 --- a/src/mzscheme/src/places.c +++ b/src/racket/src/places.c @@ -36,6 +36,7 @@ static void register_traversers(void); # endif static void *place_start_proc(void *arg); +static void *place_start_proc_after_stack(void *data_arg, void *stack_base); # define PLACE_PRIM_W_ARITY(name, func, a1, a2, env) GLOBAL_PRIM_W_ARITY(name, func, a1, a2, env) @@ -608,6 +609,14 @@ Scheme_Struct_Type *scheme_make_prefab_struct_type_in_master(Scheme_Object *base static void *place_start_proc(void *data_arg) { void *stack_base; + void *rc; + stack_base = PROMPT_STACK(stack_base); + rc = place_start_proc_after_stack(data_arg, stack_base); + stack_base = NULL; + return rc; +} + +static void *place_start_proc_after_stack(void *data_arg, void *stack_base) { Place_Start_Data *place_data; Scheme_Object *place_main; Scheme_Object *a[2], *channel; @@ -615,7 +624,6 @@ static void *place_start_proc(void *data_arg) { long rc = 0; ptid = mz_proc_thread_self(); - stack_base = PROMPT_STACK(stack_base); place_data = (Place_Start_Data *) data_arg; data_arg = NULL; diff --git a/src/mzscheme/src/port.c b/src/racket/src/port.c similarity index 100% rename from src/mzscheme/src/port.c rename to src/racket/src/port.c diff --git a/src/mzscheme/src/portfun.c b/src/racket/src/portfun.c similarity index 100% rename from src/mzscheme/src/portfun.c rename to src/racket/src/portfun.c diff --git a/src/mzscheme/src/print.c b/src/racket/src/print.c similarity index 100% rename from src/mzscheme/src/print.c rename to src/racket/src/print.c diff --git a/src/mzscheme/src/qqsrc.ss b/src/racket/src/qqsrc.ss similarity index 100% rename from src/mzscheme/src/qqsrc.ss rename to src/racket/src/qqsrc.ss diff --git a/src/mzscheme/src/random.inc b/src/racket/src/random.inc similarity index 100% rename from src/mzscheme/src/random.inc rename to src/racket/src/random.inc diff --git a/src/mzscheme/src/ratfloat.inc b/src/racket/src/ratfloat.inc similarity index 100% rename from src/mzscheme/src/ratfloat.inc rename to src/racket/src/ratfloat.inc diff --git a/src/mzscheme/src/rational.c b/src/racket/src/rational.c similarity index 100% rename from src/mzscheme/src/rational.c rename to src/racket/src/rational.c diff --git a/src/mzscheme/src/read.c b/src/racket/src/read.c similarity index 100% rename from src/mzscheme/src/read.c rename to src/racket/src/read.c diff --git a/src/mzscheme/src/regexp.c b/src/racket/src/regexp.c similarity index 100% rename from src/mzscheme/src/regexp.c rename to src/racket/src/regexp.c diff --git a/src/mzscheme/src/renumber.ss b/src/racket/src/renumber.ss similarity index 100% rename from src/mzscheme/src/renumber.ss rename to src/racket/src/renumber.ss diff --git a/src/mzscheme/src/salloc.c b/src/racket/src/salloc.c similarity index 100% rename from src/mzscheme/src/salloc.c rename to src/racket/src/salloc.c diff --git a/src/mzscheme/src/schapp.inc b/src/racket/src/schapp.inc similarity index 100% rename from src/mzscheme/src/schapp.inc rename to src/racket/src/schapp.inc diff --git a/src/mzscheme/src/schcpt.h b/src/racket/src/schcpt.h similarity index 100% rename from src/mzscheme/src/schcpt.h rename to src/racket/src/schcpt.h diff --git a/src/mzscheme/src/schemef.h b/src/racket/src/schemef.h similarity index 100% rename from src/mzscheme/src/schemef.h rename to src/racket/src/schemef.h diff --git a/src/mzscheme/src/schemex.h b/src/racket/src/schemex.h similarity index 100% rename from src/mzscheme/src/schemex.h rename to src/racket/src/schemex.h diff --git a/src/mzscheme/src/schemex.inc b/src/racket/src/schemex.inc similarity index 100% rename from src/mzscheme/src/schemex.inc rename to src/racket/src/schemex.inc diff --git a/src/mzscheme/src/schemexm.h b/src/racket/src/schemexm.h similarity index 100% rename from src/mzscheme/src/schemexm.h rename to src/racket/src/schemexm.h diff --git a/src/mzscheme/src/schexn.h b/src/racket/src/schexn.h similarity index 100% rename from src/mzscheme/src/schexn.h rename to src/racket/src/schexn.h diff --git a/src/mzscheme/src/schexpobs.h b/src/racket/src/schexpobs.h similarity index 100% rename from src/mzscheme/src/schexpobs.h rename to src/racket/src/schexpobs.h diff --git a/src/mzscheme/src/schfd.h b/src/racket/src/schfd.h similarity index 100% rename from src/mzscheme/src/schfd.h rename to src/racket/src/schfd.h diff --git a/src/mzscheme/src/schgc.h b/src/racket/src/schgc.h similarity index 100% rename from src/mzscheme/src/schgc.h rename to src/racket/src/schgc.h diff --git a/src/mzscheme/src/schgencat.h b/src/racket/src/schgencat.h similarity index 100% rename from src/mzscheme/src/schgencat.h rename to src/racket/src/schgencat.h diff --git a/src/mzscheme/src/schmach.h b/src/racket/src/schmach.h similarity index 100% rename from src/mzscheme/src/schmach.h rename to src/racket/src/schmach.h diff --git a/src/mzscheme/src/schmap.inc b/src/racket/src/schmap.inc similarity index 100% rename from src/mzscheme/src/schmap.inc rename to src/racket/src/schmap.inc diff --git a/src/mzscheme/src/schminc.h b/src/racket/src/schminc.h similarity index 100% rename from src/mzscheme/src/schminc.h rename to src/racket/src/schminc.h diff --git a/src/mzscheme/src/schnapp.inc b/src/racket/src/schnapp.inc similarity index 100% rename from src/mzscheme/src/schnapp.inc rename to src/racket/src/schnapp.inc diff --git a/src/mzscheme/src/schpriv.h b/src/racket/src/schpriv.h similarity index 100% rename from src/mzscheme/src/schpriv.h rename to src/racket/src/schpriv.h diff --git a/src/mzscheme/src/schrunst.h b/src/racket/src/schrunst.h similarity index 100% rename from src/mzscheme/src/schrunst.h rename to src/racket/src/schrunst.h diff --git a/src/mzscheme/src/schrx.h b/src/racket/src/schrx.h similarity index 100% rename from src/mzscheme/src/schrx.h rename to src/racket/src/schrx.h diff --git a/src/mzscheme/src/schuchar.inc b/src/racket/src/schuchar.inc similarity index 100% rename from src/mzscheme/src/schuchar.inc rename to src/racket/src/schuchar.inc diff --git a/src/mzscheme/src/schustr.inc b/src/racket/src/schustr.inc similarity index 100% rename from src/mzscheme/src/schustr.inc rename to src/racket/src/schustr.inc diff --git a/src/mzscheme/src/schvers.h b/src/racket/src/schvers.h similarity index 100% rename from src/mzscheme/src/schvers.h rename to src/racket/src/schvers.h diff --git a/src/mzscheme/src/schwinfd.h b/src/racket/src/schwinfd.h similarity index 100% rename from src/mzscheme/src/schwinfd.h rename to src/racket/src/schwinfd.h diff --git a/src/mzscheme/src/sema.c b/src/racket/src/sema.c similarity index 100% rename from src/mzscheme/src/sema.c rename to src/racket/src/sema.c diff --git a/src/mzscheme/src/setjmpup.c b/src/racket/src/setjmpup.c similarity index 100% rename from src/mzscheme/src/setjmpup.c rename to src/racket/src/setjmpup.c diff --git a/src/mzscheme/src/sstoinc b/src/racket/src/sstoinc similarity index 100% rename from src/mzscheme/src/sstoinc rename to src/racket/src/sstoinc diff --git a/src/mzscheme/src/sstoinc.ss b/src/racket/src/sstoinc.ss similarity index 100% rename from src/mzscheme/src/sstoinc.ss rename to src/racket/src/sstoinc.ss diff --git a/src/mzscheme/src/startup.inc b/src/racket/src/startup.inc similarity index 100% rename from src/mzscheme/src/startup.inc rename to src/racket/src/startup.inc diff --git a/src/mzscheme/src/startup.ss b/src/racket/src/startup.ss similarity index 100% rename from src/mzscheme/src/startup.ss rename to src/racket/src/startup.ss diff --git a/src/mzscheme/src/string.c b/src/racket/src/string.c similarity index 100% rename from src/mzscheme/src/string.c rename to src/racket/src/string.c diff --git a/src/mzscheme/src/strops.inc b/src/racket/src/strops.inc similarity index 100% rename from src/mzscheme/src/strops.inc rename to src/racket/src/strops.inc diff --git a/src/mzscheme/src/struct.c b/src/racket/src/struct.c similarity index 100% rename from src/mzscheme/src/struct.c rename to src/racket/src/struct.c diff --git a/src/mzscheme/src/stxobj.c b/src/racket/src/stxobj.c similarity index 100% rename from src/mzscheme/src/stxobj.c rename to src/racket/src/stxobj.c diff --git a/src/mzscheme/src/stypes.h b/src/racket/src/stypes.h similarity index 100% rename from src/mzscheme/src/stypes.h rename to src/racket/src/stypes.h diff --git a/src/mzscheme/src/symbol.c b/src/racket/src/symbol.c similarity index 100% rename from src/mzscheme/src/symbol.c rename to src/racket/src/symbol.c diff --git a/src/mzscheme/src/syntax.c b/src/racket/src/syntax.c similarity index 100% rename from src/mzscheme/src/syntax.c rename to src/racket/src/syntax.c diff --git a/src/mzscheme/src/sysname b/src/racket/src/sysname similarity index 100% rename from src/mzscheme/src/sysname rename to src/racket/src/sysname diff --git a/src/mzscheme/src/thread.c b/src/racket/src/thread.c similarity index 100% rename from src/mzscheme/src/thread.c rename to src/racket/src/thread.c diff --git a/src/mzscheme/src/type.c b/src/racket/src/type.c similarity index 100% rename from src/mzscheme/src/type.c rename to src/racket/src/type.c diff --git a/src/mzscheme/src/unwind/libunwind.c b/src/racket/src/unwind/libunwind.c similarity index 100% rename from src/mzscheme/src/unwind/libunwind.c rename to src/racket/src/unwind/libunwind.c diff --git a/src/mzscheme/src/unwind/libunwind.h b/src/racket/src/unwind/libunwind.h similarity index 100% rename from src/mzscheme/src/unwind/libunwind.h rename to src/racket/src/unwind/libunwind.h diff --git a/src/mzscheme/src/unwind/libunwind_i.h b/src/racket/src/unwind/libunwind_i.h similarity index 100% rename from src/mzscheme/src/unwind/libunwind_i.h rename to src/racket/src/unwind/libunwind_i.h diff --git a/src/mzscheme/src/vector.c b/src/racket/src/vector.c similarity index 100% rename from src/mzscheme/src/vector.c rename to src/racket/src/vector.c diff --git a/src/mzscheme/uconfig.h b/src/racket/uconfig.h similarity index 100% rename from src/mzscheme/uconfig.h rename to src/racket/uconfig.h diff --git a/src/mzscheme/utils/README b/src/racket/utils/README similarity index 100% rename from src/mzscheme/utils/README rename to src/racket/utils/README diff --git a/src/mzscheme/utils/splay.c b/src/racket/utils/splay.c similarity index 100% rename from src/mzscheme/utils/splay.c rename to src/racket/utils/splay.c diff --git a/src/mzscheme/utils/xcglue.c b/src/racket/utils/xcglue.c similarity index 100% rename from src/mzscheme/utils/xcglue.c rename to src/racket/utils/xcglue.c diff --git a/src/mzscheme/utils/xcglue.h b/src/racket/utils/xcglue.h similarity index 100% rename from src/mzscheme/utils/xcglue.h rename to src/racket/utils/xcglue.h diff --git a/src/mzscheme/utils/xctocc b/src/racket/utils/xctocc similarity index 100% rename from src/mzscheme/utils/xctocc rename to src/racket/utils/xctocc diff --git a/src/racket/version.mak b/src/racket/version.mak new file mode 100644 index 0000000000..bae736facc --- /dev/null +++ b/src/racket/version.mak @@ -0,0 +1,2 @@ + +FWVERSION = $(shell grep ' MZSCHEME_VERSION ' $(mainsrcdir)/racket/src/schvers.h | cut -d '"' -f 2) diff --git a/src/worksp/README b/src/worksp/README index f3d41b11af..fc82656a87 100644 --- a/src/worksp/README +++ b/src/worksp/README @@ -1,280 +1,280 @@ -This directory contains - - - solution files and project files for building MzScheme and MrEd - with Microsoft Visual Studio 8.0 and up (which work with the - Express 2005 version of Visual Studio); - - - mzconfig.h which is a manual version of information that is - gathered automatically when using the "configure" script; - - - scripts for building 3m variants of MzScheme and MrEd using - Visual Studio command-line tools; and - - - solution files and project files for building MzCOM and MysterX - with Microsoft Visual Studio 8.0 (not Express, which doesn't - support ATL and MFC). - -Visual Studio Express is available for free from Microsoft; it can be -used to build MzScheme and MrEd, but not MzCOM and MysterX. - -MzScheme and MrEd also compile with Cygwin gcc (a free compiler from -GNU and Cygnus Solutions), but the result is a Unix-style -installation, not a Window-style installation. To compile with gcc, -follow the instructions in plt\src\README (which contains a short -Windows-specific section). - -With an MSVC-built MzScheme, compatible extensions can be built with -other compilers. Build with Cygwin and copy the installed plt\lib\gcc -to a MSVC-based build to support Cygwin-built extensions. To support -Borland-built extensions, cd to plt\src\mzscheme\dynsrc and run -mkbordyn.bat (which requires bcc23.exe, of course). - -As always, please report bugs via one of the following: - - Help Desk's "submit bug report" link (preferred) - - http://bugs.plt-scheme.org/ - - bugs@plt-scheme.org (last resort) - --PLT - scheme@plt-scheme.org - ----------------------------------------------------------------------- -Building MzScheme and MrEd ----------------------------------------------------------------------- - -If you're using MSVC 8.0 (not Express), and if `devenv.exe' is in your -path, then you can just run - plt\src\worksp\build.bat -from its own directory to perform all steps up to "Versioning", -including the MzCOM and MysterX steps. - -The CGC variants of MzScheme, MzCOM, MrEd, and MysterX can be built -via Visual Studio projects. The 3m variants are built by a Scheme -script that runs the MSVC command-line tools. (See "CGC versus 3m" -in plt\src\README if you don't know about the two variants.) - -The 3m build requires some parts of the CGC build: - plt\src\worksp\mzscheme - plt\src\worksp\wxutils - plt\src\worksp\jpeg - plt\src\worksp\png - plt\src\worksp\zlib -It's simplest to just build the main CGC solutions, which -automatically build all of the above projects, and then build -3m. - -Building MzSchemeCGC and MrEdCGC --------------------------------- - -The CGC source code for MzSchemeCGC and MrEdCGC is split into several -projects that are grouped into a few solutions. To build the `X' -solution with Visual Studio, open the file plt\src\worksp\X\X.sln. - -To build MzSchemeCGC, build the MzScheme solution in - plt\src\worksp\mzscheme - makes plt\MzSchemeCGC.exe - - [When you open the solution, it may default to "Debug"configuration. - Switch to "Release" before building.] - -To build MrEdCGC, build the MrEd solution: - plt\src\worksp\mred - makes plt\MrEdCGC.exe - - [Again, switch to the "Release" configuration if necessary.] - -The build processes for MzSchemeCGC automatically builds - libmzgc - makes plt\lib\libmzgcxxxxxxx.dll and - plt\src\worksp\libmzgc\Release\libmzgcxxxxxxx.lib - mzsrc - makes plt\lib\libmzschxxxxxxx.dll and - plt\src\worksp\mzsrc\Release\mzsrcxxxxxxx.lib - -The build process for MrEdCGC automatically builds - libmzgc - as above - libmzsch - as above - libmred - makes plt\lib\libmredxxxxxxx.dll and - plt\src\worksp\libmred\Release\libmredxxxxxxx.lib - wxutils - makes plt\src\worksp\wxutils\Release\wxutils.lib - wxwin - makes plt\src\worksp\wxwin\Release\wxwin.lib - wxs - makes plt\src\worksp\wxs\Release\wxs.lib - wxme - makes plt\src\worksp\wxme\Release\wxme.lib - jpeg - makes plt\src\worksp\jpeg\Release\jpeg.lib - png - makes plt\src\worksp\jpeg\Release\png.lib - zlib - makes plt\src\worksp\jpeg\Release\zlib.lib - -In addition, building MzSchemeCGC executes - plt\src\mzscheme\dynsrc\mkmzdyn.bat -which copies .exp, .obj, and .lib files into plt\lib\, and also copies -DLLs from the "extradlls" directory to to plt\lib\. - -Building MzScheme3m and MrEd3m ------------------------------- - -After MzSchemeCGC and MrEdCGC are built, you can can build 3m -binaries: - - 1. Ensure that the Visual Studio command-line tools are in your - path. You may need to run "vsvars32.bat" from your Visual Studio - installation, so that PATH and other environment variables are set. - - 2. Change directories to plt\src\worksp\gc2 and run - - ..\..\..\mzschemecgc.exe -cu make.ss - -The resulting MzScheme.exe and MrEd.exe will appear in the "plt" -directory, along with DLLs libmzsch3mxxxxxxx.dll and -libmred3mxxxxxxx.dll in plt/lib. (There is no corresponding -libmzgc3mxxxxxxx.dll. Instead, it is merged with -libmzsch3mxxxxxxx.dll.) - -Building Collections and Other Executables ------------------------------------------- - -If you're building from scratch, you'll also want the starter programs -used by the launcher collection to create "Setup PLT.exe". Build the -following solutions: - - plt\src\worksp\mzstart - makes plt\collects\launcher\mzstart.exe - plt\src\worksp\mrstart - makes plt\collects\launcher\mrstart.exe - - [The "mzstart" and "mrstart" programs have no CGC versus 3m - distinction.] - -Then, set up all the other executables (besides MrEd[CGC].exe and -MzScheme[CGC].exe) by running - - mzscheme.exe -l- setup - -This last step makes the .zo files, too. To skip compiling .zos, add --n to the end of the above command. - -If you've already built before, then this step can be simplied: just -re-run "Setup PLT.exe", which was created the first time. - -Versioning ----------- - -[If you're going to build MzCOM and/or MysterX, do that before running - the version-changing script. See instructions below.] - -The obnoxious "xxxxxxx" in the DLL names is a placeholder for a -version number. Embedding a version number in a DLL name appears to -be the simplest and surest way to avoid version confusion. - -For local testing, you can use the "xxxxxxx" libraries directly. For -any binaries that will be distributed, however, the placeholder should -be replaced with a specific version. - -To replace the "xxxxxxx" with a specific version, run - - mzscheme -l setup/winvers - -in a shell. - -The "winvers.ss" program will have to make a temporary copy of -mzscheme.exe and the "lib" sub-directory (into the temporary -directory), and it will re-launch MzScheme a couple of times. Every -".exe", ".dll", ".lib", ".def", ".exp", and ".pdb" file within the -"plt" tree is updated to replace "xxxxxxxx" with a specific version -number. - ----------------------------------------------------------------------- -Building MzCOM and MysterX ----------------------------------------------------------------------- - -Beware that MzCOM and MysterX do not build with Express versions of -Visual Studio. Otherwise, building MzCOMCGC and MysterXCGC is similar -to building MzSchemeCGC. Building the 3m variants is a little -different. - -Building MzCOM --------------- - -To build MzCOMCGC, make the MzCOM solution in - plt\src\worksp\mzcom - makes plt\MzCOMCGC.exe - -Use the "Release" configuration. - -After building MzCOMCGC, you can build the 3m variant by - - 1. Change directories to plt\src\worksp\mzcom and run - - ..\..\..\mzschemecgc.exe -cu xform.ss - - 2. Switch to the "3m" configuration in the MzCOM solution - (in Visual Studio). - - 3. Build (in Visual Studio). - -The result is plt\MzCOM.exe. - -Building MysterX ----------------- - -To build MysterXCGC, make the MysterX solution in - plt\src\worksp\libmysterx - makes plt\lib\myssink.dll, - plt\lib\myspage.dll, and mxmain.dll in - collects\mysterx\private\compiled\native\win32\i386 - -Use the "Release" configuration. - -After building MysterXCGC, you can build the 3m variant by - - 1. Change directories to plt\src\worksp\libmysterx and run - - ..\..\..\mzschemecgc.exe -cu xform.ss - - 2. Switch to the "3m" configuration in the libmysterx solution - (in Visual Studio). - - 3. Build (in Visual Studio). - -The result is mxmain.dll (no 3m suffix) in - collects\mysterx\private\compiled\native\win32\i386\3m - ----------------------------------------------------------------------- -Finding DLLs ----------------------------------------------------------------------- - -Since the DLLs libmzsch3mxxxxxxx.dll (or libmzgcxxxxxxx.dll and -libmzschxxxxxxx.dll) and libmred3mxxxxxxx.dll (or libmredxxxxxxx.dll) -are installed into plt\lib\ instead of just plt\, the normal search -path for DLLs would not find them when running "MzScheme.exe" or -"MrEd.exe". To find the DLLs, the executables are "delayload" linked -with the DLLs, and the executables explicitly load the DLLs from -plt\lib\ on start-up. - -The relative DLL path is embedded in each executable, and it can be -replaced with a path of up to 512 characters. The path is stored in -the executable in wide-character format, and it is stored immediately -after the wide-character tag "dLl dIRECTORy:" with a wide NUL -terminator. The path can be either absolute or relative; in the latter -case, the relative path is resolved with respect to the -executable. Replacing the first character of the path with "<" -disables the explicit DLL load, so that the DLLs must appear in the -normal DLL search path. - -See also ..\README for information on the embedded "collects" path in -the executables. - ----------------------------------------------------------------------- -Embedding MzScheme ----------------------------------------------------------------------- - -The MzScheme DLLs can be used within an embedding application. - -The libraries - - plt\lib\win32\msvc\libmzsch3mxxxxxxx.lib - plt\lib\win32\msvc\libmzschxxxxxxx.lib - plt\lib\win32\msvc\libmzgcxxxxxxx.lib - -which are created by the mzsrc and gc projects, provide linking -information for using the libmzsch3mxxxxxxx.dll, libmzschxxxxxxx.dll, -and libmzgcxxxxxxx.dll DLLs. The versioning script adjusts the names, -as described above. - -See the "Inside PLT MzScheme" manual for more information about using -these libraries to embed MzScheme in an application. - - -If you need MzScheme to link to a DLL-based C library (instead of -statically linking to the C library within the MzScheme DLL), then -compile MzScheme with the /MD flag. +This directory contains + + - solution files and project files for building Racket and GRacket + with Microsoft Visual Studio 8.0 and up (which work with the + Express 2005 version of Visual Studio); + + - mzconfig.h which is a manual version of information that is + gathered automatically when using the "configure" script; + + - scripts for building 3m variants of Racket and GRacket using + Visual Studio command-line tools; and + + - solution files and project files for building MzCOM and MysterX + with Microsoft Visual Studio 8.0 (not Express, which doesn't + support ATL and MFC). + +Visual Studio Express is available for free from Microsoft; it can be +used to build Racket and GRacket, but not MzCOM and MysterX. + +Racket and GRacket also compile with Cygwin gcc (a free compiler from +GNU and Cygnus Solutions), but the result is a Unix-style +installation, not a Window-style installation. To compile with gcc, +follow the instructions in plt\src\README (which contains a short +Windows-specific section). + +With an MSVC-built Racket, compatible extensions can be built with +other compilers. Build with Cygwin and copy the installed plt\lib\gcc +to a MSVC-based build to support Cygwin-built extensions. To support +Borland-built extensions, cd to plt\src\racket\dynsrc and run +mkbordyn.bat (which requires bcc23.exe, of course). + +As always, please report bugs via one of the following: + - Help Desk's "submit bug report" link (preferred) + - http://bugs.plt-scheme.org/ + - bugs@plt-scheme.org (last resort) + +-PLT + scheme@plt-scheme.org + +---------------------------------------------------------------------- +Building Racket and GRacket +---------------------------------------------------------------------- + +If you're using MSVC 8.0 (not Express), and if `devenv.exe' is in your +path, then you can just run + plt\src\worksp\build.bat +from its own directory to perform all steps up to "Versioning", +including the MzCOM and MysterX steps. + +The CGC variants of Racket, MzCOM, GRacket, and MysterX can be built +via Visual Studio projects. The 3m variants are built by a Scheme +script that runs the MSVC command-line tools. (See "CGC versus 3m" +in plt\src\README if you don't know about the two variants.) + +The 3m build requires some parts of the CGC build: + plt\src\worksp\racket + plt\src\worksp\wxutils + plt\src\worksp\jpeg + plt\src\worksp\png + plt\src\worksp\zlib +It's simplest to just build the main CGC solutions, which +automatically build all of the above projects, and then build +3m. + +Building RacketCGC and GRacketCGC +-------------------------------- + +The CGC source code for RacketCGC and GRacketCGC is split into several +projects that are grouped into a few solutions. To build the `X' +solution with Visual Studio, open the file plt\src\worksp\X\X.sln. + +To build RacketCGC, build the Racket solution in + plt\src\worksp\racket - makes plt\RacketCGC.exe + + [When you open the solution, it may default to "Debug"configuration. + Switch to "Release" before building.] + +To build GRacketCGC, build the GRacket solution: + plt\src\worksp\gracket - makes plt\GRacketCGC.exe + + [Again, switch to the "Release" configuration if necessary.] + +The build processes for RacketCGC automatically builds + libmzgc - makes plt\lib\libmzgcxxxxxxx.dll and + plt\src\worksp\libmzgc\Release\libmzgcxxxxxxx.lib + mzsrc - makes plt\lib\libracketxxxxxxx.dll and + plt\src\worksp\mzsrc\Release\mzsrcxxxxxxx.lib + +The build process for GRacketCGC automatically builds + libmzgc - as above + libracket - as above + libgracket - makes plt\lib\libgracketxxxxxxx.dll and + plt\src\worksp\libgracket\Release\libgracketxxxxxxx.lib + wxutils - makes plt\src\worksp\wxutils\Release\wxutils.lib + wxwin - makes plt\src\worksp\wxwin\Release\wxwin.lib + wxs - makes plt\src\worksp\wxs\Release\wxs.lib + wxme - makes plt\src\worksp\wxme\Release\wxme.lib + jpeg - makes plt\src\worksp\jpeg\Release\jpeg.lib + png - makes plt\src\worksp\jpeg\Release\png.lib + zlib - makes plt\src\worksp\jpeg\Release\zlib.lib + +In addition, building RacketCGC executes + plt\src\racket\dynsrc\mkmzdyn.bat +which copies .exp, .obj, and .lib files into plt\lib\, and also copies +DLLs from the "extradlls" directory to to plt\lib\. + +Building Racket3m and GRacket3m +------------------------------ + +After RacketCGC and GRacketCGC are built, you can can build 3m +binaries: + + 1. Ensure that the Visual Studio command-line tools are in your + path. You may need to run "vsvars32.bat" from your Visual Studio + installation, so that PATH and other environment variables are set. + + 2. Change directories to plt\src\worksp\gc2 and run + + ..\..\..\racketcgc.exe -cu make.ss + +The resulting Racket.exe and GRacket.exe will appear in the "plt" +directory, along with DLLs libracket3mxxxxxxx.dll and +libgracket3mxxxxxxx.dll in plt/lib. (There is no corresponding +libmzgc3mxxxxxxx.dll. Instead, it is merged with +libracket3mxxxxxxx.dll.) + +Building Collections and Other Executables +------------------------------------------ + +If you're building from scratch, you'll also want the starter programs +used by the launcher collection to create "Setup PLT.exe". Build the +following solutions: + + plt\src\worksp\mzstart - makes plt\collects\launcher\mzstart.exe + plt\src\worksp\mrstart - makes plt\collects\launcher\mrstart.exe + + [The "mzstart" and "mrstart" programs have no CGC versus 3m + distinction.] + +Then, set up all the other executables (besides GRacket[CGC].exe and +Racket[CGC].exe) by running + + racket.exe -l- setup + +This last step makes the .zo files, too. To skip compiling .zos, add +-n to the end of the above command. + +If you've already built before, then this step can be simplied: just +re-run "Setup PLT.exe", which was created the first time. + +Versioning +---------- + +[If you're going to build MzCOM and/or MysterX, do that before running + the version-changing script. See instructions below.] + +The obnoxious "xxxxxxx" in the DLL names is a placeholder for a +version number. Embedding a version number in a DLL name appears to +be the simplest and surest way to avoid version confusion. + +For local testing, you can use the "xxxxxxx" libraries directly. For +any binaries that will be distributed, however, the placeholder should +be replaced with a specific version. + +To replace the "xxxxxxx" with a specific version, run + + racket -l setup/winvers + +in a shell. + +The "winvers.ss" program will have to make a temporary copy of +racket.exe and the "lib" sub-directory (into the temporary +directory), and it will re-launch Racket a couple of times. Every +".exe", ".dll", ".lib", ".def", ".exp", and ".pdb" file within the +"plt" tree is updated to replace "xxxxxxxx" with a specific version +number. + +---------------------------------------------------------------------- +Building MzCOM and MysterX +---------------------------------------------------------------------- + +Beware that MzCOM and MysterX do not build with Express versions of +Visual Studio. Otherwise, building MzCOMCGC and MysterXCGC is similar +to building RacketCGC. Building the 3m variants is a little +different. + +Building MzCOM +-------------- + +To build MzCOMCGC, make the MzCOM solution in + plt\src\worksp\mzcom - makes plt\MzCOMCGC.exe + +Use the "Release" configuration. + +After building MzCOMCGC, you can build the 3m variant by + + 1. Change directories to plt\src\worksp\mzcom and run + + ..\..\..\racketcgc.exe -cu xform.ss + + 2. Switch to the "3m" configuration in the MzCOM solution + (in Visual Studio). + + 3. Build (in Visual Studio). + +The result is plt\MzCOM.exe. + +Building MysterX +---------------- + +To build MysterXCGC, make the MysterX solution in + plt\src\worksp\libmysterx - makes plt\lib\myssink.dll, + plt\lib\myspage.dll, and mxmain.dll in + collects\mysterx\private\compiled\native\win32\i386 + +Use the "Release" configuration. + +After building MysterXCGC, you can build the 3m variant by + + 1. Change directories to plt\src\worksp\libmysterx and run + + ..\..\..\racketcgc.exe -cu xform.ss + + 2. Switch to the "3m" configuration in the libmysterx solution + (in Visual Studio). + + 3. Build (in Visual Studio). + +The result is mxmain.dll (no 3m suffix) in + collects\mysterx\private\compiled\native\win32\i386\3m + +---------------------------------------------------------------------- +Finding DLLs +---------------------------------------------------------------------- + +Since the DLLs libracket3mxxxxxxx.dll (or libmzgcxxxxxxx.dll and +libracketxxxxxxx.dll) and libgracket3mxxxxxxx.dll (or +libgracketxxxxxxx.dll) are installed into plt\lib\ instead of just +plt\, the normal search path for DLLs would not find them when running +"Racket.exe" or "GRacket.exe". To find the DLLs, the executables are +"delayload" linked with the DLLs, and the executables explicitly load +the DLLs from plt\lib\ on start-up. + +The relative DLL path is embedded in each executable, and it can be +replaced with a path of up to 512 characters. The path is stored in +the executable in wide-character format, and it is stored immediately +after the wide-character tag "dLl dIRECTORy:" with a wide NUL +terminator. The path can be either absolute or relative; in the latter +case, the relative path is resolved with respect to the +executable. Replacing the first character of the path with "<" +disables the explicit DLL load, so that the DLLs must appear in the +normal DLL search path. + +See also ..\README for information on the embedded "collects" path in +the executables. + +---------------------------------------------------------------------- +Embedding Racket +---------------------------------------------------------------------- + +The Racket DLLs can be used within an embedding application. + +The libraries + + plt\lib\win32\msvc\libracket3mxxxxxxx.lib + plt\lib\win32\msvc\libracketxxxxxxx.lib + plt\lib\win32\msvc\libmzgcxxxxxxx.lib + +which are created by the mzsrc and gc projects, provide linking +information for using the libracket3mxxxxxxx.dll, +libracketxxxxxxx.dll, and libmzgcxxxxxxx.dll DLLs. The versioning +script adjusts the names, as described above. + +See the "Inside PLT Racket" manual for more information about using +these libraries to embed Racket in an application. + + +If you need Racket to link to a DLL-based C library (instead of +statically linking to the C library within the Racket DLL), then +compile Racket with the /MD flag. diff --git a/src/worksp/build.bat b/src/worksp/build.bat index cf955133c2..9c6b74b4d4 100644 --- a/src/worksp/build.bat +++ b/src/worksp/build.bat @@ -1,7 +1,7 @@ -cd mzscheme -devenv mzscheme.sln /Build Release -cd ..\mred -devenv mred.sln /Build Release +cd racket +devenv racket.sln /Build Release +cd ..\gracket +devenv gracket.sln /Build Release cd .. cd gc2 diff --git a/src/worksp/extradlls/README.TXT b/src/worksp/extradlls/README.TXT index 4adbef2428..8e14a8aeec 100644 --- a/src/worksp/extradlls/README.TXT +++ b/src/worksp/extradlls/README.TXT @@ -1,4 +1,4 @@ -This directory contains extra DLLs that are needed for running PLT -Scheme. The DLL files are moved into the PLT/lib folder by - plt/src/mzscheme/dynsrc/mkmzdyn.bat -which is, in turn, called by the MSVC projects. +This directory contains extra DLLs that are needed for running +Racket. The DLL files are moved into the Racket/lib folder by + plt/src/racket/dynsrc/mkmzdyn.bat +which is, in turn, called by the MSVC projects. diff --git a/src/worksp/gc2/make.ss b/src/worksp/gc2/make.ss index 63dc7a81a4..2a107beb12 100644 --- a/src/worksp/gc2/make.ss +++ b/src/worksp/gc2/make.ss @@ -1,505 +1,505 @@ - -#lang scheme/base - -(use-compiled-file-paths null) - -(require mzlib/restart - mzlib/process) - -(define (system- s) - (fprintf (current-error-port) "~a~n" s) - (system s)) - -(define accounting-gc? #t) -(define backtrace-gc? #f) -(define opt-flags "/O2 /Oy-") -(define re:only #f) - -(unless (find-executable-path "cl.exe" #f) - (error (string-append - "Cannot find executable \"cl.exe\".\n" - "You may need to find and run \"vsvars32.bat\"."))) - -(unless (directory-exists? "xsrc") - (make-directory "xsrc")) - -(define srcs - '("salloc" - "bignum" - "bool" - "builtin" - "char" - "complex" - "dynext" - "env" - "error" - "eval" - "file" - "future" - "fun" - "hash" - "jit" - "list" - "module" - "mzrt" - "network" - "numarith" - "number" - "numcomp" - "numstr" - "places" - "port" - "portfun" - "print" - "rational" - "read" - "regexp" - "sema" - "setjmpup" - "string" - "struct" - "symbol" - "syntax" - "stxobj" - "thread" - "type" - "vector")) - -(define common-cpp-defs " /D _CRT_SECURE_NO_DEPRECATE /D _USE_DECLSPECS_FOR_SAL=0 /D _USE_ATTRIBUTES_FOR_SAL=0 ") - -(define (check-timestamp t2 dep) - (when (t2 . > . (current-seconds)) - (fprintf (current-error-port) - "WARNING: timestamp is in the future: ~e\n" - dep))) - -(define (try src deps dest objdest includes use-precomp extra-compile-flags expand-extra-flags msvc-pch indirect?) - (when (or (not re:only) (regexp-match re:only dest)) - (unless (and (file-exists? dest) - (let ([t (file-or-directory-modify-seconds dest)]) - (andmap - (lambda (dep) - (let ([dep (cond - [(bytes? dep) (bytes->path dep)] - [else dep])]) - (let ([t2 (file-or-directory-modify-seconds dep)]) - (check-timestamp t2 dep) - (> t t2)))) - (append deps - (if use-precomp (list use-precomp) null) - (let ([deps (path-replace-suffix dest #".sdep")]) - (if (file-exists? deps) - (with-input-from-file deps read) - null)))))) - (unless (parameterize - ([use-compiled-file-paths (list "compiled")]) - (restart-mzscheme #() (lambda (x) x) - (list->vector - (append - (list "-u" - "../../mzscheme/gc2/xform.ss" - "--setup" - ".") - (if objdest - (if use-precomp - (list "--precompiled" use-precomp) - null) - (list "--precompile")) - (if indirect? - '("--indirect") - null) - (list - "--depends" - "--cpp" - (format "cl.exe /MT /E ~a ~a ~a" - common-cpp-defs - expand-extra-flags - includes) - "-o" - dest - src))) - void)) - (when (file-exists? dest) - (delete-file dest)) - (error "error xforming"))) - (when objdest - (c-compile dest objdest null (string-append - extra-compile-flags - common-cpp-defs - (if msvc-pch - (format " /Fp~a" msvc-pch) - "")))))) - -(define (c-compile c o deps flags) - (unless (and (file-exists? o) - (let ([t (file-or-directory-modify-seconds o)]) - (and (>= t (file-or-directory-modify-seconds c)) - (andmap - (lambda (f) - (let ([t2 (file-or-directory-modify-seconds f)]) - (check-timestamp t2 f) - (>= t t2))) - deps)))) - (unless (system- (format "cl.exe ~a /MT /Zi ~a /c ~a /Fdxsrc/ /Fo~a" flags opt-flags c o)) - (error "failed compile")))) - -(define common-deps (list "../../mzscheme/gc2/xform.ss" - "../../mzscheme/gc2/xform-mod.ss")) - -(define (find-obj f d) (format "../~a/release/~a.obj" d f)) - -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define mz-inc "/I ../../mzscheme/include /I .. ") - -(try "precomp.c" (list* "../../mzscheme/src/schvers.h" - common-deps) - "xsrc/precomp.h" #f - (string-append mz-inc "/I ../../mzscheme/src") - #f "" "" #f #f) - -(for-each - (lambda (x) - (try (format "../../mzscheme/src/~a.c" x) - (list* (format "../../mzscheme/src/~a.c" x) - common-deps) - (format "xsrc/~a.c" x) - (format "xsrc/~a.obj" x) - mz-inc - "xsrc/precomp.h" - "" - (string-append "/D LIBMZ_EXPORTS " - (if accounting-gc? - "/D NEWGC_BTC_ACCOUNT " - "") - (if backtrace-gc? - "/D MZ_GC_BACKTRACE " - "")) - "mz.pch" - #f)) - srcs) - -(try "../../mzscheme/main.c" - (list* "../../mzscheme/main.c" - common-deps) - "xsrc/main.c" - "xsrc/main.obj" - mz-inc - #f - "" - "" - #f - #t) - -(try "../../foreign/foreign.c" - (list* "../../foreign/foreign.c" - common-deps) - "xsrc/foreign.c" - "xsrc/foreign.obj" - (string-append - mz-inc - "/I../../foreign/libffi_msvc " - "/I../../mzscheme/src ") - #f - "" - "" - #f - #f) - -(c-compile "../../mzscheme/gc2/gc2.c" "xsrc/gc2.obj" - (append - (list "../mzconfig.h") - (map (lambda (f) (build-path "../../mzscheme/" f)) - '("include/scheme.h" - "include/schthread.h" - "src/schpriv.h" - "src/stypes.h")) - (map (lambda (f) (build-path "../../mzscheme/gc2/" f)) - '("gc2.c" - "newgc.c" - "vm_win.c" - "sighand.c" - "msgprint.c" - "gc2.h" - "gc2_obj.h"))) - (string-append - "/D GC2_AS_EXPORT " - "/D NEWGC_BTC_ACCOUNT " - (if backtrace-gc? - "/D MZ_GC_BACKTRACE " - "") - mz-inc)) -(c-compile "../../mzscheme/src/mzsj86.c" "xsrc/mzsj86.obj" '() mz-inc) - -(define dll "../../../lib/libracket3mxxxxxxx.dll") -(define exe "../../../Racket.exe") - -(define libs "kernel32.lib user32.lib ws2_32.lib shell32.lib advapi32.lib") - -(define (link-dll objs delayloads sys-libs dll link-options exe?) - (let ([ms (if (file-exists? dll) - (file-or-directory-modify-seconds dll) - 0)]) - (when (ormap - (lambda (f) - (> (file-or-directory-modify-seconds f) - ms)) - objs) - (unless (system- (format "cl.exe ~a /MT /Zi /Fe~a unicows.lib ~a ~a /link ~a~a~a" - (if exe? "" "/LD /DLL") - dll - (let loop ([objs (append objs sys-libs)]) - (if (null? objs) - "" - (string-append - (car objs) - " " - (loop (cdr objs))))) - libs - (let loop ([delayloads delayloads]) - (if (null? delayloads) - "" - (string-append - " /DELAYLOAD:" - (car delayloads) - " " - (loop (cdr delayloads))))) - link-options - (let ([s (regexp-match "^(.*)/([a-z0-9]*)[.]dll$" dll)]) - (if s - (format " /IMPLIB:~a/msvc/~a.lib" - (cadr s) (caddr s)) - "")))) - (error 'winmake "~a link failed" (if exe? "EXE" "DLL")))))) - -(c-compile "../mzscheme/uniplt.c" - "xsrc/uniplt.obj" - null - " -Dwx_msw") - -(let ([objs (list* - "../libmzsch/Release/uniplt.obj" - "xsrc/gc2.obj" - "xsrc/mzsj86.obj" - "xsrc/foreign.obj" - (find-obj "gmp" "libmzsch") - (find-obj "ffi" "libmzsch") - (find-obj "win32" "libmzsch") - (find-obj "prep_cif" "libmzsch") - (find-obj "types" "libmzsch") - (map - (lambda (n) - (format "xsrc/~a.obj" n)) - srcs))]) - (link-dll objs null null dll "" #f)) - -(define (check-rc res rc) - (unless (and (file-exists? res) - (>= (file-or-directory-modify-seconds res) - (file-or-directory-modify-seconds rc))) - (system- (string-append - "rc /l 0x409 /I ../../wxwindow/include/msw /I ../../wxwindow/contrib/fafa " - (format "/fo~a ~a" res rc))))) - -(check-rc "mzscheme.res" "../mzscheme/mzscheme.rc") - -(let ([objs (list - "mzscheme.res" - "xsrc/main.obj" - "xsrc/uniplt.obj" - "../../../lib/msvc/libracket3mxxxxxxx.lib")]) - (link-dll objs - '("libracket3mxxxxxxx.dll") - '("delayimp.lib") - exe "" #t)) - -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define wx-inc (string-append "/I ../../mzscheme/include " - "/I .. " - "/I ../../mzscheme/gc2 " - "/I ../../wxwindow/include/msw " - "/I ../../wxwindow/include/base " - "/I ../../mred/wxme " - "/I ../../wxwindow/contrib/wxxpm/libxpm.34b/lib " - "/I ../../wxWindow/contrib/fafa " - "/I ../../wxcommon/jpeg /I ../jpeg /I ../../wxcommon/zlib ")) -(try "wxprecomp.cxx" (list* "../../mzscheme/src/schvers.h" common-deps) - "xsrc/wxprecomp.h" #f wx-inc #f "" "-DGC2_AS_IMPORT" #f #f) - -(define (wx-try base proj x use-precomp? suffix indirect?) - (let ([cxx-file (format "../../~a/~a.~a" base x suffix)]) - (try cxx-file - (list* cxx-file - common-deps) - (format "xsrc/~a.~a" x suffix) - (format "xsrc/~a.obj" x) - wx-inc - (and use-precomp? "xsrc/wxprecomp.h") - "-DGC2_JUST_MACROS /FI../../../mzscheme/gc2/gc2.h" - (string-append "-DGC2_AS_IMPORT" - (if backtrace-gc? - " /D MZ_GC_BACKTRACE" - "")) - "wx.pch" - indirect?))) - -(define wxwin-base-srcs - '("wb_canvs" - "wb_cmdlg" - "wb_data" - "wb_dc" - "wb_dialg" - "wb_frame" - "wb_gdi" - "wb_hash" - "wb_item" - "wb_list" - "wb_main" - "wb_obj" - "wb_panel" - "wb_print" - "wb_ps" - "wb_stdev" - "wb_sysev" - "wb_timer" - "wb_types" - "wb_utils" - "wb_win")) - -(for-each (lambda (x) - (wx-try "wxwindow/src/base" "wxwin" x #t "cxx" #f)) - wxwin-base-srcs) - -(define wxwin-msw-srcs - '("wx_buttn" - "wx_canvs" - "wx_check" - "wx_choic" - "wx_clipb" - "wx_cmdlg" - "wx_dc" - "wx_dialg" - "wx_frame" - "wx_gauge" - "wx_gbox" - "wx_gdi" - "wx_graph_glue" - "wx_item" - "wx_lbox" - "wx_main" - "wx_menu" - "wx_messg" - "wx_panel" - "wx_pdf" - "wx_rbox" - "wx_slidr" - "wx_tabc" - "wx_timer" - "wx_utils" - "wx_win" - "wximgfil")) - -(for-each (lambda (x) - (wx-try "wxwindow/src/msw" "wxwin" x #t "cxx" #f)) - wxwin-msw-srcs) - -(define wxs-srcs - '("wxs_bmap" - "wxs_butn" - "wxs_chce" - "wxs_ckbx" - "wxs_cnvs" - "wxs_dc" - "wxs_evnt" - "wxs_fram" - "wxs_gage" - "wxs_gdi" - "wxs_glob" - "wxs_item" - "wxs_lbox" - "wxs_menu" - "wxs_misc" - "wxs_obj" - "wxs_panl" - "wxs_rado" - "wxs_slid" - "wxs_tabc" - "wxs_win" - "wxscheme")) - -(for-each (lambda (x) - (wx-try "mred/wxs" "wxs" x #t "cxx" #f)) - wxs-srcs) - -(define mred-srcs - '("mred" - "mredmsw")) - -(for-each (lambda (x) - (wx-try "mred" "libmred" x #t "cxx" #f)) - mred-srcs) - -(wx-try "wxcommon" "wxme" "wxJPEG" #t "cxx" #f) -(wx-try "mzscheme/utils" "wxme" "xcglue" #f "c" #f) -(c-compile "../../wxcommon/wxGC.cxx" - "xsrc/wxGC.obj" - null - (string-append wx-inc " -DMZ_PRECISE_GC -DGC2_AS_IMPORT -Dwx_msw")) - -(let ([objs (append (list - "xsrc/uniplt.obj" - "xsrc/wxGC.obj" - "xsrc/wxJPEG.obj" - "xsrc/xcglue.obj") - (map - (lambda (n) - (format "xsrc/~a.obj" n)) - (append wxwin-base-srcs - wxwin-msw-srcs - wxs-srcs - mred-srcs)))] - [libs (list - "../../../lib/msvc/libracket3mxxxxxxx.lib" - "../wxutils/Release/wxutils.lib" - "../jpeg/Release/jpeg.lib" - "../png/Release/png.lib" - "../zlib/Release/zlib.lib")] - [win-libs (list - "comctl32.lib" "glu32.lib" "opengl32.lib" - "gdi32.lib" "comdlg32.lib" "advapi32.lib" - "shell32.lib" "ole32.lib" "oleaut32.lib" - "winmm.lib")]) - (link-dll (append objs libs) null win-libs "../../../lib/libgracket3mxxxxxxx.dll" "" #f)) - -(wx-try "mred" "mred" "mrmain" #f "cxx" #t) - -(check-rc "mred.res" "../mred/mred.rc") - -(let ([objs (list - "mred.res" - "xsrc/mrmain.obj" - "xsrc/uniplt.obj" - "../../../lib/msvc/libracket3mxxxxxxx.lib" - "../../../lib/msvc/libgracket3mxxxxxxx.lib")]) - (link-dll objs - '("libracket3mxxxxxxx.dll" - "libgracket3mxxxxxxx.dll") - '("advapi32.lib" - "delayimp.lib") - "../../../GRacket.exe" " /subsystem:windows" #t)) - -(system- "cl.exe /MT /O2 /DMZ_PRECISE_GC /I../../mzscheme/include /I.. /c ../../mzscheme/dynsrc/mzdyn.c /Fomzdyn3m.obj") -(system- "lib.exe -def:../../mzscheme/dynsrc/mzdyn.def -out:mzdyn3m.lib") - -(define (copy-file/diff src dest) - (unless (and (file-exists? dest) - (string=? (with-input-from-file src (lambda () (read-string (file-size src)))) - (with-input-from-file dest (lambda () (read-string (file-size dest)))))) - (printf "Updating ~a~n" dest) - (when (file-exists? dest) (delete-file dest)) - (copy-file src dest))) - -(copy-file/diff "mzdyn3m.exp" "../../../lib/msvc/mzdyn3m.exp") -(copy-file/diff "mzdyn3m.obj" "../../../lib/msvc/mzdyn3m.obj") - + +#lang scheme/base + +(use-compiled-file-paths null) + +(require mzlib/restart + mzlib/process) + +(define (system- s) + (fprintf (current-error-port) "~a~n" s) + (system s)) + +(define accounting-gc? #t) +(define backtrace-gc? #f) +(define opt-flags "/O2 /Oy-") +(define re:only #f) + +(unless (find-executable-path "cl.exe" #f) + (error (string-append + "Cannot find executable \"cl.exe\".\n" + "You may need to find and run \"vsvars32.bat\"."))) + +(unless (directory-exists? "xsrc") + (make-directory "xsrc")) + +(define srcs + '("salloc" + "bignum" + "bool" + "builtin" + "char" + "complex" + "dynext" + "env" + "error" + "eval" + "file" + "future" + "fun" + "hash" + "jit" + "list" + "module" + "mzrt" + "network" + "numarith" + "number" + "numcomp" + "numstr" + "places" + "port" + "portfun" + "print" + "rational" + "read" + "regexp" + "sema" + "setjmpup" + "string" + "struct" + "symbol" + "syntax" + "stxobj" + "thread" + "type" + "vector")) + +(define common-cpp-defs " /D _CRT_SECURE_NO_DEPRECATE /D _USE_DECLSPECS_FOR_SAL=0 /D _USE_ATTRIBUTES_FOR_SAL=0 ") + +(define (check-timestamp t2 dep) + (when (t2 . > . (current-seconds)) + (fprintf (current-error-port) + "WARNING: timestamp is in the future: ~e\n" + dep))) + +(define (try src deps dest objdest includes use-precomp extra-compile-flags expand-extra-flags msvc-pch indirect?) + (when (or (not re:only) (regexp-match re:only dest)) + (unless (and (file-exists? dest) + (let ([t (file-or-directory-modify-seconds dest)]) + (andmap + (lambda (dep) + (let ([dep (cond + [(bytes? dep) (bytes->path dep)] + [else dep])]) + (let ([t2 (file-or-directory-modify-seconds dep)]) + (check-timestamp t2 dep) + (> t t2)))) + (append deps + (if use-precomp (list use-precomp) null) + (let ([deps (path-replace-suffix dest #".sdep")]) + (if (file-exists? deps) + (with-input-from-file deps read) + null)))))) + (unless (parameterize + ([use-compiled-file-paths (list "compiled")]) + (restart-mzscheme #() (lambda (x) x) + (list->vector + (append + (list "-u" + "../../racket/gc2/xform.ss" + "--setup" + ".") + (if objdest + (if use-precomp + (list "--precompiled" use-precomp) + null) + (list "--precompile")) + (if indirect? + '("--indirect") + null) + (list + "--depends" + "--cpp" + (format "cl.exe /MT /E ~a ~a ~a" + common-cpp-defs + expand-extra-flags + includes) + "-o" + dest + src))) + void)) + (when (file-exists? dest) + (delete-file dest)) + (error "error xforming"))) + (when objdest + (c-compile dest objdest null (string-append + extra-compile-flags + common-cpp-defs + (if msvc-pch + (format " /Fp~a" msvc-pch) + "")))))) + +(define (c-compile c o deps flags) + (unless (and (file-exists? o) + (let ([t (file-or-directory-modify-seconds o)]) + (and (>= t (file-or-directory-modify-seconds c)) + (andmap + (lambda (f) + (let ([t2 (file-or-directory-modify-seconds f)]) + (check-timestamp t2 f) + (>= t t2))) + deps)))) + (unless (system- (format "cl.exe ~a /MT /Zi ~a /c ~a /Fdxsrc/ /Fo~a" flags opt-flags c o)) + (error "failed compile")))) + +(define common-deps (list "../../racket/gc2/xform.ss" + "../../racket/gc2/xform-mod.ss")) + +(define (find-obj f d) (format "../~a/release/~a.obj" d f)) + +;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define mz-inc "/I ../../racket/include /I .. ") + +(try "precomp.c" (list* "../../racket/src/schvers.h" + common-deps) + "xsrc/precomp.h" #f + (string-append mz-inc "/I ../../racket/src") + #f "" "" #f #f) + +(for-each + (lambda (x) + (try (format "../../racket/src/~a.c" x) + (list* (format "../../racket/src/~a.c" x) + common-deps) + (format "xsrc/~a.c" x) + (format "xsrc/~a.obj" x) + mz-inc + "xsrc/precomp.h" + "" + (string-append "/D LIBMZ_EXPORTS " + (if accounting-gc? + "/D NEWGC_BTC_ACCOUNT " + "") + (if backtrace-gc? + "/D MZ_GC_BACKTRACE " + "")) + "mz.pch" + #f)) + srcs) + +(try "../../racket/main.c" + (list* "../../racket/main.c" + common-deps) + "xsrc/main.c" + "xsrc/main.obj" + mz-inc + #f + "" + "" + #f + #t) + +(try "../../foreign/foreign.c" + (list* "../../foreign/foreign.c" + common-deps) + "xsrc/foreign.c" + "xsrc/foreign.obj" + (string-append + mz-inc + "/I../../foreign/libffi_msvc " + "/I../../racket/src ") + #f + "" + "" + #f + #f) + +(c-compile "../../racket/gc2/gc2.c" "xsrc/gc2.obj" + (append + (list "../mzconfig.h") + (map (lambda (f) (build-path "../../racket/" f)) + '("include/scheme.h" + "include/schthread.h" + "src/schpriv.h" + "src/stypes.h")) + (map (lambda (f) (build-path "../../racket/gc2/" f)) + '("gc2.c" + "newgc.c" + "vm_win.c" + "sighand.c" + "msgprint.c" + "gc2.h" + "gc2_obj.h"))) + (string-append + "/D GC2_AS_EXPORT " + "/D NEWGC_BTC_ACCOUNT " + (if backtrace-gc? + "/D MZ_GC_BACKTRACE " + "") + mz-inc)) +(c-compile "../../racket/src/mzsj86.c" "xsrc/mzsj86.obj" '() mz-inc) + +(define dll "../../../lib/libracket3mxxxxxxx.dll") +(define exe "../../../Racket.exe") + +(define libs "kernel32.lib user32.lib ws2_32.lib shell32.lib advapi32.lib") + +(define (link-dll objs delayloads sys-libs dll link-options exe?) + (let ([ms (if (file-exists? dll) + (file-or-directory-modify-seconds dll) + 0)]) + (when (ormap + (lambda (f) + (> (file-or-directory-modify-seconds f) + ms)) + objs) + (unless (system- (format "cl.exe ~a /MT /Zi /Fe~a unicows.lib ~a ~a /link ~a~a~a" + (if exe? "" "/LD /DLL") + dll + (let loop ([objs (append objs sys-libs)]) + (if (null? objs) + "" + (string-append + (car objs) + " " + (loop (cdr objs))))) + libs + (let loop ([delayloads delayloads]) + (if (null? delayloads) + "" + (string-append + " /DELAYLOAD:" + (car delayloads) + " " + (loop (cdr delayloads))))) + link-options + (let ([s (regexp-match "^(.*)/([a-z0-9]*)[.]dll$" dll)]) + (if s + (format " /IMPLIB:~a/msvc/~a.lib" + (cadr s) (caddr s)) + "")))) + (error 'winmake "~a link failed" (if exe? "EXE" "DLL")))))) + +(c-compile "../racket/uniplt.c" + "xsrc/uniplt.obj" + null + " -Dwx_msw") + +(let ([objs (list* + "../libracket/Release/uniplt.obj" + "xsrc/gc2.obj" + "xsrc/mzsj86.obj" + "xsrc/foreign.obj" + (find-obj "gmp" "libracket") + (find-obj "ffi" "libracket") + (find-obj "win32" "libracket") + (find-obj "prep_cif" "libracket") + (find-obj "types" "libracket") + (map + (lambda (n) + (format "xsrc/~a.obj" n)) + srcs))]) + (link-dll objs null null dll "" #f)) + +(define (check-rc res rc) + (unless (and (file-exists? res) + (>= (file-or-directory-modify-seconds res) + (file-or-directory-modify-seconds rc))) + (system- (string-append + "rc /l 0x409 /I ../../wxwindow/include/msw /I ../../wxwindow/contrib/fafa " + (format "/fo~a ~a" res rc))))) + +(check-rc "racket.res" "../racket/racket.rc") + +(let ([objs (list + "racket.res" + "xsrc/main.obj" + "xsrc/uniplt.obj" + "../../../lib/msvc/libracket3mxxxxxxx.lib")]) + (link-dll objs + '("libracket3mxxxxxxx.dll") + '("delayimp.lib") + exe "" #t)) + +;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define wx-inc (string-append "/I ../../racket/include " + "/I .. " + "/I ../../racket/gc2 " + "/I ../../wxwindow/include/msw " + "/I ../../wxwindow/include/base " + "/I ../../gracket/wxme " + "/I ../../wxwindow/contrib/wxxpm/libxpm.34b/lib " + "/I ../../wxWindow/contrib/fafa " + "/I ../../wxcommon/jpeg /I ../jpeg /I ../../wxcommon/zlib ")) +(try "wxprecomp.cxx" (list* "../../racket/src/schvers.h" common-deps) + "xsrc/wxprecomp.h" #f wx-inc #f "" "-DGC2_AS_IMPORT" #f #f) + +(define (wx-try base proj x use-precomp? suffix indirect?) + (let ([cxx-file (format "../../~a/~a.~a" base x suffix)]) + (try cxx-file + (list* cxx-file + common-deps) + (format "xsrc/~a.~a" x suffix) + (format "xsrc/~a.obj" x) + wx-inc + (and use-precomp? "xsrc/wxprecomp.h") + "-DGC2_JUST_MACROS /FI../../../racket/gc2/gc2.h" + (string-append "-DGC2_AS_IMPORT" + (if backtrace-gc? + " /D MZ_GC_BACKTRACE" + "")) + "wx.pch" + indirect?))) + +(define wxwin-base-srcs + '("wb_canvs" + "wb_cmdlg" + "wb_data" + "wb_dc" + "wb_dialg" + "wb_frame" + "wb_gdi" + "wb_hash" + "wb_item" + "wb_list" + "wb_main" + "wb_obj" + "wb_panel" + "wb_print" + "wb_ps" + "wb_stdev" + "wb_sysev" + "wb_timer" + "wb_types" + "wb_utils" + "wb_win")) + +(for-each (lambda (x) + (wx-try "wxwindow/src/base" "wxwin" x #t "cxx" #f)) + wxwin-base-srcs) + +(define wxwin-msw-srcs + '("wx_buttn" + "wx_canvs" + "wx_check" + "wx_choic" + "wx_clipb" + "wx_cmdlg" + "wx_dc" + "wx_dialg" + "wx_frame" + "wx_gauge" + "wx_gbox" + "wx_gdi" + "wx_graph_glue" + "wx_item" + "wx_lbox" + "wx_main" + "wx_menu" + "wx_messg" + "wx_panel" + "wx_pdf" + "wx_rbox" + "wx_slidr" + "wx_tabc" + "wx_timer" + "wx_utils" + "wx_win" + "wximgfil")) + +(for-each (lambda (x) + (wx-try "wxwindow/src/msw" "wxwin" x #t "cxx" #f)) + wxwin-msw-srcs) + +(define wxs-srcs + '("wxs_bmap" + "wxs_butn" + "wxs_chce" + "wxs_ckbx" + "wxs_cnvs" + "wxs_dc" + "wxs_evnt" + "wxs_fram" + "wxs_gage" + "wxs_gdi" + "wxs_glob" + "wxs_item" + "wxs_lbox" + "wxs_menu" + "wxs_misc" + "wxs_obj" + "wxs_panl" + "wxs_rado" + "wxs_slid" + "wxs_tabc" + "wxs_win" + "wxscheme")) + +(for-each (lambda (x) + (wx-try "gracket/wxs" "wxs" x #t "cxx" #f)) + wxs-srcs) + +(define gracket-srcs + '("gracket" + "gracketmsw")) + +(for-each (lambda (x) + (wx-try "gracket" "libgracket" x #t "cxx" #f)) + gracket-srcs) + +(wx-try "wxcommon" "wxme" "wxJPEG" #t "cxx" #f) +(wx-try "racket/utils" "wxme" "xcglue" #f "c" #f) +(c-compile "../../wxcommon/wxGC.cxx" + "xsrc/wxGC.obj" + null + (string-append wx-inc " -DMZ_PRECISE_GC -DGC2_AS_IMPORT -Dwx_msw")) + +(let ([objs (append (list + "xsrc/uniplt.obj" + "xsrc/wxGC.obj" + "xsrc/wxJPEG.obj" + "xsrc/xcglue.obj") + (map + (lambda (n) + (format "xsrc/~a.obj" n)) + (append wxwin-base-srcs + wxwin-msw-srcs + wxs-srcs + gracket-srcs)))] + [libs (list + "../../../lib/msvc/libracket3mxxxxxxx.lib" + "../wxutils/Release/wxutils.lib" + "../jpeg/Release/jpeg.lib" + "../png/Release/png.lib" + "../zlib/Release/zlib.lib")] + [win-libs (list + "comctl32.lib" "glu32.lib" "opengl32.lib" + "gdi32.lib" "comdlg32.lib" "advapi32.lib" + "shell32.lib" "ole32.lib" "oleaut32.lib" + "winmm.lib")]) + (link-dll (append objs libs) null win-libs "../../../lib/libgracket3mxxxxxxx.dll" "" #f)) + +(wx-try "gracket" "gracket" "grmain" #f "cxx" #t) + +(check-rc "gracket.res" "../gracket/gracket.rc") + +(let ([objs (list + "gracket.res" + "xsrc/grmain.obj" + "xsrc/uniplt.obj" + "../../../lib/msvc/libracket3mxxxxxxx.lib" + "../../../lib/msvc/libgracket3mxxxxxxx.lib")]) + (link-dll objs + '("libracket3mxxxxxxx.dll" + "libgracket3mxxxxxxx.dll") + '("advapi32.lib" + "delayimp.lib") + "../../../GRacket.exe" " /subsystem:windows" #t)) + +(system- "cl.exe /MT /O2 /DMZ_PRECISE_GC /I../../racket/include /I.. /c ../../racket/dynsrc/mzdyn.c /Fomzdyn3m.obj") +(system- "lib.exe -def:../../racket/dynsrc/mzdyn.def -out:mzdyn3m.lib") + +(define (copy-file/diff src dest) + (unless (and (file-exists? dest) + (string=? (with-input-from-file src (lambda () (read-string (file-size src)))) + (with-input-from-file dest (lambda () (read-string (file-size dest)))))) + (printf "Updating ~a~n" dest) + (when (file-exists? dest) (delete-file dest)) + (copy-file src dest))) + +(copy-file/diff "mzdyn3m.exp" "../../../lib/msvc/mzdyn3m.exp") +(copy-file/diff "mzdyn3m.obj" "../../../lib/msvc/mzdyn3m.obj") + diff --git a/src/worksp/mred/mred.ico b/src/worksp/gracket/gracket.ico similarity index 100% rename from src/worksp/mred/mred.ico rename to src/worksp/gracket/gracket.ico diff --git a/src/worksp/mred/mred.manifest b/src/worksp/gracket/gracket.manifest similarity index 81% rename from src/worksp/mred/mred.manifest rename to src/worksp/gracket/gracket.manifest index 23ac0174e4..ecbc012109 100644 --- a/src/worksp/mred/mred.manifest +++ b/src/worksp/gracket/gracket.manifest @@ -1,22 +1,22 @@ - - - -MrEd - Graphical PLT Scheme. - - - - - - + + + +GRacket - Graphical Racket. + + + + + + diff --git a/src/worksp/mred/mred.rc b/src/worksp/gracket/gracket.rc similarity index 63% rename from src/worksp/mred/mred.rc rename to src/worksp/gracket/gracket.rc index d80aef6846..2e7aeb2802 100644 --- a/src/worksp/mred/mred.rc +++ b/src/worksp/gracket/gracket.rc @@ -1,55 +1,55 @@ -//Microsoft Developer Studio generated resource script. -// -#include "wx.rc" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -WXSTD_FRAME ICON DISCARDABLE "mred.ico" -WXSTD_MDICHILDFRAME ICON DISCARDABLE "mred.ico" -WXSTD_MDIPARENTFRAME ICON DISCARDABLE "mred.ico" -APPLICATION ICON DISCARDABLE "mred.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,2,5,10 - PRODUCTVERSION 4,2,5,10 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "PLT Scheme Inc.\0" - VALUE "FileDescription", "PLT Scheme GUI application\0" - VALUE "InternalName", "MrEd\0" - VALUE "FileVersion", "4, 2, 5, 10\0" - VALUE "LegalCopyright", "Copyright 1995-2010\0" - VALUE "OriginalFilename", "MrEd.exe\0" - VALUE "ProductName", "PLT Scheme\0" - VALUE "ProductVersion", "4, 2, 5, 10\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "mred.manifest" +//Microsoft Developer Studio generated resource script. +// +#include "wx.rc" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +WXSTD_FRAME ICON DISCARDABLE "gracket.ico" +WXSTD_MDICHILDFRAME ICON DISCARDABLE "gracket.ico" +WXSTD_MDIPARENTFRAME ICON DISCARDABLE "gracket.ico" +APPLICATION ICON DISCARDABLE "gracket.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 4,2,5,10 + PRODUCTVERSION 4,2,5,10 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "PLT Scheme Inc.\0" + VALUE "FileDescription", "Racket GUI application\0" + VALUE "InternalName", "GRacket\0" + VALUE "FileVersion", "4, 2, 5, 10\0" + VALUE "LegalCopyright", "Copyright 1995-2010\0" + VALUE "OriginalFilename", "GRacket.exe\0" + VALUE "ProductName", "Racket\0" + VALUE "ProductVersion", "4, 2, 5, 10\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gracket.manifest" diff --git a/src/worksp/mred/mred.sln b/src/worksp/gracket/gracket.sln similarity index 92% rename from src/worksp/mred/mred.sln rename to src/worksp/gracket/gracket.sln index 91b588acd3..00ffad4470 100644 --- a/src/worksp/mred/mred.sln +++ b/src/worksp/gracket/gracket.sln @@ -1,98 +1,98 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MrEd", "mred.vcproj", "{D59A2B28-330B-41F5-8261-F5BC1019E163}" - ProjectSection(ProjectDependencies) = postProject - {81BD2D42-F150-493D-94BA-88585B202789} = {81BD2D42-F150-493D-94BA-88585B202789} - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} = {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmred", "..\libmred\libmred.vcproj", "{81BD2D42-F150-493D-94BA-88585B202789}" - ProjectSection(ProjectDependencies) = postProject - {B9FC613A-B427-4DB5-B1E3-7673D384ECE3} = {B9FC613A-B427-4DB5-B1E3-7673D384ECE3} - {5386B148-05B4-483B-B144-C3E2A6E15C78} = {5386B148-05B4-483B-B144-C3E2A6E15C78} - {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3} = {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3} - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} = {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} - {8CE7DC81-695B-436B-AA96-2D753846AFE5} = {8CE7DC81-695B-436B-AA96-2D753846AFE5} - {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA} = {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA} - {1549C7C5-AF41-43BE-B905-BA6374FE6BEC} = {1549C7C5-AF41-43BE-B905-BA6374FE6BEC} - {31231DD7-4B8F-4E46-A747-81E41AFE04B5} = {31231DD7-4B8F-4E46-A747-81E41AFE04B5} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmzsch", "..\libmzsch\libmzsch.vcproj", "{A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}" - ProjectSection(ProjectDependencies) = postProject - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmzgc", "..\libmzgc\libmzgc.vcproj", "{66548E7B-294E-40EF-B7C0-C8D6D7E6234F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\jpeg\jpeg.vcproj", "{1549C7C5-AF41-43BE-B905-BA6374FE6BEC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\png\png.vcproj", "{85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxme", "..\wxme\wxme.vcproj", "{1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxs", "..\wxs\wxs.vcproj", "{B9FC613A-B427-4DB5-B1E3-7673D384ECE3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxutils", "..\wxutils\wxutils.vcproj", "{31231DD7-4B8F-4E46-A747-81E41AFE04B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxwin", "..\wxwin\wxwin.vcproj", "{5386B148-05B4-483B-B144-C3E2A6E15C78}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\zlib\zlib.vcproj", "{8CE7DC81-695B-436B-AA96-2D753846AFE5}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Release|Win32 = Release|Win32 - Debug|Win32 = Debug|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D59A2B28-330B-41F5-8261-F5BC1019E163}.Debug|Win32.ActiveCfg = Debug|Win32 - {D59A2B28-330B-41F5-8261-F5BC1019E163}.Debug|Win32.Build.0 = Debug|Win32 - {D59A2B28-330B-41F5-8261-F5BC1019E163}.Release|Win32.ActiveCfg = Release|Win32 - {D59A2B28-330B-41F5-8261-F5BC1019E163}.Release|Win32.Build.0 = Release|Win32 - {81BD2D42-F150-493D-94BA-88585B202789}.Debug|Win32.ActiveCfg = Debug|Win32 - {81BD2D42-F150-493D-94BA-88585B202789}.Debug|Win32.Build.0 = Debug|Win32 - {81BD2D42-F150-493D-94BA-88585B202789}.Release|Win32.ActiveCfg = Release|Win32 - {81BD2D42-F150-493D-94BA-88585B202789}.Release|Win32.Build.0 = Release|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.ActiveCfg = Debug|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.Build.0 = Debug|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.ActiveCfg = Release|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.Build.0 = Release|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.ActiveCfg = Debug|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.Build.0 = Debug|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.ActiveCfg = Release|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.Build.0 = Release|Win32 - {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}.Debug|Win32.ActiveCfg = Debug|Win32 - {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}.Debug|Win32.Build.0 = Debug|Win32 - {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}.Release|Win32.ActiveCfg = Release|Win32 - {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}.Release|Win32.Build.0 = Release|Win32 - {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}.Debug|Win32.ActiveCfg = Debug|Win32 - {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}.Debug|Win32.Build.0 = Debug|Win32 - {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}.Release|Win32.ActiveCfg = Release|Win32 - {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}.Release|Win32.Build.0 = Release|Win32 - {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}.Debug|Win32.ActiveCfg = Debug|Win32 - {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}.Debug|Win32.Build.0 = Debug|Win32 - {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}.Release|Win32.ActiveCfg = Release|Win32 - {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}.Release|Win32.Build.0 = Release|Win32 - {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}.Debug|Win32.ActiveCfg = Debug|Win32 - {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}.Debug|Win32.Build.0 = Debug|Win32 - {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}.Release|Win32.ActiveCfg = Release|Win32 - {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}.Release|Win32.Build.0 = Release|Win32 - {31231DD7-4B8F-4E46-A747-81E41AFE04B5}.Debug|Win32.ActiveCfg = Debug|Win32 - {31231DD7-4B8F-4E46-A747-81E41AFE04B5}.Debug|Win32.Build.0 = Debug|Win32 - {31231DD7-4B8F-4E46-A747-81E41AFE04B5}.Release|Win32.ActiveCfg = Release|Win32 - {31231DD7-4B8F-4E46-A747-81E41AFE04B5}.Release|Win32.Build.0 = Release|Win32 - {5386B148-05B4-483B-B144-C3E2A6E15C78}.Debug|Win32.ActiveCfg = Debug|Win32 - {5386B148-05B4-483B-B144-C3E2A6E15C78}.Debug|Win32.Build.0 = Debug|Win32 - {5386B148-05B4-483B-B144-C3E2A6E15C78}.Release|Win32.ActiveCfg = Release|Win32 - {5386B148-05B4-483B-B144-C3E2A6E15C78}.Release|Win32.Build.0 = Release|Win32 - {8CE7DC81-695B-436B-AA96-2D753846AFE5}.Debug|Win32.ActiveCfg = Debug|Win32 - {8CE7DC81-695B-436B-AA96-2D753846AFE5}.Debug|Win32.Build.0 = Debug|Win32 - {8CE7DC81-695B-436B-AA96-2D753846AFE5}.Release|Win32.ActiveCfg = Release|Win32 - {8CE7DC81-695B-436B-AA96-2D753846AFE5}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GRacket", "gracket.vcproj", "{D59A2B28-330B-41F5-8261-F5BC1019E163}" + ProjectSection(ProjectDependencies) = postProject + {81BD2D42-F150-493D-94BA-88585B202789} = {81BD2D42-F150-493D-94BA-88585B202789} + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} = {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgracket", "..\libgracket\libgracket.vcproj", "{81BD2D42-F150-493D-94BA-88585B202789}" + ProjectSection(ProjectDependencies) = postProject + {B9FC613A-B427-4DB5-B1E3-7673D384ECE3} = {B9FC613A-B427-4DB5-B1E3-7673D384ECE3} + {5386B148-05B4-483B-B144-C3E2A6E15C78} = {5386B148-05B4-483B-B144-C3E2A6E15C78} + {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3} = {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3} + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} = {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} + {8CE7DC81-695B-436B-AA96-2D753846AFE5} = {8CE7DC81-695B-436B-AA96-2D753846AFE5} + {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA} = {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA} + {1549C7C5-AF41-43BE-B905-BA6374FE6BEC} = {1549C7C5-AF41-43BE-B905-BA6374FE6BEC} + {31231DD7-4B8F-4E46-A747-81E41AFE04B5} = {31231DD7-4B8F-4E46-A747-81E41AFE04B5} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libracket", "..\libracket\libracket.vcproj", "{A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}" + ProjectSection(ProjectDependencies) = postProject + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmzgc", "..\libmzgc\libmzgc.vcproj", "{66548E7B-294E-40EF-B7C0-C8D6D7E6234F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\jpeg\jpeg.vcproj", "{1549C7C5-AF41-43BE-B905-BA6374FE6BEC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\png\png.vcproj", "{85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxme", "..\wxme\wxme.vcproj", "{1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxs", "..\wxs\wxs.vcproj", "{B9FC613A-B427-4DB5-B1E3-7673D384ECE3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxutils", "..\wxutils\wxutils.vcproj", "{31231DD7-4B8F-4E46-A747-81E41AFE04B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxwin", "..\wxwin\wxwin.vcproj", "{5386B148-05B4-483B-B144-C3E2A6E15C78}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\zlib\zlib.vcproj", "{8CE7DC81-695B-436B-AA96-2D753846AFE5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Release|Win32 = Release|Win32 + Debug|Win32 = Debug|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D59A2B28-330B-41F5-8261-F5BC1019E163}.Debug|Win32.ActiveCfg = Debug|Win32 + {D59A2B28-330B-41F5-8261-F5BC1019E163}.Debug|Win32.Build.0 = Debug|Win32 + {D59A2B28-330B-41F5-8261-F5BC1019E163}.Release|Win32.ActiveCfg = Release|Win32 + {D59A2B28-330B-41F5-8261-F5BC1019E163}.Release|Win32.Build.0 = Release|Win32 + {81BD2D42-F150-493D-94BA-88585B202789}.Debug|Win32.ActiveCfg = Debug|Win32 + {81BD2D42-F150-493D-94BA-88585B202789}.Debug|Win32.Build.0 = Debug|Win32 + {81BD2D42-F150-493D-94BA-88585B202789}.Release|Win32.ActiveCfg = Release|Win32 + {81BD2D42-F150-493D-94BA-88585B202789}.Release|Win32.Build.0 = Release|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.ActiveCfg = Debug|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.Build.0 = Debug|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.ActiveCfg = Release|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.Build.0 = Release|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.ActiveCfg = Debug|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.Build.0 = Debug|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.ActiveCfg = Release|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.Build.0 = Release|Win32 + {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}.Debug|Win32.ActiveCfg = Debug|Win32 + {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}.Debug|Win32.Build.0 = Debug|Win32 + {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}.Release|Win32.ActiveCfg = Release|Win32 + {1549C7C5-AF41-43BE-B905-BA6374FE6BEC}.Release|Win32.Build.0 = Release|Win32 + {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}.Debug|Win32.ActiveCfg = Debug|Win32 + {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}.Debug|Win32.Build.0 = Debug|Win32 + {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}.Release|Win32.ActiveCfg = Release|Win32 + {85CFDF8A-E7A2-4B6D-A0D2-1C75835B6AEA}.Release|Win32.Build.0 = Release|Win32 + {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}.Debug|Win32.Build.0 = Debug|Win32 + {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}.Release|Win32.ActiveCfg = Release|Win32 + {1C9F9C4D-FA97-4A56-8E7F-CA1EC99C35E3}.Release|Win32.Build.0 = Release|Win32 + {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}.Debug|Win32.ActiveCfg = Debug|Win32 + {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}.Debug|Win32.Build.0 = Debug|Win32 + {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}.Release|Win32.ActiveCfg = Release|Win32 + {B9FC613A-B427-4DB5-B1E3-7673D384ECE3}.Release|Win32.Build.0 = Release|Win32 + {31231DD7-4B8F-4E46-A747-81E41AFE04B5}.Debug|Win32.ActiveCfg = Debug|Win32 + {31231DD7-4B8F-4E46-A747-81E41AFE04B5}.Debug|Win32.Build.0 = Debug|Win32 + {31231DD7-4B8F-4E46-A747-81E41AFE04B5}.Release|Win32.ActiveCfg = Release|Win32 + {31231DD7-4B8F-4E46-A747-81E41AFE04B5}.Release|Win32.Build.0 = Release|Win32 + {5386B148-05B4-483B-B144-C3E2A6E15C78}.Debug|Win32.ActiveCfg = Debug|Win32 + {5386B148-05B4-483B-B144-C3E2A6E15C78}.Debug|Win32.Build.0 = Debug|Win32 + {5386B148-05B4-483B-B144-C3E2A6E15C78}.Release|Win32.ActiveCfg = Release|Win32 + {5386B148-05B4-483B-B144-C3E2A6E15C78}.Release|Win32.Build.0 = Release|Win32 + {8CE7DC81-695B-436B-AA96-2D753846AFE5}.Debug|Win32.ActiveCfg = Debug|Win32 + {8CE7DC81-695B-436B-AA96-2D753846AFE5}.Debug|Win32.Build.0 = Debug|Win32 + {8CE7DC81-695B-436B-AA96-2D753846AFE5}.Release|Win32.ActiveCfg = Release|Win32 + {8CE7DC81-695B-436B-AA96-2D753846AFE5}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/worksp/mred/mred.vcproj b/src/worksp/gracket/gracket.vcproj similarity index 86% rename from src/worksp/mred/mred.vcproj rename to src/worksp/gracket/gracket.vcproj index 82489f76bf..3510c2c0ae 100644 --- a/src/worksp/mred/mred.vcproj +++ b/src/worksp/gracket/gracket.vcproj @@ -1,265 +1,265 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/libmred/libmred.vcproj b/src/worksp/libgracket/libgracket.vcproj similarity index 87% rename from src/worksp/libmred/libmred.vcproj rename to src/worksp/libgracket/libgracket.vcproj index cdb4112b82..4bc8145729 100644 --- a/src/worksp/libmred/libmred.vcproj +++ b/src/worksp/libgracket/libgracket.vcproj @@ -1,216 +1,216 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/libmysterx/libmysterx.vcproj b/src/worksp/libmysterx/libmysterx.vcproj index 8c3be87c62..3295150226 100644 --- a/src/worksp/libmysterx/libmysterx.vcproj +++ b/src/worksp/libmysterx/libmysterx.vcproj @@ -1,447 +1,447 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/libmysterx/myspage/myspage.vcproj b/src/worksp/libmysterx/myspage/myspage.vcproj index 3b35193f36..8aafb0dd05 100644 --- a/src/worksp/libmysterx/myspage/myspage.vcproj +++ b/src/worksp/libmysterx/myspage/myspage.vcproj @@ -1,404 +1,404 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/libmysterx/xform.ss b/src/worksp/libmysterx/xform.ss index db6ff612ef..bbe4365024 100644 --- a/src/worksp/libmysterx/xform.ss +++ b/src/worksp/libmysterx/xform.ss @@ -1,4 +1,3 @@ - #lang scheme/base (use-compiled-file-paths null) @@ -8,8 +7,8 @@ (define cpp-flags "/D _CRT_SECURE_NO_DEPRECATE /D WIN32 /D _USE_DECLSPECS_FOR_SAL=0 /D _USE_ATTRIBUTES_FOR_SAL=0") (define includes (string-append - "/I ../../mzscheme/include /I . /I .. /I ../../mysterx" - " /I ../../mzscheme/src" ; for schvers.h + "/I ../../racket/include /I . /I .. /I ../../mysterx" + " /I ../../racket/src" ; for schvers.h " /I myssink /I ../../mysterx/myssink" " /I myspage /I ../../mysterx/myspage")) @@ -28,7 +27,7 @@ [else dep])]) (> t (file-or-directory-modify-seconds dep)))) (append (if precomp? - (list "../../mzscheme/src/schvers.h") + (list "../../racket/src/schvers.h") (if use-precomp (list use-precomp) null)) (list src) (let ([deps (path-replace-suffix dest #".sdep")]) @@ -43,7 +42,7 @@ (list->vector (append (list "-u" - "../../mzscheme/gc2/xform.ss" + "../../racket/gc2/xform.ss" "--setup" "../gc2" "--indirect" diff --git a/src/worksp/libmzgc/libmzgc.vcproj b/src/worksp/libmzgc/libmzgc.vcproj index 3afeb8f6d5..504659dcac 100644 --- a/src/worksp/libmzgc/libmzgc.vcproj +++ b/src/worksp/libmzgc/libmzgc.vcproj @@ -1,279 +1,279 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/libmzsch/libmzsch.vcproj b/src/worksp/libracket/libracket.vcproj similarity index 69% rename from src/worksp/libmzsch/libmzsch.vcproj rename to src/worksp/libracket/libracket.vcproj index e719ac1a71..6fe5af5027 100644 --- a/src/worksp/libmzsch/libmzsch.vcproj +++ b/src/worksp/libracket/libracket.vcproj @@ -1,403 +1,403 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/mrstart/mrstart.vcproj b/src/worksp/mrstart/mrstart.vcproj index 18604f33fb..4283edfd7d 100644 --- a/src/worksp/mrstart/mrstart.vcproj +++ b/src/worksp/mrstart/mrstart.vcproj @@ -1,136 +1,136 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/mzcom/MzCOM.vcproj b/src/worksp/mzcom/MzCOM.vcproj index 7b6f774fc8..9408b8772b 100644 --- a/src/worksp/mzcom/MzCOM.vcproj +++ b/src/worksp/mzcom/MzCOM.vcproj @@ -1,352 +1,352 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/mzcom/mzcom.sln b/src/worksp/mzcom/mzcom.sln index 29eae8fdec..642b0e5754 100644 --- a/src/worksp/mzcom/mzcom.sln +++ b/src/worksp/mzcom/mzcom.sln @@ -1,45 +1,45 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MzCOM", "MzCOM.vcproj", "{36F31050-55C6-41A3-A23E-3008EBFC1273}" - ProjectSection(ProjectDependencies) = postProject - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} = {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmzsch", "..\libmzsch\libmzsch.vcproj", "{A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}" - ProjectSection(ProjectDependencies) = postProject - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmzgc", "..\libmzgc\libmzgc.vcproj", "{66548E7B-294E-40EF-B7C0-C8D6D7E6234F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Release|Win32 = Release|Win32 - Debug|Win32 = Debug|Win32 - 3m|Win32 = 3m|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {36F31050-55C6-41A3-A23E-3008EBFC1273}.3m|Win32.ActiveCfg = 3m|Win32 - {36F31050-55C6-41A3-A23E-3008EBFC1273}.3m|Win32.Build.0 = 3m|Win32 - {36F31050-55C6-41A3-A23E-3008EBFC1273}.Debug|Win32.ActiveCfg = Debug|Win32 - {36F31050-55C6-41A3-A23E-3008EBFC1273}.Debug|Win32.Build.0 = Debug|Win32 - {36F31050-55C6-41A3-A23E-3008EBFC1273}.Release|Win32.ActiveCfg = Release|Win32 - {36F31050-55C6-41A3-A23E-3008EBFC1273}.Release|Win32.Build.0 = Release|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.3m|Win32.ActiveCfg = Release|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.3m|Win32.Build.0 = Release|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.ActiveCfg = Debug|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.Build.0 = Debug|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.ActiveCfg = Release|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.Build.0 = Release|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.3m|Win32.ActiveCfg = Release|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.3m|Win32.Build.0 = Release|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.ActiveCfg = Debug|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.Build.0 = Debug|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.ActiveCfg = Release|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MzCOM", "MzCOM.vcproj", "{36F31050-55C6-41A3-A23E-3008EBFC1273}" + ProjectSection(ProjectDependencies) = postProject + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} = {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libracket", "..\libracket\libracket.vcproj", "{A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}" + ProjectSection(ProjectDependencies) = postProject + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmzgc", "..\libmzgc\libmzgc.vcproj", "{66548E7B-294E-40EF-B7C0-C8D6D7E6234F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Release|Win32 = Release|Win32 + Debug|Win32 = Debug|Win32 + 3m|Win32 = 3m|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {36F31050-55C6-41A3-A23E-3008EBFC1273}.3m|Win32.ActiveCfg = 3m|Win32 + {36F31050-55C6-41A3-A23E-3008EBFC1273}.3m|Win32.Build.0 = 3m|Win32 + {36F31050-55C6-41A3-A23E-3008EBFC1273}.Debug|Win32.ActiveCfg = Debug|Win32 + {36F31050-55C6-41A3-A23E-3008EBFC1273}.Debug|Win32.Build.0 = Debug|Win32 + {36F31050-55C6-41A3-A23E-3008EBFC1273}.Release|Win32.ActiveCfg = Release|Win32 + {36F31050-55C6-41A3-A23E-3008EBFC1273}.Release|Win32.Build.0 = Release|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.3m|Win32.ActiveCfg = Release|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.3m|Win32.Build.0 = Release|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.ActiveCfg = Debug|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.Build.0 = Debug|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.ActiveCfg = Release|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.Build.0 = Release|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.3m|Win32.ActiveCfg = Release|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.3m|Win32.Build.0 = Release|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.ActiveCfg = Debug|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.Build.0 = Debug|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.ActiveCfg = Release|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/worksp/mzcom/xform.ss b/src/worksp/mzcom/xform.ss index 7e3d863994..44bbbaa109 100644 --- a/src/worksp/mzcom/xform.ss +++ b/src/worksp/mzcom/xform.ss @@ -5,7 +5,7 @@ (require mzlib/restart) (define cpp-flags "/D _CRT_SECURE_NO_DEPRECATE /D WIN32 /D _USE_DECLSPECS_FOR_SAL=0 /D _USE_ATTRIBUTES_FOR_SAL=0") -(define includes "/I ../../mzscheme/include /I . /I .. /I ../../mzcom") +(define includes "/I ../../racket/include /I . /I .. /I ../../mzcom") (define (xform src dest) (parameterize ([use-compiled-file-paths (list "compiled")]) @@ -13,7 +13,7 @@ (list->vector (append (list "-u" - "../../mzscheme/gc2/xform.ss" + "../../racket/gc2/xform.ss" "--setup" "../gc2" "--indirect" diff --git a/src/worksp/mzstart/mzstart.mak b/src/worksp/mzstart/mzstart.mak deleted file mode 100644 index 9b5b596f26..0000000000 --- a/src/worksp/mzstart/mzstart.mak +++ /dev/null @@ -1,123 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mzstart.dsp -!IF "$(CFG)" == "" -CFG=MzStart - Win32 Release -!MESSAGE No configuration specified. Defaulting to MzStart - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "MzStart - Win32 Release" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mzstart.mak" CFG="MzStart - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "MzStart - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -OUTDIR=.\..\..\..\collects\launcher -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\..\..\..\collects\launcher -# End Custom Macros - -ALL : "$(OUTDIR)\mzstart.exe" - - -CLEAN : - -@erase "$(INTDIR)\start.obj" - -@erase "$(INTDIR)\start.res" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(OUTDIR)\mzstart.exe" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -"$(INTDIR)" : - if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" - -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mzstart.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\mzstart.pdb" /machine:I386 /out:"$(OUTDIR)\mzstart.exe" -LINK32_OBJS= \ - "$(INTDIR)\start.obj" \ - "$(INTDIR)\start.res" - -"$(OUTDIR)\mzstart.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -CPP_PROJ=/nologo /ML /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "MZSTART" /Fp"$(INTDIR)\mzstart.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\start.res" /d "NDEBUG" /d "MZSTART" - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("mzstart.dep") -!INCLUDE "mzstart.dep" -!ELSE -!MESSAGE Warning: cannot find "mzstart.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "MzStart - Win32 Release" -SOURCE=..\..\mzscheme\dynsrc\start.c - -"$(INTDIR)\start.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\..\starters\start.rc - -"$(INTDIR)\start.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\start.res" /i "..\starters" /d "NDEBUG" /d "MZSTART" $(SOURCE) - - - -!ENDIF - diff --git a/src/worksp/mzstart/mzstart.vcproj b/src/worksp/mzstart/mzstart.vcproj index 4017b94e85..c1e015637f 100644 --- a/src/worksp/mzstart/mzstart.vcproj +++ b/src/worksp/mzstart/mzstart.vcproj @@ -1,130 +1,130 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/mzscheme/mzscheme.ico b/src/worksp/racket/racket.ico similarity index 100% rename from src/worksp/mzscheme/mzscheme.ico rename to src/worksp/racket/racket.ico diff --git a/src/worksp/mzscheme/mzscheme.rc b/src/worksp/racket/racket.rc similarity index 74% rename from src/worksp/mzscheme/mzscheme.rc rename to src/worksp/racket/racket.rc index 06d0dfe35c..5ddbac625c 100644 --- a/src/worksp/mzscheme/mzscheme.rc +++ b/src/worksp/racket/racket.rc @@ -1,62 +1,62 @@ -//Microsoft Developer Studio generated resource script. - -// - -#include "resource.h" - - - -///////////////////////////////////////////////////////////////////////////// - -// - -// Icon - -// - - - -// Icon with lowest ID value placed first to ensure application icon - -// remains consistent on all systems. - -APPLICATION ICON DISCARDABLE "mzscheme.ico" - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,2,5,10 - PRODUCTVERSION 4,2,5,10 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "PLT Scheme Inc.\0" - VALUE "FileDescription", "PLT Scheme application\0" - VALUE "InternalName", "MzScheme\0" - VALUE "FileVersion", "4, 2, 5, 10\0" - VALUE "LegalCopyright", "Copyright 1995-2010\0" - VALUE "OriginalFilename", "mzscheme.exe\0" - VALUE "ProductName", "PLT Scheme\0" - VALUE "ProductVersion", "4, 2, 5, 10\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +//Microsoft Developer Studio generated resource script. + +// + +#include "resource.h" + + + +///////////////////////////////////////////////////////////////////////////// + +// + +// Icon + +// + + + +// Icon with lowest ID value placed first to ensure application icon + +// remains consistent on all systems. + +APPLICATION ICON DISCARDABLE "racket.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 4,2,5,10 + PRODUCTVERSION 4,2,5,10 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "PLT Scheme Inc.\0" + VALUE "FileDescription", "Racket application\0" + VALUE "InternalName", "Racket\0" + VALUE "FileVersion", "4, 2, 5, 10\0" + VALUE "LegalCopyright", "Copyright 1995-2010\0" + VALUE "OriginalFilename", "racket.exe\0" + VALUE "ProductName", "Racket\0" + VALUE "ProductVersion", "4, 2, 5, 10\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/src/worksp/mzscheme/mzscheme.sln b/src/worksp/racket/racket.sln similarity index 86% rename from src/worksp/mzscheme/mzscheme.sln rename to src/worksp/racket/racket.sln index 421bf1b306..aff5826c0f 100644 --- a/src/worksp/mzscheme/mzscheme.sln +++ b/src/worksp/racket/racket.sln @@ -1,38 +1,38 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MzScheme", "mzscheme.vcproj", "{EB7023C8-6D72-4DE4-ADFC-3913C4C70991}" - ProjectSection(ProjectDependencies) = postProject - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} = {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmzsch", "..\libmzsch\libmzsch.vcproj", "{A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}" - ProjectSection(ProjectDependencies) = postProject - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmzgc", "..\libmzgc\libmzgc.vcproj", "{66548E7B-294E-40EF-B7C0-C8D6D7E6234F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Release|Win32 = Release|Win32 - Debug|Win32 = Debug|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EB7023C8-6D72-4DE4-ADFC-3913C4C70991}.Debug|Win32.ActiveCfg = Debug|Win32 - {EB7023C8-6D72-4DE4-ADFC-3913C4C70991}.Debug|Win32.Build.0 = Debug|Win32 - {EB7023C8-6D72-4DE4-ADFC-3913C4C70991}.Release|Win32.ActiveCfg = Release|Win32 - {EB7023C8-6D72-4DE4-ADFC-3913C4C70991}.Release|Win32.Build.0 = Release|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.ActiveCfg = Debug|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.Build.0 = Debug|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.ActiveCfg = Release|Win32 - {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.Build.0 = Release|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.ActiveCfg = Debug|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.Build.0 = Debug|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.ActiveCfg = Release|Win32 - {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Racket", "racket.vcproj", "{EB7023C8-6D72-4DE4-ADFC-3913C4C70991}" + ProjectSection(ProjectDependencies) = postProject + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} = {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90} + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libracket", "..\libracket\libracket.vcproj", "{A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}" + ProjectSection(ProjectDependencies) = postProject + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} = {66548E7B-294E-40EF-B7C0-C8D6D7E6234F} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmzgc", "..\libmzgc\libmzgc.vcproj", "{66548E7B-294E-40EF-B7C0-C8D6D7E6234F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Release|Win32 = Release|Win32 + Debug|Win32 = Debug|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {EB7023C8-6D72-4DE4-ADFC-3913C4C70991}.Debug|Win32.ActiveCfg = Debug|Win32 + {EB7023C8-6D72-4DE4-ADFC-3913C4C70991}.Debug|Win32.Build.0 = Debug|Win32 + {EB7023C8-6D72-4DE4-ADFC-3913C4C70991}.Release|Win32.ActiveCfg = Release|Win32 + {EB7023C8-6D72-4DE4-ADFC-3913C4C70991}.Release|Win32.Build.0 = Release|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.ActiveCfg = Debug|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Debug|Win32.Build.0 = Debug|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.ActiveCfg = Release|Win32 + {A6713577-7DFB-48F8-B8C1-7DB2D7C51F90}.Release|Win32.Build.0 = Release|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.ActiveCfg = Debug|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Debug|Win32.Build.0 = Debug|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.ActiveCfg = Release|Win32 + {66548E7B-294E-40EF-B7C0-C8D6D7E6234F}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/worksp/mzscheme/mzscheme.vcproj b/src/worksp/racket/racket.vcproj similarity index 83% rename from src/worksp/mzscheme/mzscheme.vcproj rename to src/worksp/racket/racket.vcproj index 94f4f147f4..ebbc797fc2 100644 --- a/src/worksp/mzscheme/mzscheme.vcproj +++ b/src/worksp/racket/racket.vcproj @@ -1,232 +1,232 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/mzscheme/resource.h b/src/worksp/racket/resource.h similarity index 91% rename from src/worksp/mzscheme/resource.h rename to src/worksp/racket/resource.h index 9da287ce46..77537c5d84 100644 --- a/src/worksp/mzscheme/resource.h +++ b/src/worksp/racket/resource.h @@ -1,16 +1,16 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by mzscheme.rc -// -#define APPLICATION 101 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by racket.rc +// +#define APPLICATION 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/src/worksp/mzscheme/uniplt.c b/src/worksp/racket/uniplt.c similarity index 95% rename from src/worksp/mzscheme/uniplt.c rename to src/worksp/racket/uniplt.c index 1ad5e8bfc0..6b04d51280 100644 --- a/src/worksp/mzscheme/uniplt.c +++ b/src/worksp/racket/uniplt.c @@ -1,40 +1,40 @@ - -#include - -static int warned; - -HMODULE LoadUnicowsProc(void) -{ - /* We can't use Unicode functions, so we can't - use the library path as returned by scheme_get_dll_path(). - Instead, just search for UnicoWS.dll in the standard - place. */ - HMODULE h; - char *name; - int i; - - h = LoadLibrary("UnicoWS.dll"); - if (h) return h; - - name = (char *)GlobalAlloc(GMEM_FIXED, 1050); - GetModuleFileName(NULL, name, 1024); - name[1023] = 0; - for (i = 0; name[i]; i++) { } - --i; - while (i && (name[i] != '\\')) { - --i; - } - memcpy(name + i, "\\lib\\UnicoWS.dll", 17); - - h = LoadLibrary(name); - if (h) return h; - - if (!warned) { - warned = 1; - MessageBox(NULL, name, "Can't load UnicoWS", MB_OK); - } - - return NULL; -} - -extern FARPROC _PfnLoadUnicows = (FARPROC) &LoadUnicowsProc; + +#include + +static int warned; + +HMODULE LoadUnicowsProc(void) +{ + /* We can't use Unicode functions, so we can't + use the library path as returned by scheme_get_dll_path(). + Instead, just search for UnicoWS.dll in the standard + place. */ + HMODULE h; + char *name; + int i; + + h = LoadLibrary("UnicoWS.dll"); + if (h) return h; + + name = (char *)GlobalAlloc(GMEM_FIXED, 1050); + GetModuleFileName(NULL, name, 1024); + name[1023] = 0; + for (i = 0; name[i]; i++) { } + --i; + while (i && (name[i] != '\\')) { + --i; + } + memcpy(name + i, "\\lib\\UnicoWS.dll", 17); + + h = LoadLibrary(name); + if (h) return h; + + if (!warned) { + warned = 1; + MessageBox(NULL, name, "Can't load UnicoWS", MB_OK); + } + + return NULL; +} + +extern FARPROC _PfnLoadUnicows = (FARPROC) &LoadUnicowsProc; diff --git a/src/worksp/starters/start.rc b/src/worksp/starters/start.rc index 0b21cf44ef..e6b4bf810e 100644 --- a/src/worksp/starters/start.rc +++ b/src/worksp/starters/start.rc @@ -1,70 +1,70 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -#ifdef MRSTART -APPLICATION ICON DISCARDABLE "mrstart.ico" -#endif -#ifdef MZSTART -APPLICATION ICON DISCARDABLE "mzstart.ico" -#endif - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,2,5,10 - PRODUCTVERSION 4,2,5,10 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "PLT Scheme Inc.\0" -#ifdef MRSTART - VALUE "FileDescription", "PLT Scheme GUI Launcher\0" -#endif -#ifdef MZSTART - VALUE "FileDescription", "PLT Scheme Launcher\0" -#endif - VALUE "FileVersion", "4, 2, 5, 10\0" -#ifdef MRSTART - VALUE "InternalName", "mrstart\0" -#endif -#ifdef MZSTART - VALUE "InternalName", "mzstart\0" -#endif - VALUE "LegalCopyright", "Copyright 1996-2010\0" -#ifdef MRSTART - VALUE "OriginalFilename", "MrStart.exe\0" -#endif -#ifdef MZSTART - VALUE "OriginalFilename", "MzStart.exe\0" -#endif - VALUE "ProductName", "PLT Scheme\0" - VALUE "ProductVersion", "4, 2, 5, 10\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +#ifdef MRSTART +APPLICATION ICON DISCARDABLE "mrstart.ico" +#endif +#ifdef MZSTART +APPLICATION ICON DISCARDABLE "mzstart.ico" +#endif + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 4,2,5,10 + PRODUCTVERSION 4,2,5,10 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "PLT Scheme Inc.\0" +#ifdef MRSTART + VALUE "FileDescription", "Racket GUI Launcher\0" +#endif +#ifdef MZSTART + VALUE "FileDescription", "Racket Launcher\0" +#endif + VALUE "FileVersion", "4, 2, 5, 10\0" +#ifdef MRSTART + VALUE "InternalName", "mrstart\0" +#endif +#ifdef MZSTART + VALUE "InternalName", "mzstart\0" +#endif + VALUE "LegalCopyright", "Copyright 1996-2010\0" +#ifdef MRSTART + VALUE "OriginalFilename", "MrStart.exe\0" +#endif +#ifdef MZSTART + VALUE "OriginalFilename", "MzStart.exe\0" +#endif + VALUE "ProductName", "Racket\0" + VALUE "ProductVersion", "4, 2, 5, 10\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/src/worksp/wxme/wxme.vcproj b/src/worksp/wxme/wxme.vcproj index 1472bf8088..643c48ce44 100644 --- a/src/worksp/wxme/wxme.vcproj +++ b/src/worksp/wxme/wxme.vcproj @@ -1,185 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/wxs/wxs.vcproj b/src/worksp/wxs/wxs.vcproj index 892f9488c4..8684119592 100644 --- a/src/worksp/wxs/wxs.vcproj +++ b/src/worksp/wxs/wxs.vcproj @@ -1,350 +1,350 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/wxutils/wxutils.vcproj b/src/worksp/wxutils/wxutils.vcproj index f4e314a050..4992eca2db 100644 --- a/src/worksp/wxutils/wxutils.vcproj +++ b/src/worksp/wxutils/wxutils.vcproj @@ -1,312 +1,312 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/worksp/wxwin/wxwin.vcproj b/src/worksp/wxwin/wxwin.vcproj index 5f8b81d74c..883d1d8a4f 100644 --- a/src/worksp/wxwin/wxwin.vcproj +++ b/src/worksp/wxwin/wxwin.vcproj @@ -1,378 +1,378 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wxcommon/PSDC.cxx b/src/wxcommon/PSDC.cxx index 3fdb0790e8..2cba352c50 100644 --- a/src/wxcommon/PSDC.cxx +++ b/src/wxcommon/PSDC.cxx @@ -65,7 +65,7 @@ #endif #include "wx_rgn.h" -#include "../mzscheme/include/scheme.h" +#include "../racket/include/scheme.h" extern void *wxPostScriptDrawText(Scheme_Object *f, const char *fontname, const char *text, int dt, Bool combine, int use16, diff --git a/src/wxmac/src/Makefile.in b/src/wxmac/src/Makefile.in index 23617eb21e..8fd0bf2cfc 100644 --- a/src/wxmac/src/Makefile.in +++ b/src/wxmac/src/Makefile.in @@ -26,8 +26,8 @@ WXVARIANT = @WXVARIANT@ WXINC_wx_xt = -I$(PLTSRCDIR)/wxxt/src/AIAI-include -I$(PLTSRCDIR)/wxxt/src WXINC_wx_mac = -I$(PLTSRCDIR)/wxmac/include/base -I$(PLTSRCDIR)/wxmac/include/mac -I$(PLTSRCDIR)/wxcommon WXINC = $(WXINC_@WXVARIANT@) -NOGCINC = $(WXINC) -I$(PLTSRCDIR)/mred/wxme/ -I$(PLTBUILDDIR)/mzscheme/ -I$(PLTSRCDIR)/mzscheme/include/ -INC = -I$(PLTSRCDIR)/mzscheme/$(GCDIRECTORY) $(NOGCINC) +NOGCINC = $(WXINC) -I$(PLTSRCDIR)/gracket/wxme/ -I$(PLTBUILDDIR)/racket/ -I$(PLTSRCDIR)/racket/include/ +INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC) CXXFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @PREFLAGS@ CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@ LDFLAGS = $(XLIB) diff --git a/src/wxwindow/src/msw/wx_dc.cxx b/src/wxwindow/src/msw/wx_dc.cxx index 13997f5600..e70793adc7 100644 --- a/src/wxwindow/src/msw/wx_dc.cxx +++ b/src/wxwindow/src/msw/wx_dc.cxx @@ -15,7 +15,7 @@ #include "../../../wxcommon/Region.h" #include "wx_pdf.h" #include "wx_graphics.h" -#include "../../../mzscheme/include/scheme.h" +#include "../../../racket/include/scheme.h" #include "../../../wxcommon/wxGLConfig.h" diff --git a/src/wxwindow/src/msw/wx_gdi.cxx b/src/wxwindow/src/msw/wx_gdi.cxx index c9d0a9cb80..011043ae27 100644 --- a/src/wxwindow/src/msw/wx_gdi.cxx +++ b/src/wxwindow/src/msw/wx_gdi.cxx @@ -22,7 +22,7 @@ #include "wximgfil.h" #include "wximgxbm.h" -#include "../../../mzscheme/include/scheme.h" +#include "../../../racket/include/scheme.h" // Resource counting #if 0 diff --git a/src/wxxt/contrib/xpm/lib/Makefile.in b/src/wxxt/contrib/xpm/lib/Makefile.in index b71402f328..a08a40dcdc 100644 --- a/src/wxxt/contrib/xpm/lib/Makefile.in +++ b/src/wxxt/contrib/xpm/lib/Makefile.in @@ -46,8 +46,8 @@ GCDIRECTORY = @GCDIR@ WBUILD = @WBUILD@ WXINC = $(PLTSRCDIR)/wxxt/src/AIAI-include -I$(PLTSRCDIR)/wxxt/src -NOGCINC = -I$(WXINC) -I$(PLTSRCDIR)/mred/wxme/ -I$(PLTSRCDIR)/mzscheme/include/ -INC = -I$(PLTSRCDIR)/mzscheme/$(GCDIRECTORY) $(NOGCINC) +NOGCINC = -I$(WXINC) -I$(PLTSRCDIR)/gracket/wxme/ -I$(PLTSRCDIR)/racket/include/ +INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC) CXXFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) -Dwx_xt @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @PREFLAGS@ CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) -Dwx_xt @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@ LDFLAGS = $(XLIB) @@ -56,7 +56,7 @@ LDFLAGS = $(XLIB) XPMCC = $(CC) # Extra -I to get mzconfig.h: -XPM_CC = $(XPMCC) $(CFLAGS) -I../../../../mzscheme -c +XPM_CC = $(XPMCC) $(CFLAGS) -I../../../../racket -c OBJS= data.@LTO@ create.@LTO@ misc.@LTO@ rgb.@LTO@ \ scan.@LTO@ parse.@LTO@ hashtab.@LTO@ \ diff --git a/src/wxxt/src/Makefile.in b/src/wxxt/src/Makefile.in index c6bd473711..f568819510 100644 --- a/src/wxxt/src/Makefile.in +++ b/src/wxxt/src/Makefile.in @@ -23,8 +23,8 @@ GCDIRECTORY = @GCDIR@ WBUILD = @WBUILD@ WXINC = $(PLTSRCDIR)/wxxt/src/AIAI-include -I$(PLTSRCDIR)/wxxt/src -NOGCINC = -I$(WXINC) -I$(PLTSRCDIR)/mred/wxme/ -I$(PLTBUILDDIR)/mzscheme/ -I$(PLTSRCDIR)/mzscheme/include/ -INC = -I$(PLTSRCDIR)/mzscheme/$(GCDIRECTORY) $(NOGCINC) +NOGCINC = -I$(WXINC) -I$(PLTSRCDIR)/gracket/wxme/ -I$(PLTBUILDDIR)/racket/ -I$(PLTSRCDIR)/racket/include/ +INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC) CXXFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -Dwx_xt @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @PREFLAGS@ CFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -Dwx_xt @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@ LDFLAGS = $(XLIB) diff --git a/src/wxxt/utils/image/src/Makefile.in b/src/wxxt/utils/image/src/Makefile.in index 5c5453f7d2..9be630f3b4 100644 --- a/src/wxxt/utils/image/src/Makefile.in +++ b/src/wxxt/utils/image/src/Makefile.in @@ -23,8 +23,8 @@ GCDIRECTORY = @GCDIR@ WBUILD = @WBUILD@ WXINC = $(PLTSRCDIR)/wxxt/src/AIAI-include -I$(PLTSRCDIR)/wxxt/src -NOGCINC = -I$(WXINC) -I$(PLTSRCDIR)/mred/wxme/ -I$(PLTSRCDIR)/mzscheme/include/ -INC = -I$(PLTSRCDIR)/mzscheme/$(GCDIRECTORY) $(NOGCINC) +NOGCINC = -I$(WXINC) -I$(PLTSRCDIR)/gracket/wxme/ -I$(PLTSRCDIR)/racket/include/ +INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC) CXXFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) -Dwx_xt @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @PREFLAGS@ CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) -Dwx_xt @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@ LDFLAGS = $(XLIB)