From 0f0a59732e9a446aa42c9ab3b43c473ea57e6763 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 15 Apr 2010 21:15:57 -0400 Subject: [PATCH] create core binaries as 'racket' and 'gracket' --- collects/compiler/embed-unit.ss | 24 +- collects/compiler/private/macfw.ss | 4 +- collects/drscheme/info.ss | 4 + collects/launcher/launcher-sig.ss | 21 +- collects/launcher/launcher-unit.ss | 92 +- collects/meta/checker.ss | 18 +- collects/meta/dist-specs.ss | 14 +- collects/mred/installer.ss | 38 +- collects/mred/private/repl.ss | 6 +- collects/mzlib/restart.ss | 2 +- collects/mzscheme/info.ss | 2 + collects/mzscheme/installer.ss | 16 + collects/racket/gui/info.ss | 3 + collects/racket/gui/init.ss | 6 + collects/racket/gui/installer.ss | 27 + collects/rico/info.ss | 4 +- collects/scribblings/mzc/exe-api.scrbl | 8 + collects/setup/setup-unit.ss | 18 +- collects/setup/variant.ss | 6 +- src/Makefile.in | 38 +- src/configure | 97 +- src/mac/osx_appl.ss | 20 +- src/mred/Makefile.in | 130 +- src/mred/gc2/Makefile.in | 88 +- src/mred/mred.h | 2 +- src/mred/mrmain.cxx | 22 +- src/mzscheme/Makefile.in | 98 +- src/mzscheme/cmdline.inc | 14 +- src/mzscheme/configure.ac | 64 +- src/mzscheme/dynsrc/ustart.c | 4 +- src/mzscheme/gc/libatomic_ops/configure | 4833 +++++++++++++---------- src/mzscheme/gc2/Makefile.in | 40 +- src/mzscheme/include/racket.exp | 591 +++ src/mzscheme/include/racket3m.exp | 598 +++ src/mzscheme/main.c | 20 +- src/mzscheme/src/Makefile.in | 14 +- src/mzscheme/src/string.c | 2 +- src/worksp/build.bat | 8 +- src/worksp/gc2/make.ss | 22 +- src/worksp/libmred/libmred.vcproj | 8 +- src/worksp/libmzsch/libmzsch.vcproj | 8 +- src/worksp/mred/mred.vcproj | 12 +- src/worksp/mzscheme/mzscheme.vcproj | 12 +- 43 files changed, 4517 insertions(+), 2541 deletions(-) create mode 100644 collects/mzscheme/installer.ss create mode 100644 collects/racket/gui/info.ss create mode 100644 collects/racket/gui/init.ss create mode 100644 collects/racket/gui/installer.ss create mode 100644 src/mzscheme/include/racket.exp create mode 100644 src/mzscheme/include/racket3m.exp diff --git a/collects/compiler/embed-unit.ss b/collects/compiler/embed-unit.ss index 13773ce4d5..43265b20ab 100644 --- a/collects/compiler/embed-unit.ss +++ b/collects/compiler/embed-unit.ss @@ -71,7 +71,7 @@ (lambda () (error 'create-embedding-executable "can't find ~a executable for variant ~a" - (if mred? "MrEd" "MzScheme") + (if mred? "GRacket" "Racket") variant))]) (let ([exe (build-path base @@ -80,22 +80,22 @@ (cond [(not mred?) ;; Need MzScheme: - (string-append "mzscheme" (variant-suffix variant #f))] + (string-append "racket" (variant-suffix variant #f))] [mred? ;; Need MrEd: (let ([sfx (variant-suffix variant #t)]) - (build-path (format "MrEd~a.app" sfx) + (build-path (format "GRacket~a.app" sfx) "Contents" "MacOS" - (format "MrEd~a" sfx)))])] + (format "GRacket~a" sfx)))])] [(windows) (format "~a~a.exe" (if mred? - "MrEd" - "MzScheme") + "Gracket" + "Racket") (variant-suffix variant #t))] [(unix) (format "~a~a" (if mred? - "mred" - "mzscheme") + "gracket" + "racket") (variant-suffix variant #f))]))]) (unless (or (file-exists? exe) (directory-exists? exe)) @@ -989,7 +989,8 @@ ;; Use `write-module-bundle', but figure out how to put it into an executable (define (create-embedding-executable dest - #:mred? [mred? #f] + #:mred? [really-mred? #f] + #:gracket? [gracket? #f] #:verbose? [verbose? #f] #:modules [modules null] #:configure-via-first-module? [config? #f] @@ -1012,6 +1013,7 @@ (compile expr)))] #:src-filter [src-filter (lambda (filename) #f)] #:get-extra-imports [get-extra-imports (lambda (filename code) null)]) + (define mred? (or really-mred? gracket?)) (define keep-exe? (and launcher? (let ([m (assq 'forget-exe? aux)]) (or (not m) @@ -1088,8 +1090,8 @@ (when (regexp-match #rx"^@executable_path" (get-current-framework-path dest (if mred? - "PLT_MrEd" - "PLT_MzScheme"))) + "GRacket" + "Racket"))) (update-framework-path (string-append (path->string (find-lib-dir)) "/") diff --git a/collects/compiler/private/macfw.ss b/collects/compiler/private/macfw.ss index b2b9be57a6..08872c901e 100644 --- a/collects/compiler/private/macfw.ss +++ b/collects/compiler/private/macfw.ss @@ -37,8 +37,8 @@ #"$")) (string->bytes/utf-8 new-path)))) (if mred? - '("PLT_MrEd") - '("PLT_MzScheme"))))) + '("GRacket") + '("Racket"))))) (define (get-current-framework-path dest p) (let ([v (get/set-dylib-path dest diff --git a/collects/drscheme/info.ss b/collects/drscheme/info.ss index 4ece34f38a..3adc47bcfb 100644 --- a/collects/drscheme/info.ss +++ b/collects/drscheme/info.ss @@ -2,5 +2,9 @@ (define tools '("syncheck.ss" #;"sprof.ss")) (define tool-names '("Check Syntax" #;"Sampling Profiler")) + +(define gracket-launcher-names '("DrRacket")) +(define gracket-launcher-libraries '("drscheme.ss")) + (define mred-launcher-names '("DrScheme")) (define mred-launcher-libraries '("drscheme.ss")) diff --git a/collects/launcher/launcher-sig.ss b/collects/launcher/launcher-sig.ss index 1b5d41289b..25ba8c2bad 100644 --- a/collects/launcher/launcher-sig.ss +++ b/collects/launcher/launcher-sig.ss @@ -1,30 +1,47 @@ - #lang scheme/signature +make-gracket-launcher +make-racket-launcher make-mred-launcher make-mzscheme-launcher +make-gracket-program-launcher +make-racket-program-launcher make-mred-program-launcher make-mzscheme-program-launcher +gracket-program-launcher-path +racket-program-launcher-path mred-program-launcher-path mzscheme-program-launcher-path +install-gracket-program-launcher +install-racket-program-launcher install-mred-program-launcher install-mzscheme-program-launcher +gracket-launcher-up-to-date? +racket-launcher-up-to-date? mred-launcher-up-to-date? mzscheme-launcher-up-to-date? +gracket-launcher-is-directory? +racket-launcher-is-directory? mred-launcher-is-directory? mzscheme-launcher-is-directory? +gracket-launcher-is-actually-directory? +racket-launcher-is-actually-directory? mred-launcher-is-actually-directory? mzscheme-launcher-is-actually-directory? +gracket-launcher-add-suffix +racket-launcher-add-suffix mred-launcher-add-suffix mzscheme-launcher-add-suffix +gracket-launcher-put-file-extension+style+filters +racket-launcher-put-file-extension+style+filters mred-launcher-put-file-extension+style+filters mzscheme-launcher-put-file-extension+style+filters @@ -32,3 +49,5 @@ build-aux-from-path current-launcher-variant available-mred-variants available-mzscheme-variants +available-gracket-variants +available-racket-variants diff --git a/collects/launcher/launcher-unit.ss b/collects/launcher/launcher-unit.ss index cdcd271db4..03049f549c 100644 --- a/collects/launcher/launcher-unit.ss +++ b/collects/launcher/launcher-unit.ss @@ -26,7 +26,7 @@ v)) v))) -(define (variant-available? kind cased-kind-name variant) +(define (variant-available? kind cased-kind-name variant) (cond [(or (eq? 'unix (system-type)) (and (eq? 'macosx (system-type)) @@ -35,7 +35,11 @@ (and bin-dir (file-exists? (build-path bin-dir - (format "~a~a" kind (variant-suffix variant #f))))))] + (format "~a~a" + (case kind + [(mzscheme) 'racket] + [(mred) 'gracket]) + (variant-suffix variant #f))))))] [(eq? 'macosx (system-type)) ;; kind must be mred, because mzscheme case is caught above (directory-exists? (build-path (find-gui-bin-dir) @@ -51,8 +55,8 @@ (define (available-variants kind) (let* ([cased-kind-name (if (eq? kind 'mzscheme) - "MzScheme" - "MrEd")] + "Racket" + "GRacket")] [normal-kind (system-type 'gc)] [alt-kind (if (eq? '3m normal-kind) 'cgc @@ -78,9 +82,13 @@ null)]) (append normal alt script script-alt))) +(define (available-gracket-variants) + (available-variants 'mred)) (define (available-mred-variants) (available-variants 'mred)) +(define (available-racket-variants) + (available-variants 'mzscheme)) (define (available-mzscheme-variants) (available-variants 'mzscheme)) @@ -323,7 +331,9 @@ (make-absolute-path-header bindir)))] [exec (format "exec \"${bindir}/~a~a\" ~a" - (or alt-exe kind) + (or alt-exe (case kind + [(mred) "gracket"] + [(mzscheme) "racket"])) (if alt-exe "" (variant-suffix variant #f)) pre-str)] [args (format @@ -434,12 +444,12 @@ ;; OS X launcher code: - ; make-macosx-launcher : symbol (listof str) pathname -> +;; make-macosx-launcher : symbol (listof str) pathname -> (define (make-macosx-launcher kind variant flags dest aux) (if (or (eq? kind 'mzscheme) (script-variant? variant)) - ;; MzScheme or script launcher is the same as for Unix + ;; Racket or script launcher is the same as for Unix (make-unix-launcher kind variant flags dest aux) - ;; MrEd "launcher" is a stand-alone executable + ;; Gracket "launcher" is a stand-alone executable (make-embedding-executable dest (eq? kind 'mred) #f null null null flags @@ -474,11 +484,15 @@ [(macos) make-macos-launcher] [(macosx) make-macosx-launcher])) -(define (make-mred-launcher flags dest [aux null]) +(define (make-gracket-launcher flags dest [aux null]) ((get-maker) 'mred (current-launcher-variant) flags dest aux)) +(define (make-mred-launcher flags dest [aux null]) + ((get-maker) 'mred (current-launcher-variant) (list* "-I" "scheme/gui/init" flags) dest aux)) -(define (make-mzscheme-launcher flags dest [aux null]) +(define (make-racket-launcher flags dest [aux null]) ((get-maker) 'mzscheme (current-launcher-variant) flags dest aux)) +(define (make-mzscheme-launcher flags dest [aux null]) + ((get-maker) 'mzscheme (current-launcher-variant) (list* "-I" "scheme/init" flags) dest aux)) (define (strip-suffix s) (path-replace-suffix s #"")) @@ -530,19 +544,23 @@ (let ([d (read)]) (list (cons 'uti-exports d))))))))))) -(define (make-mred-program-launcher file collection dest) +(define (make-gracket-program-launcher file collection dest) (make-mred-launcher (list "-l-" (string-append collection "/" file)) dest (build-aux-from-path (build-path (collection-path collection) (strip-suffix file))))) +(define (make-mred-program-launcher file collection dest) + (make-gracket-program-launcher file collection dest)) -(define (make-mzscheme-program-launcher file collection dest) +(define (make-racket-program-launcher file collection dest) (make-mzscheme-launcher (list "-l-" (string-append collection "/" file)) dest (build-aux-from-path (build-path (collection-path collection) (strip-suffix file))))) +(define (make-mzscheme-program-launcher file collection dest) + (make-racket-program-launcher file collection dest)) (define (unix-sfx file mred?) (string-downcase (regexp-replace* #px"\\s" file "-"))) @@ -571,25 +589,37 @@ (path-replace-suffix p #".app") p)))) -(define (mred-program-launcher-path name) +(define (gracket-program-launcher-path name) (program-launcher-path name #t)) +(define (mred-program-launcher-path name) + (gracket-program-launcher-path name)) -(define (mzscheme-program-launcher-path name) +(define (racket-program-launcher-path name) (case (system-type) [(macosx) (add-file-suffix (build-path (find-console-bin-dir) (unix-sfx name #f)) (current-launcher-variant) #f)] [else (program-launcher-path name #f)])) +(define (mzscheme-program-launcher-path name) + (racket-program-launcher-path name)) +(define (gracket-launcher-is-directory?) + #f) +(define (racket-launcher-is-directory?) + #f) (define (mred-launcher-is-directory?) #f) (define (mzscheme-launcher-is-directory?) #f) -(define (mred-launcher-is-actually-directory?) +(define (gracket-launcher-is-actually-directory?) (and (eq? 'macosx (system-type)) (not (script-variant? (current-launcher-variant))))) +(define (mred-launcher-is-actually-directory?) + (gracket-launcher-is-actually-directory?)) +(define (racket-launcher-is-actually-directory?) + #f) (define (mzscheme-launcher-is-actually-directory?) #f) @@ -600,27 +630,39 @@ [(macosx) (values "app" '(packages) '(("App" "*.app")))] [else (values #f null null)])) -(define (mred-launcher-add-suffix path) +(define (gracket-launcher-add-suffix path) (embedding-executable-add-suffix path #t)) +(define (mred-launcher-add-suffix path) + (gracket-launcher-add-suffix path)) -(define (mzscheme-launcher-add-suffix path) +(define (racket-launcher-add-suffix path) (embedding-executable-add-suffix path #f)) +(define (mzscheme-launcher-add-suffix path) + (racket-launcher-add-suffix path)) -(define (mred-launcher-put-file-extension+style+filters) +(define (gracket-launcher-put-file-extension+style+filters) (put-file-extension+style+filters (if (and (eq? 'macosx (system-type)) (script-variant? (current-launcher-variant))) 'unix (system-type)))) +(define (mred-launcher-put-file-extension+style+filters) + (gracket-launcher-put-file-extension+style+filters)) -(define (mzscheme-launcher-put-file-extension+style+filters) +(define (racket-launcher-put-file-extension+style+filters) (put-file-extension+style+filters (if (eq? 'macosx (system-type)) 'unix (system-type)))) +(define (mzscheme-launcher-put-file-extension+style+filters) + (racket-launcher-put-file-extension+style+filters)) +(define (gracket-launcher-up-to-date? dest [aux null]) + (racket-launcher-up-to-date? dest aux)) (define (mred-launcher-up-to-date? dest [aux null]) - (mzscheme-launcher-up-to-date? dest aux)) - + (racket-launcher-up-to-date? dest aux)) (define (mzscheme-launcher-up-to-date? dest [aux null]) + (racket-launcher-up-to-date? dest aux)) + +(define (racket-launcher-up-to-date? dest [aux null]) (cond ;; When running Setup PLT under Windows, the ;; launcher process stays running until MzScheme @@ -636,6 +678,14 @@ ;; launchers. [else #f])) +(define (install-gracket-program-launcher file collection name) + (make-gracket-program-launcher file collection + (gracket-program-launcher-path name))) + +(define (install-racket-program-launcher file collection name) + (make-racket-program-launcher file collection + (racket-program-launcher-path name))) + (define (install-mred-program-launcher file collection name) (make-mred-program-launcher file collection (mred-program-launcher-path name))) diff --git a/collects/meta/checker.ss b/collects/meta/checker.ss index e9e61f9f4d..0e089b6753 100644 --- a/collects/meta/checker.ss +++ b/collects/meta/checker.ss @@ -479,10 +479,18 @@ (define (set-bin-files-delayed-lists! p) (set! bin-files-lists p)) +(define (add-alts l) + (if (null? l) + null + (let ([v (regexp-replace #rx"[.]ss$" (car l) ".rkt")]) + (if (equal? v (car l)) + (cons (car l) (add-alts (cdr l))) + (list* (car l) v (add-alts (cdr l))))))) + (define (check-dependencies spec distname) (add-dependency-contents!) (dprintf "Verifying dependencies for ~s..." distname) - (let* ([all-files (sort* (tree-flatten (tree-filter spec *plt-tree*)))] + (let* ([all-files (sort* (add-alts (tree-flatten (tree-filter spec *plt-tree*))))] [deps0 (or (tree-filter `(and ,spec "*.dep") *plt-tree*) (error 'check-dependencies "got no .dep files for ~s" distname))] @@ -507,8 +515,12 @@ ;; trees). No need to optimize since this happens very ;; infrequently. (let ([dep (regexp-replace #rx"/([^/]+)\\.([^/]+)$" (car deps) - "/compiled/\\1_\\2.zo")]) - (if (andmap (lambda (files) (member dep files)) + "/compiled/\\1_\\2.zo")] + [alt-dep (and (regexp-match #rx"[.]rkt$" (car deps)) + (regexp-replace #rx"/([^/]+)\\.([^/]+)$" (car deps) + "/compiled/\\1_ss.zo"))]) + (if (andmap (lambda (files) (or (member dep files) + (member alt-dep files))) (force bin-files-lists)) (loop files (cdr deps) (car deps)) (error 'dependencies "unsatisfied dependency for ~s: ~s ~s" diff --git a/collects/meta/dist-specs.ss b/collects/meta/dist-specs.ss index 1655aa97e6..8eba91b2f9 100644 --- a/collects/meta/dist-specs.ss +++ b/collects/meta/dist-specs.ss @@ -204,7 +204,7 @@ binary-keep/throw-templates := (cond win => "/plt/*.exe" "/plt/lib/**/lib*???????.{dll|lib|exp}" mac => "/plt/*.app/" - "/plt/lib/PLT_*.framework/Versions/*<_!>/") + "/plt/lib/*Racket*.framework/Versions/*<_!>/") "/plt/collects/**/compiled/**/*.*" binary-keep := "3[mM]" @@ -332,7 +332,7 @@ mz-base := "/plt/readme.txt" ; generated (cond (not src) => (collects: "info-domain/")) ; filtered (package: "config") ;; basic code - (collects: "scheme" "s-exp" "reader") + (collects: "scheme" "s-exp" "reader" "racket") ;; include the time-stamp collection when not a public release (cond (not release) => (- (collects: "repos-time-stamp/") @@ -391,14 +391,14 @@ foreign-src := (src: "foreign/{Makefile.in|README}" ;; queries have no point elsewhere.) mz-bins := (lib: "buildinfo" "**/mzdyn{|w}{|3[mM]|cgc|CGC}.{o|obj|exp|def}") - (cond mac => (lib: "PLT_MzScheme*/") - win => (dll: "libmz{gc|sch}" "UnicoWS" "iconv") + (cond mac => (lib: "Racket*/") + win => (dll: "lib{mzgc|racket}" "UnicoWS" "iconv") (lib: "gcc/{fixup|init}.o" "bcc/mzdynb.{obj|def}") unix => (lib: "starter")) extra-dynlibs -mr-bins := (cond mac => (lib: "PLT_MrEd*/") - win => (dll: "libmred")) +mr-bins := (cond mac => (lib: "GRacket*/") + win => (dll: "libgracket")) extra-dynlibs := (cond win => (dll: "{ssl|lib}eay32")) @@ -411,10 +411,12 @@ binaries := (+ "/plt/bin/" "/plt/include/" "/plt/collects/**/compiled/native/" (cond unix => "/plt/bin/{mzscheme|mred}*" + "/plt/bin/{|g}racket*" win => "/plt/*.exe" "/plt/*.dll" "/plt/collects/launcher/*.exe" mac => "/plt/bin/mzscheme*" + "/plt/bin/racket*" "/plt/*.app" "/plt/collects/launcher/*.app") platform-dependent) diff --git a/collects/mred/installer.ss b/collects/mred/installer.ss index e6f117714a..39ed5e21d1 100644 --- a/collects/mred/installer.ss +++ b/collects/mred/installer.ss @@ -1,27 +1,51 @@ #lang scheme/base -(require launcher) +(require launcher compiler/embed) (provide post-installer) (define (post-installer path) (define variants (available-mred-variants)) + (for ([v variants] #:when (memq v '(3m cgc))) + (parameterize ([current-launcher-variant v]) + (create-embedding-executable + (mred-program-launcher-path "MrEd") + #:cmdline '("-I" "scheme/gui/init") + #:variant v + #:launcher? #t + #:gracket? #t + #:aux '((framework-root . #f) + (dll-dir . #f) + (relative? . #t))))) ;; add a mred-text executable that uses the -z flag (preferring a script) (for ([vs '((script-3m 3m) (script-cgc cgc))]) (let ([v (findf (lambda (v) (memq v variants)) vs)]) (when v (parameterize ([current-launcher-variant v]) - (make-mred-launcher + (make-gracket-launcher '("-z") + (mred-program-launcher-path "gracket-text") + '([relative? . #t] [subsystem . console] [single-instance? . #f] + ;; the following two are required to avoid using a full path, + ;; should be removed when `relative?' will imply this + [framework-root . #f] [dll-dir . #f])) + (make-gracket-launcher + '("-I" "scheme/gui/init" "-z") (mred-program-launcher-path "mred-text") '([relative? . #t] [subsystem . console] [single-instance? . #f] ;; the following two are required to avoid using a full path, ;; should be removed when `relative?' will imply this [framework-root . #f] [dll-dir . #f])))))) - ;; add a bin/mred script under OS X + ;; add bin/gracket and bin/mred script under OS X (when (eq? 'macosx (system-type)) (for ([v variants] #:when (memq v '(script-3m script-cgc))) (parameterize ([current-launcher-variant v]) - (make-mred-launcher null - (mred-program-launcher-path "MrEd") - '([exe-name . "MrEd"] [relative? . #t] - [framework-root . #f] [dll-dir . #f])))))) + (make-gracket-launcher + '() + (mred-program-launcher-path "GRacket") + '([exe-name . "GRacket"] [relative? . #t] + [framework-root . #f] [dll-dir . #f])) + (make-gracket-launcher + '() + (mred-program-launcher-path "MrEd") + '([exe-name . "MrEd"] [relative? . #t] + [framework-root . #f] [dll-dir . #f])))))) diff --git a/collects/mred/private/repl.ss b/collects/mred/private/repl.ss index 8f406c19a9..dcc707fc4d 100644 --- a/collects/mred/private/repl.ss +++ b/collects/mred/private/repl.ss @@ -50,14 +50,14 @@ (super-init) (let ([s (last-position)] [m (regexp-match #rx"^(.*), (Copyright.*)$" (banner))]) - (insert (format "Welcome to ~a." (cadr m))) + (insert (format "~a." (cadr m))) (let ([e (last-position)]) (insert #\newline) (change-style (send (make-object wx:style-delta% 'change-bold) set-delta-foreground "BLUE") s e)) (output (caddr m))) - (insert "This is a simple window for evaluating MrEd Scheme expressions.") (insert #\newline) + (insert "This is a simple window for evaluating Racket expressions.") (insert #\newline) (let ([s (last-position)]) - (insert "Quit now and run DrScheme to get a better window.") + (insert "Quit now and run DrRacket to get a better window.") (let ([e (last-position)]) (insert #\newline) (change-style diff --git a/collects/mzlib/restart.ss b/collects/mzlib/restart.ss index d2e6097004..e42ebf7d59 100644 --- a/collects/mzlib/restart.ss +++ b/collects/mzlib/restart.ss @@ -111,7 +111,7 @@ (init-namespace) (when scheme? - (namespace-require 'scheme)) + (namespace-require 'scheme/init)) (let/ec k (exit-handler diff --git a/collects/mzscheme/info.ss b/collects/mzscheme/info.ss index 26a13fcf15..047b8d23b7 100644 --- a/collects/mzscheme/info.ss +++ b/collects/mzscheme/info.ss @@ -2,6 +2,8 @@ (define version '(400)) +(define post-install-collection "installer.ss") + (define scribblings '(("mzscheme.scrbl" (multi-page) (legacy)))) (define compile-omit-paths '("examples")) diff --git a/collects/mzscheme/installer.ss b/collects/mzscheme/installer.ss new file mode 100644 index 0000000000..08da2cf53e --- /dev/null +++ b/collects/mzscheme/installer.ss @@ -0,0 +1,16 @@ +#lang scheme/base + +(require launcher compiler/embed) +(provide post-installer) + +(define (post-installer path) + (define variants (available-mzscheme-variants)) + (for ([v (in-list variants)]) + (create-embedding-executable + (mzscheme-program-launcher-path "MzScheme") + #:variant v + #:cmdline '("-I" "scheme/init") + #:launcher? #t + #:aux '((framework-root . #f) + (dll-dir . #f) + (relative? . #t))))) diff --git a/collects/racket/gui/info.ss b/collects/racket/gui/info.ss new file mode 100644 index 0000000000..d7e366323d --- /dev/null +++ b/collects/racket/gui/info.ss @@ -0,0 +1,3 @@ +#lang setup/infotab + +(define post-install-collection "installer.ss") diff --git a/collects/racket/gui/init.ss b/collects/racket/gui/init.ss new file mode 100644 index 0000000000..b48a885892 --- /dev/null +++ b/collects/racket/gui/init.ss @@ -0,0 +1,6 @@ +#lang racket +(require racket/init + scheme/gui/base) + +(provide (all-from-out racket/init + scheme/gui/base)) diff --git a/collects/racket/gui/installer.ss b/collects/racket/gui/installer.ss new file mode 100644 index 0000000000..47b69a008b --- /dev/null +++ b/collects/racket/gui/installer.ss @@ -0,0 +1,27 @@ +#lang scheme/base + +(require launcher) +(provide post-installer) + +(define (post-installer path) + (define variants (available-mred-variants)) + ;; add a gracket-text executable that uses the -z flag (preferring a script) + (for ([vs '((script-3m 3m) (script-cgc cgc))]) + (let ([v (findf (lambda (v) (memq v variants)) vs)]) + (when v + (parameterize ([current-launcher-variant v]) + (make-mred-launcher + '("-z") + (mred-program-launcher-path "gracket-text") + '([relative? . #t] [subsystem . console] [single-instance? . #f] + ;; the following two are required to avoid using a full path, + ;; should be removed when `relative?' will imply this + [framework-root . #f] [dll-dir . #f])))))) + ;; add a bin/gracket script under OS X + (when (eq? 'macosx (system-type)) + (for ([v variants] #:when (memq v '(script-3m script-cgc))) + (parameterize ([current-launcher-variant v]) + (make-mred-launcher null + (mred-program-launcher-path "GRacket") + '([exe-name . "Gracket"] [relative? . #t] + [framework-root . #f] [dll-dir . #f])))))) diff --git a/collects/rico/info.ss b/collects/rico/info.ss index 1c07a8001a..669d7d3cbc 100644 --- a/collects/rico/info.ss +++ b/collects/rico/info.ss @@ -2,5 +2,5 @@ (define compile-omit-paths '("main.ss")) -(define mzscheme-launcher-libraries '("main.ss")) -(define mzscheme-launcher-names '("Rico")) +(define racket-launcher-libraries '("main.ss")) +(define racket-launcher-names '("Rico")) diff --git a/collects/scribblings/mzc/exe-api.scrbl b/collects/scribblings/mzc/exe-api.scrbl index 2724264d69..beeb797c69 100644 --- a/collects/scribblings/mzc/exe-api.scrbl +++ b/collects/scribblings/mzc/exe-api.scrbl @@ -243,6 +243,14 @@ currently supported keys are as follows: executable, instead of a wrapper binary that execs the original; the default is @scheme[#f].} + @item{@scheme['relative?] (Unix, Windows, Mac OS X): A boolean; + @scheme[#t] means that, to the degree that the generated + executable must refer to another, it can use a relative path + (so the executables can be moved together, but not + seperately); a @scheme[#f] value (the default) means that + absolute paths should be used (so the generated executable can + be moved).} + ] If the @scheme[#:collects-path] argument is @scheme[#f], then the diff --git a/collects/setup/setup-unit.ss b/collects/setup/setup-unit.ss index 54884b70ca..cd582c41a6 100644 --- a/collects/setup/setup-unit.ss +++ b/collects/setup/setup-unit.ss @@ -834,8 +834,15 @@ kind mzlns (if (eq? 'l fault) "library" "flags") (if (eq? fault 'l) mzlls mzlfs)))])) - (for ([variant (available-mred-variants)]) + (for ([variant (available-gracket-variants)]) (parameterize ([current-launcher-variant variant]) + (make-launcher 'gui + 'gracket-launcher-names + 'gracket-launcher-libraries + 'gracket-launcher-flags + gracket-program-launcher-path + make-gracket-launcher + gracket-launcher-up-to-date?) (make-launcher 'gui 'mred-launcher-names 'mred-launcher-libraries @@ -843,8 +850,15 @@ mred-program-launcher-path make-mred-launcher mred-launcher-up-to-date?))) - (for ([variant (available-mzscheme-variants)]) + (for ([variant (available-racket-variants)]) (parameterize ([current-launcher-variant variant]) + (make-launcher 'console + 'racket-launcher-names + 'racket-launcher-libraries + 'racket-launcher-flags + racket-program-launcher-path + make-racket-launcher + racket-launcher-up-to-date?) (make-launcher 'console 'mzscheme-launcher-names 'mzscheme-launcher-libraries diff --git a/collects/setup/variant.ss b/collects/setup/variant.ss index 6714a4108c..f237aca38b 100644 --- a/collects/setup/variant.ss +++ b/collects/setup/variant.ss @@ -6,11 +6,11 @@ (define plain-mz-is-cgc? (delay (let* ([dir (find-console-bin-dir)] - [exe (cond [(eq? 'windows (system-type)) "MzScheme.exe"] + [exe (cond [(eq? 'windows (system-type)) "Racket.exe"] [(equal? #".dll" (system-type 'so-suffix)) ;; in cygwin so-suffix is ".dll" - "mzscheme.exe"] - [else "mzscheme"])] + "racket.exe"] + [else "racket"])] [f (build-path dir exe)]) (and (file-exists? f) (with-input-from-file f diff --git a/src/Makefile.in b/src/Makefile.in index eda8671376..a5aefbb78d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,5 +1,5 @@ -# Builds MzScheme and MrEd (if enabled), and +# Builds Racket and GRacket (if enabled), and # drives the main install srcdir = @srcdir@ @@ -30,9 +30,9 @@ all: 3m: cd mzscheme; $(MAKE) 3m - $(MAKE) @MAKE_MRED@-3m + $(MAKE) @MAKE_GRACKET@-3m -mred-3m: +gracket-3m: cd mred; $(MAKE) 3m no-3m: @@ -40,9 +40,9 @@ no-3m: cgc: cd mzscheme; $(MAKE) cgc - $(MAKE) @MAKE_MRED@-cgc + $(MAKE) @MAKE_GRACKET@-cgc -mred-cgc: +gracket-cgc: cd mred; $(MAKE) cgc no-cgc: @@ -54,7 +54,7 @@ both: # Install (common) ---------------------------------------- -SETUP_ARGS = -X "$(DESTDIR)$(collectsdir)" -l setup +SETUP_ARGS = -X "$(DESTDIR)$(collectsdir)" -N "rico setup" -l setup install: $(MAKE) install-@MAIN_VARIANT@ @@ -70,7 +70,7 @@ install-common-first: install-common-middle: $(MAKE) @MAKE_COPYTREE@-run - $(MAKE) install-@MAKE_MRED@-post-collects + $(MAKE) install-@MAKE_GRACKET@-post-collects $(MAKE) lib-finish install-common-last: @@ -83,12 +83,12 @@ no-run: $(NOOP) copytree-run: - mzscheme/mzscheme@CGC@ -u \ + mzscheme/racket@CGC@ -u \ "$(srcdir)/../collects/setup/unixstyle-install.ss" \ make-install-copytree "$(srcdir)/.." \ $(ALLDIRINFO) "@INSTALL_ORIG_TREE@" -install-mred-post-collects: +install-gracket-post-collects: cd mred; $(MAKE) install-post-collects install-no-post-collects: @@ -96,7 +96,7 @@ install-no-post-collects: fix-paths: if [ "$(DESTDIR)" != "" ]; then \ - mzscheme/mzscheme@CGC@ -u \ + mzscheme/racket@CGC@ -u \ "$(srcdir)/../collects/setup/unixstyle-install.ss" \ make-install-destdir-fix "$(srcdir)/.." \ $(ALLDIRINFO) "@INSTALL_ORIG_TREE@"; \ @@ -107,12 +107,12 @@ fix-paths: install-3m-common: $(MAKE) install-common-first cd mzscheme; $(MAKE) install-3m - $(MAKE) install-@MAKE_MRED@-3m + $(MAKE) install-@MAKE_GRACKET@-3m $(MAKE) install-common-middle install-3m: $(MAKE) install-3m-common - mzscheme/mzscheme@MMM@ $(SETUP_ARGS) + mzscheme/racket@MMM@ $(SETUP_ARGS) $(MAKE) install-common-last plain-install-3m: @@ -122,7 +122,7 @@ plain-install-3m: install-no-3m: $(NOOP) -install-mred-3m: +install-gracket-3m: cd mred; $(MAKE) install-3m # CGC install ---------------------------------------- @@ -130,12 +130,12 @@ install-mred-3m: install-cgc-common: $(MAKE) install-common-first cd mzscheme; $(MAKE) install-cgc - $(MAKE) install-@MAKE_MRED@-cgc + $(MAKE) install-@MAKE_GRACKET@-cgc $(MAKE) install-common-middle install-cgc: $(MAKE) install-cgc-common - mzscheme/mzscheme@CGC@ $(SETUP_ARGS) + mzscheme/racket@CGC@ $(SETUP_ARGS) $(MAKE) install-common-last plain-install-cgc: @@ -145,7 +145,7 @@ plain-install-cgc: install-no-cgc: $(NOOP) -install-mred-cgc: +install-gracket-cgc: cd mred; $(MAKE) install-cgc # Both install ---------------------------------------- @@ -153,12 +153,12 @@ install-mred-cgc: install-both-common: $(MAKE) install-common-first cd mzscheme; $(MAKE) install-both - $(MAKE) install-@MAKE_MRED@-both + $(MAKE) install-@MAKE_GRACKET@-both $(MAKE) install-common-middle install-both: $(MAKE) install-both-common - mzscheme/mzscheme@MAIN_VARIANT@ $(SETUP_ARGS) + mzscheme/racket@MAIN_VARIANT@ $(SETUP_ARGS) $(MAKE) install-common-last plain-install-both: @@ -168,7 +168,7 @@ plain-install-both: install-no-both: $(NOOP) -install-mred-both: +install-gracket-both: cd mred; $(MAKE) install-both # Clean ---------------------------------------- diff --git a/src/configure b/src/configure index e6434b6dc0..6b437f2134 100755 --- a/src/configure +++ b/src/configure @@ -708,14 +708,14 @@ INSTALL_ORIG_TREE EXE_SUFFIX MZRT_CGC_FLAGS LIBATOM -MREDLINKER +GRACKETLINKER LIBSFX WXLIBS WXVARIANT ICP MRLIBINSTALL LIBFINISH -MAKE_MRED +MAKE_GRACKET MAKE_WBUILD MAKE_COPYTREE MAKE_FINISH @@ -734,8 +734,8 @@ FOREIGN_IF_USED FOREIGN_OBJSLIB FOREIGN_CONVENIENCE FOREIGNTARGET -LIBMZSCHEME_DEP -LIBMRED_DEP +LIBRACKET_DEP +LIBGRACKET_DEP LTO LTA collectsdir @@ -1335,7 +1335,7 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-mred compile MrEd as well as MzScheme (enabled by default) + --enable-gracket compile GRacket as well as Racket (enabled by default) --enable-gl use OpenGL when available (enabled by default) --enable-xrender use Xrender when available (enabled by default) --enable-xft use Xft when available (enabled by default) @@ -1358,22 +1358,23 @@ Optional Features: --enable-backtrace 3m: support GC backtrace dumps --enable-float include support for single-precision floats --enable-floatinstead compile to use single-precision by default - --enable-pthread link MrEd with pthreads (sometimes needed for GL) + --enable-pthread link with pthreads (sometimes needed for GL) --enable-stackup assume "up" if stack direction cannot be determined --enable-bigendian assume "big" if endianness cannot be determined - --enable-oskit compile OSKit-based MzScheme kernel - --enable-smalloskit compile small OSKit-based MzScheme kernel + --enable-oskit compile OSKit-based Racket kernel + --enable-smalloskit compile small OSKit-based Racket kernel --enable-wbuild compile and use wbuild for .w sources --enable-perl use perl to regenerate certain sources --enable-gprof compile for profiling with gprof (gcc only) --enable-gcov compile to gather gcov statistics (gcc3 only) --enable-noopt drop -O C flags --enable-sdk= use Mac OS X 10.4 SDK directory - --enable-xonx compile X11 (not Quartz) MrEd for Mac OS X + --enable-xonx compile X11 (not Quartz) GRacket for Mac OS X --enable-libfw install Mac OS X frameworks to /Library/Frameworks --enable-userfw install Mac OS X frameworks to ~/Library/Frameworks --enable-macprefix allow --prefix with a Mac OS X install --enable-mac64 do not force 32-bit build + --enable-gc2-places-testing compile gc2 places tesging support Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1820,11 +1821,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers mzscheme/mzconfig.h" -# Check whether --enable-mred was given. -if test "${enable_mred+set}" = set; then - enableval=$enable_mred; +# Check whether --enable-gracket was given. +if test "${enable_gracket+set}" = set; then + enableval=$enable_gracket; else - enable_mred=yes + enable_gracket=yes fi @@ -2041,6 +2042,11 @@ if test "${enable_mac64+set}" = set; then fi +# Check whether --enable-gc2_places_testing was given. +if test "${enable_gc2_places_testing+set}" = set; then + enableval=$enable_gc2_places_testing; +fi + ###### Get OS Type ####### @@ -2064,7 +2070,7 @@ if test "${enable_smalloskit}" = "yes" ; then fi if test "${enable_oskit}" = "yes" ; then - enable_mred=no + enable_gracket=no fi if test "${enable_dynlib}" = "no" ; then @@ -2114,6 +2120,12 @@ else fi fi +if test "${enable_gc2_places_testing}" = "yes" ; then + enable_shared=yes + enable_places=yes +fi + + # Hack for the implementor: if test "${enable_perl}" = "" ; then if test "$USER" = "mflatt" ; then @@ -2198,15 +2210,15 @@ else INSTALL_ORIG_TREE=no fi -###### Make sure MrEd is really there ###### +###### Make sure GRacket is really there ###### -if test "${enable_mred}" = "yes" ; then +if test "${enable_gracket}" = "yes" ; then if test ! -d $srcdir/mred ; then - enable_mred=no + enable_gracket=no fi fi -if test "${enable_mred}" = "no" ; then +if test "${enable_gracket}" = "no" ; then enable_wbuild=no enable_xrender=no enable_cairo=no @@ -2237,8 +2249,8 @@ show_explicitly_enabled "${enable_cgcdefault}" "CGC as default" show_explicitly_enabled "${enable_xonx}" "X-on-X" show_explicitly_enabled "${enable_shared}" "Shared libraries" -show_explicitly_disabled "${enable_mred}" MrEd -if test "${enable_mred}" != "no" ; then +show_explicitly_disabled "${enable_gracket}" GRacket +if test "${enable_gracket}" != "no" ; then show_explicitly_disabled "${enable_gl}" OpenGL show_explicitly_disabled "${enable_xrender}" Xrender show_explicitly_disabled "${enable_xft}" Xft @@ -2257,6 +2269,7 @@ show_explicitly_disabled "${enable_jit}" JIT show_explicitly_disabled "${enable_foreign}" Foreign show_explicitly_enabled "${enable_places}" Places +show_explicitly_enabled "${enable_gc2_places_testing}" "GC2 Places Testing" show_explicitly_enabled "${enable_futures}" Futures show_explicitly_disabled "${enable_futures}" Futures @@ -2321,7 +2334,7 @@ MZRT_CGC_FLAGS="" LIBATOM="LIBATOM_NONE" ar_libtool_no_undefined="" -LIBMZSCHEME_DEP="" +LIBRACKET_DEP="" XFT_EXTRA_FLAGS= XFT_EXTRA_LIBS= @@ -4311,7 +4324,7 @@ if test "$REZ" = '' ; then REZ=/Developer/Tools/Rez fi -if test "${enable_mred}" = "yes" ; then +if test "${enable_gracket}" = "yes" ; then if test "${enable_quartz}" = "yes" ; then : else @@ -5633,9 +5646,9 @@ fi fi - MAKE_MRED=mred + MAKE_GRACKET=gracket else - MAKE_MRED=no + MAKE_GRACKET=no fi @@ -5817,7 +5830,7 @@ EXTRALIBS= # for gmp assembly: EXTRA_GMP_OBJ= -# For MzScheme targets: +# For Racket targets: OSX=".osx" NOT_OSX="" CGC_X86_64="" @@ -5837,7 +5850,7 @@ case $OS in ;; AIX) enable_cgcdefault="yes" - EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../mzscheme/include/mzscheme.exp" + EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../mzscheme/include/racket.exp" ;; FreeBSD) LIBS="$LIBS -rdynamic" @@ -5917,8 +5930,8 @@ case $OS in MZINSTALLTARGET=unix-cygwin-install if test "${enable_shared}" = "yes" ; then ar_libtool_no_undefined=" -no-undefined" - LIBMZSCHEME_DEP="libmzgc.la -liconv" - LIBMRED_DEP="../mzscheme/libmzgc.la ../mzscheme/libmred.la" + LIBRACKET_DEP="libmzgc.la -liconv" + LIBGRACKET_DEP="../mzscheme/libmzgc.la ../mzscheme/libgracket.la" fi EXE_SUFFIX=".exe" ;; @@ -9472,6 +9485,16 @@ _ACEOF fi +############### GC2_PLACES_TESTING ################### + +if test "${enable_gc2_places_testing}" = "yes" ; then + +cat >>confdefs.h <<\_ACEOF +#define GC2_PLACES_TESTING 1 +_ACEOF + +fi + ############### places ################### if test "${enable_places}" = "yes" ; then @@ -9653,7 +9676,7 @@ fi ############## C++ grunge ################ -if test "${enable_mred}" = "yes" ; then +if test "${enable_gracket}" = "yes" ; then CPPFLAGS="$CPPFLAGS $X_CFLAGS" ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -10441,7 +10464,7 @@ fi else echo "******************************************************" echo "configure: cannot find X11 development files that are" - echo " needed to compile MrEd:" + echo " needed to compile GRacket:" echo "$xmissing" echo "******************************************************" echo configure aborted @@ -12003,7 +12026,7 @@ if test "${enable_shared}" = "yes" ; then ARFLAGS="" RANLIB=":" MZLINKER="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc} -rpath ${abslibdir}" - MREDLINKER="${LIBTOOLPROG} --mode=link --tag=CXX $CXX${need_gcc_static_libgcc} -rpath ${abslibdir}" + GRACKETLINKER="${LIBTOOLPROG} --mode=link --tag=CXX $CXX${need_gcc_static_libgcc} -rpath ${abslibdir}" PLAIN_CC="$CC" CC="${LIBTOOLPROG} --mode=compile --tag=CC $CC" CXX="${LIBTOOLPROG} --mode=compile --tag=CXX $CXX" @@ -12020,7 +12043,7 @@ if test "${enable_shared}" = "yes" ; then MZOPTIONS="$MZOPTIONS -DMZ_USES_SHARED_LIB" else LIBSFX=a - MREDLINKER='$(CXX)' + GRACKETLINKER='$(CXX)' WXLIBS=WXLIBSNORM ICP=cp MRLIBINSTALL="install-no-lib" @@ -12245,7 +12268,7 @@ else fi ac_configure_args="$ac_configure_args$SUB_CONFIGURE_EXTRAS" -if test "${enable_mred}" = "yes" ; then +if test "${enable_gracket}" = "yes" ; then if test "${enable_quartz}" = "yes" ; then mk_needed_dir wxmac mk_needed_dir wxmac/src @@ -13061,7 +13084,7 @@ INSTALL_ORIG_TREE!$INSTALL_ORIG_TREE$ac_delim EXE_SUFFIX!$EXE_SUFFIX$ac_delim MZRT_CGC_FLAGS!$MZRT_CGC_FLAGS$ac_delim LIBATOM!$LIBATOM$ac_delim -MREDLINKER!$MREDLINKER$ac_delim +GRACKETLINKER!$GRACKETLINKER$ac_delim LIBSFX!$LIBSFX$ac_delim WXLIBS!$WXLIBS$ac_delim _ACEOF @@ -13109,7 +13132,7 @@ WXVARIANT!$WXVARIANT$ac_delim ICP!$ICP$ac_delim MRLIBINSTALL!$MRLIBINSTALL$ac_delim LIBFINISH!$LIBFINISH$ac_delim -MAKE_MRED!$MAKE_MRED$ac_delim +MAKE_GRACKET!$MAKE_GRACKET$ac_delim MAKE_WBUILD!$MAKE_WBUILD$ac_delim MAKE_COPYTREE!$MAKE_COPYTREE$ac_delim MAKE_FINISH!$MAKE_FINISH$ac_delim @@ -13128,8 +13151,8 @@ FOREIGN_IF_USED!$FOREIGN_IF_USED$ac_delim FOREIGN_OBJSLIB!$FOREIGN_OBJSLIB$ac_delim FOREIGN_CONVENIENCE!$FOREIGN_CONVENIENCE$ac_delim FOREIGNTARGET!$FOREIGNTARGET$ac_delim -LIBMZSCHEME_DEP!$LIBMZSCHEME_DEP$ac_delim -LIBMRED_DEP!$LIBMRED_DEP$ac_delim +LIBRACKET_DEP!$LIBRACKET_DEP$ac_delim +LIBGRACKET_DEP!$LIBGRACKET_DEP$ac_delim LTO!$LTO$ac_delim LTA!$LTA$ac_delim collectsdir!$collectsdir$ac_delim diff --git a/src/mac/osx_appl.ss b/src/mac/osx_appl.ss index 558e6a3043..8ba4f63a53 100644 --- a/src/mac/osx_appl.ss +++ b/src/mac/osx_appl.ss @@ -1,9 +1,9 @@ #| # OS X pre-make script -# builds resource files, makes template Starter.app and MrEd.app +# builds resource files, makes template Starter.app and GRacket.app # -# the script must be run from the mred build directory, +# the script must be run from the gracket build directory, # and srcdir must be provided as the first argument |# @@ -24,15 +24,15 @@ ; Rez where needed: (let* ([cw-path (build-path plthome "src" "mac" "cw")] - [rez-it (lambda (app) + [rez-it (lambda (app src) (printf "Writing ~a~n" (string-append app ".rsrc.OSX")) (system* rez-path - (path->string (build-path cw-path (string-append app ".r"))) + (path->string (build-path cw-path (string-append src ".r"))) "-UseDF" "-o" (path->string (path-replace-suffix app #".rsrc.OSX"))))]) ; (rez-it "MzScheme") ; useless under OS X... - (rez-it "MrEd")) + (rez-it "GRacket" "MrEd")) ; make .app templates in the right places: @@ -91,7 +91,7 @@ (realize-template fw-path fw-template-tree) (write-info (build-path fw-path "Resources") info-plist) ;; maybe someday we'll have Contents/Resources/English.lproj ? - (let* ([rsrc-src (build-path "MrEd.rsrc.OSX")] + (let* ([rsrc-src (build-path "GRacket.rsrc.OSX")] [rsrc-dest (build-path fw-path "Resources" (format "~a.rsrc" fw-name))]) (when (file-exists? rsrc-dest) (delete-file rsrc-dest)) @@ -121,14 +121,14 @@ ,(version)))) (create-app (build-path (current-directory) (if for-3m? 'up 'same)) - (string-append "MrEd" suffix) + (string-append "GRacket" suffix) "MrEd" "APPLmReD" - (make-info-plist (string-append "MrEd" suffix) "mReD" #t)) + (make-info-plist (string-append "GRacket" suffix) "mReD" #t)) (create-fw (current-directory) - "PLT_MrEd" - (make-info-plist "PLT_MrEd" "MrEd" #f)) + "GRacket" + (make-info-plist "GRacket" "GRacket" #f)) (create-app (build-path (current-directory) (if for-3m? 'up 'same)) "Starter" diff --git a/src/mred/Makefile.in b/src/mred/Makefile.in index 3ff5bc8340..25e2ecf71d 100644 --- a/src/mred/Makefile.in +++ b/src/mred/Makefile.in @@ -1,5 +1,5 @@ # -# Makefile for mred +# Makefile for gracket # srcdir = @srcdir@ @@ -52,7 +52,7 @@ LDFLAGS = @LDFLAGS@ $(XLIB) ARLIBFLAGS = $(LDFLAGS) $(LDLIBS) ########################### -MREDLINKER = @MREDLINKER@ +GRACKETLINKER = @GRACKETLINKER@ JPEG_A = ../wxcommon/jpeg/libjpeg.@LIBSFX@ JPEG_INC = -I../wxcommon/jpeg -I$(srcdir)/../wxcommon/jpeg @@ -62,24 +62,24 @@ PNG_A = ../wxcommon/libpng/libpng.@LIBSFX@ EXTRALDFLAGS_wx_xt = EXTRALDFLAGS_wx_mac = -framework Carbon -framework Cocoa -framework QuickTime -framework AGL -framework OpenGL -lz -MREDLDFLAGS = $(LDFLAGS) $(EXTRALDFLAGS_@WXVARIANT@) +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@ -MREDX_wx_xt = mredx.@LTO@ +GRACKETX_wx_xt = mredx.@LTO@ WXLIBS_wx_mac = ../wxmac/src/libwxmac.@LIBSFX@ -MREDX_wx_mac = mredmac.@LTO@ simpledrop.@LTO@ -WXLIBSNORM = mred.@LTO@ $(MREDX_@WXVARIANT@) wxGC.@LTO@ wxJPEG.@LTO@ wxs/libwxscheme.@LIBSFX@ $(WXLIBS_@WXVARIANT@) @JPEG_A@ @PNG_A@ @ZLIB_A@ -WXLIBSDYN = libmred.@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@ +WXLIBSDYN = libgracket.@LIBSFX@ GUILIBS_wx_xt = $(LDLIBS) GUILIBS_wx_mac = @LIBS@ -MREDLDLIBS = ../mzscheme/libmzscheme.@LIBSFX@ ../mzscheme/libmzgc.@LIBSFX@ $(@WXLIBS@) $(GUILIBS_@WXVARIANT@) +GRACKETLDLIBS = ../mzscheme/libracket.@LIBSFX@ ../mzscheme/libmzgc.@LIBSFX@ $(@WXLIBS@) $(GUILIBS_@WXVARIANT@) LOCALFLAGS_wx_xt = @WX_MMD_FLAG@ LOCALFLAGS_wx_mac = -I$(srcdir)/../mac/mzscheme -MMD -DWX_CARBON LOCALFLAGS = $(LOCALFLAGS_@WXVARIANT@) -MREDOBJECTS = mrmain.@LTO@ +GRACKETOBJECTS = mrmain.@LTO@ -MZSCHEMEDEPS = ../mzscheme/libmzscheme.@LIBSFX@ ../mzscheme/libmzgc.@LIBSFX@ +RACKETDEPS = ../mzscheme/libracket.@LIBSFX@ ../mzscheme/libmzgc.@LIBSFX@ WXSCHEME = wxs/libwxscheme.@LIBSFX@ INSTALLDEST=/home/scheme/plt @@ -94,8 +94,8 @@ WXINCDEP = $(WXINCDEP_@WXVARIANT@) MZEXTRAEXPORT='GCDIR=$(GCDIRECTORY)' -LINKRESULT_wx_xt = mred@CGC@ -LINKRESULT_wx_mac = MrEd@CGC@.app/Contents/MacOS/MrEd@CGC@ +LINKRESULT_wx_xt = gracket@CGC@ +LINKRESULT_wx_mac = GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@ LINKRESULT = $(LINKRESULT_@WXVARIANT@) bin: @@ -121,41 +121,41 @@ both: ext-libs: @JPEG_A@ @PNG_A@ @ZLIB_A@ $(NOOP) -mred@CGC@ : $(MZSCHEMEDEPS) mrmain.@LTO@ $(MREDOBJECTS) $(@WXLIBS@) $(MRSTATIC_STUB) - $(MREDLINKER) $(MREDLDFLAGS) $(MRSTATIC) -o mred@CGC@ $(MREDOBJECTS) $(MREDLDLIBS) $(MRSTATIC_STUB) +gracket@CGC@ : $(RACKETDEPS) mrmain.@LTO@ $(GRACKETOBJECTS) $(@WXLIBS@) $(MRSTATIC_STUB) + $(GRACKETLINKER) $(GRACKETLDFLAGS) $(MRSTATIC) -o gracket@CGC@ $(GRACKETOBJECTS) $(GRACKETLDLIBS) $(MRSTATIC_STUB) -libmred.@LIBSFX@: $(WXLIBSNORM) - $(AR) $(ARFLAGS) libmred.@LIBSFX@ $(WXLIBSNORM) @LIBMRED_DEP@ +libgracket.@LIBSFX@: $(WXLIBSNORM) + $(AR) $(ARFLAGS) libgracket.@LIBSFX@ $(WXLIBSNORM) @LIBGRACKET_DEP@ -MRFW = PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd -MRFWRES = PLT_MrEd.framework/Versions/$(FWVERSION)/Resources/PLT_MrEd.rsrc +MRFW = GRacket.framework/Versions/$(FWVERSION)/GRacket +MRFWRES = GRacket.framework/Versions/$(FWVERSION)/Resources/GRacket.rsrc -$(MRFW) : $(MZSCHEMEDEPS) $(MREDOBJECTS) $(@WXLIBS@) $(MRSTATIC_STUB) $(MRFWRES) - $(MREDLINKER) $(MREDLDFLAGS) -dynamiclib -o $(MRFW) -Wl,-headerpad_max_install_names ../mzscheme/libmzscheme.@LIBSFX@ ../mzscheme/libmzgc.@LIBSFX@ $(@WXLIBS@) $(GUILIBS_@WXVARIANT@) @X_EXTRA_LIBS@ +$(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@ -MrEd@CGC@.app/Contents/MacOS/MrEd@CGC@: $(MRFWRES) $(MRFW) mrmain.@LTO@ - $(MREDLINKER) $(MREDLDFLAGS) -o MrEd@CGC@.app/Contents/MacOS/MrEd@CGC@ mrmain.@LTO@ -Wl,-headerpad_max_install_names -F. -framework PLT_MrEd -framework Carbon -framework Cocoa @PROFFLAGS@ - /usr/bin/install_name_tool -change "PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" MrEd@CGC@.app/Contents/MacOS/MrEd@CGC@ +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@ + /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 - rm -rf PLT_MrEd.framework/Resources PLT_MrEd.framework/PLT_MrEd - env BUILDBASE=.. ../mzscheme/mzscheme@CGC@ -cqu $(srcdir)/../mac/osx_appl.ss $(srcdir)/.. "@CGC@" - ln -s Versions/$(FWVERSION)/PLT_MrEd PLT_MrEd.framework/PLT_MrEd - ln -s Versions/$(FWVERSION)/Resources PLT_MrEd.framework/Resources + rm -rf GRacket.framework/Resources GRacket.framework/GRacket + env BUILDBASE=.. ../mzscheme/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 -MZSCHEME = ../mzscheme/mzscheme@CGC@ +RACKET = ../mzscheme/racket@CGC@ -ee-app: mred mrmain_ee.@LTO@ - if [ "$(EEAPP)" = '' ] ; then echo "ERROR: You must specify EEAPP" ; else $(MREDLINKER) $(MREDLDFLAGS) $(MRSTATIC) -o $(EEAPP) mrmain_ee.@LTO@ $(EEOBJECTS) $(MREDLDLIBS) $(MRSTATIC_STUB) ; fi +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 sunos4-static: dl_stub.@LTO@ - $(MAKE) mred MRSTATIC=-static MRSTATIC_STUB='dl_stub.@LTO@' LDNONSTATICLIBS='' + $(MAKE) gracket MRSTATIC=-static MRSTATIC_STUB='dl_stub.@LTO@' LDNONSTATICLIBS='' solaris-static: - $(MAKE) mred MRSTATIC="-Wl,-Bstatic" LDNONSTATICLIBS='-Wl,-Bdynamic -ldl -Wl,-Bstatic' + $(MAKE) gracket MRSTATIC="-Wl,-Bstatic" LDNONSTATICLIBS='-Wl,-Bdynamic -ldl -Wl,-Bstatic' linux-static: - $(MAKE) mred MRSTATIC=--static LDNONSTATICLIBS='-ldl' + $(MAKE) gracket MRSTATIC=--static LDNONSTATICLIBS='-ldl' wx_xt: cd ../wxxt/src/x; $(MAKE) @@ -233,7 +233,7 @@ CLEANDIR_wx_mac = ../wxmac/src clean: cd $(CLEANDIR_@WXVARIANT@); $(MAKE) clean - rm -f *.@LTO@ *.d core mred mred3m + rm -f *.@LTO@ *.d core gracket gracket3m rm -f gc2/*.@LTO@ gc2/xsrc/* gc2/macxsrc/* gc2/*.d gc2/*.dd rm -rf gc2/xform-collects cd wxs; $(MAKE) clean @@ -247,8 +247,8 @@ clean_wx_xt: echo clean done clean_wx_mac: - rm -rf PLT_MrEd.framework MrEd@CGC@.app Starter.app MrEd@MMM@.app MrEd.rsrc.OSX - rm -rf gc2/PLT_MrEd.framework gc2/MrEd.rsrc.OSX gc2/*.pfe gc2/macxsrc/* + rm -rf GRacket.framework GRacket@CGC@.app Starter.app GRacket@MMM@.app GRacket.rsrc.OSX + rm -rf gc2/GRacket.framework gc2/GRacket.rsrc.OSX gc2/*.pfe gc2/macxsrc/* echo clean done ICP=@ICP@ @@ -280,15 +280,15 @@ install-post-collects: $(MAKE) install-@WXVARIANT@-post-collects install-common: - cd ..; rm -f "$(DESTDIR)$(bindir)/mred@CGC_INSTALLED@" - cd ..; rm -f "$(DESTDIR)$(bindir)/mred@MMM_INSTALLED@" + cd ..; rm -f "$(DESTDIR)$(bindir)/gracket@CGC_INSTALLED@" + cd ..; rm -f "$(DESTDIR)$(bindir)/gracket@MMM_INSTALLED@" cd ..; echo 'CXX=@CXX@' >> $(BUILDINFO) cd ..; echo 'CXXFLAGS=@CXXFLAGS@ @PREFLAGS@ @COMPFLAGS@' >> $(BUILDINFO) cd ..; echo 'MROPTIONS=@MROPTIONS@' >> $(BUILDINFO) cd ..; echo 'X_CFLAGS=@X_CFLAGS@' >> $(BUILDINFO) cd ..; echo 'X_LIB=@X_LIBS@' >> $(BUILDINFO) cd ..; echo "MRLIBS=$(GUILIBS_@WXVARIANT@)" >> $(BUILDINFO) - cd ..; echo "MRLDFLAGS=$(MREDLDFLAGS)" >> $(BUILDINFO) + cd ..; echo "MRLDFLAGS=$(GRACKETLDFLAGS)" >> $(BUILDINFO) # X11 ---------------------------------------- @@ -300,12 +300,12 @@ install-no-lib-cgc-wx_xt: echo "no dynamic libs" install-lib-cgc-wx_xt: - cd ..; $(ICP) mred/libmred.@LIBSFX@ "$(DESTDIR)$(libdir)" + cd ..; $(ICP) mred/libgracket.@LIBSFX@ "$(DESTDIR)$(libdir)" install-wx_xt-cgc: $(MAKE) @MRLIBINSTALL@-cgc-wx_xt - cd ..; $(ICP) mred/mred@CGC@ "$(DESTDIR)$(bindir)/mred@CGC_INSTALLED@" - $(MZSCHEME) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(DESTDIR)$(bindir)/mred@CGC_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ + 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@ 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/libmred3m.@LIBSFX@ "$(DESTDIR)$(libdir)" + cd ..; $(ICP) mred/libgracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)" install-wx_xt-3m: $(MAKE) @MRLIBINSTALL@-3m-wx_xt - cd ..; $(ICP) mred/mred@MMM@ "$(DESTDIR)$(bindir)/mred@MMM_INSTALLED@" - $(MZSCHEME) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(DESTDIR)$(bindir)/mred@MMM_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ + 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@ install-wx_xt-3m-final: $(NOOP) @@ -329,45 +329,45 @@ install-wx_xt-post-collects: # Mac OS X ---------------------------------------- -MRFWDIR = @FRAMEWORK_INSTALL_DIR@/PLT_MrEd.framework +MRFWDIR = @FRAMEWORK_INSTALL_DIR@/GRacket.framework FRAMEWORK_REL_PREFIX="@executable_path/../../../lib/" install-wx_mac: rm -rf $(MRFWDIR)/Versions/$(FWVERSION) rm -rf $(MRFWDIR)/Versions/$(FWVERSION)_3m - rm -f $(MRFWDIR)/PLT_MrEd + rm -f $(MRFWDIR)/GRacket rm -rf $(MRFWDIR)/Resources - cd ..; rm -rf "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app" - cd ..; rm -rf "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app" + cd ..; rm -rf "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app" + cd ..; rm -rf "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app" if [ @FRAMEWORK_REL_INSTALL@ = yes ] ; then rm -rf $(MRFWDIR) ; fi mkdir -p "@FRAMEWORK_INSTALL_DIR@" install-wx_mac-cgc: mkdir -p "$(MRFWDIR)/Versions/$(FWVERSION)" - cd ..; $(ICP) -r mred/MrEd@CGC@.app "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app" - $(MZSCHEME) -cqu "$(srcdir)/../mac/rename-app.ss" "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app" "MrEd@CGC@" "MrEd@CGC_CAP_INSTALLED@" - $(ICP) PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd $(MRFWDIR)/Versions/$(FWVERSION)/PLT_MrEd - $(ICP) -r PLT_MrEd.framework/Versions/$(FWVERSION)/Resources $(MRFWDIR)/Versions/$(FWVERSION)/Resources - /usr/bin/install_name_tool -change "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" "@FRAMEWORK_PREFIX@PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app/Contents/MacOS/MrEd@CGC_CAP_INSTALLED@" - $(MZSCHEME) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app/Contents/MacOS/MrEd@CGC_CAP_INSTALLED@" ../../../collects - @STRIP_DEBUG@ "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app/Contents/MacOS/MrEd@CGC_CAP_INSTALLED@" + cd ..; $(ICP) -r mred/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 + @STRIP_DEBUG@ "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" install-wx_mac-cgc-final: - ln -s Versions/$(FWVERSION)/PLT_MrEd $(MRFWDIR)/ + ln -s Versions/$(FWVERSION)/GRacket $(MRFWDIR)/ ln -s Versions/$(FWVERSION)/Resources $(MRFWDIR)/ install-wx_mac-3m: mkdir -p "$(MRFWDIR)/Versions/$(FWVERSION)_3m" - cd ..; $(ICP) -r "mred/MrEd@MMM@.app" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app" - $(MZSCHEME) -cqu "$(srcdir)/../mac/rename-app.ss" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app" "MrEd@MMM@" "MrEd@MMM_CAP_INSTALLED@" - $(ICP) "PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "$(MRFWDIR)/Versions/$(FWVERSION)_3m/PLT_MrEd" - $(ICP) -r "PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources" "$(MRFWDIR)/Versions/$(FWVERSION)_3m/Resources" - /usr/bin/install_name_tool -change "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "@FRAMEWORK_PREFIX@PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app/Contents/MacOS/MrEd@MMM_CAP_INSTALLED@" - $(MZSCHEME) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app/Contents/MacOS/MrEd@MMM_CAP_INSTALLED@" "../../../collects" - @STRIP_DEBUG@ "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app/Contents/MacOS/MrEd@MMM_CAP_INSTALLED@" + cd ..; $(ICP) -r "mred/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" + @STRIP_DEBUG@ "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" install-wx_mac-3m-final: - ln -s Versions/$(FWVERSION)_3m/PLT_MrEd $(MRFWDIR)/ + ln -s Versions/$(FWVERSION)_3m/GRacket $(MRFWDIR)/ ln -s Versions/$(FWVERSION)_3m/Resources $(MRFWDIR)/ install-wx_mac-post-collects: diff --git a/src/mred/gc2/Makefile.in b/src/mred/gc2/Makefile.in index 5f412baa37..52fbf9db68 100644 --- a/src/mred/gc2/Makefile.in +++ b/src/mred/gc2/Makefile.in @@ -60,8 +60,8 @@ 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 -MZMMM_wx_xt = ../../mzscheme/mzscheme@MMM@ -MZMMM_wx_mac = ../../mzscheme/mzscheme@MMM@ +MZMMM_wx_xt = ../../mzscheme/racket@MMM@ +MZMMM_wx_mac = ../../mzscheme/racket@MMM@ MZMMM = $(MZMMM_@WXVARIANT@) XFORM_CMD = $(MZMMM) -cqu $(srcdir)/../../mzscheme/gc2/xform.ss --setup ../../mzscheme/gc2 @@ -76,7 +76,7 @@ NONPRECOMPDEP = $(srcdir)/../../mzscheme/include/schthread.h WXBDIR=../../wxxt WXMACBDIR=../../wxmac/src -MREDLDFLAGS = -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../../mzscheme -L../wxs -L$(WXBDIR)/src DEF_COLLECTS_DIR = +D INITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../../collects; pwd`"'"' @@ -929,10 +929,10 @@ wx_mac_XSRCS = \ \ macxsrc/simpledrop.cc -MRED_wx_xt = mredx -MRED_wx_mac = mredmac +GRACKET_wx_xt = mredx +GRACKET_wx_mac = mredmac -MRED_XSRCS = \ +GRACKET_XSRCS = \ xsrc/wxs_bmap.cc \ xsrc/wxs_butn.cc \ xsrc/wxs_chce.cc \ @@ -961,9 +961,9 @@ MRED_XSRCS = \ \ xsrc/mred.cc \ xsrc/mrmain.cc \ - xsrc/$(MRED_@WXVARIANT@).cc + xsrc/$(GRACKET_@WXVARIANT@).cc -XSRCS = $(@WXVARIANT@_XSRCS) $(MRED_XSRCS) +XSRCS = $(@WXVARIANT@_XSRCS) $(GRACKET_XSRCS) wx_xt_XOBJS = Window.@LTO@ \ Button.@LTO@ \ @@ -1109,7 +1109,7 @@ wx_mac_XOBJS = \ \ simpledrop.@LTO@ -MRED_XOBJS = \ +GRACKET_XOBJS = \ wxs_bmap.@LTO@ \ wxs_butn.@LTO@ \ wxs_chce.@LTO@ \ @@ -1137,14 +1137,14 @@ MRED_XOBJS = \ wxJPEG.@LTO@ \ \ mred.@LTO@ \ - $(MRED_@WXVARIANT@).@LTO@ \ + $(GRACKET_@WXVARIANT@).@LTO@ \ \ xcglue.@LTO@ \ wxGC.@LTO@ -XOBJS = $(@WXVARIANT@_XOBJS) $(MRED_XOBJS) +XOBJS = $(@WXVARIANT@_XOBJS) $(GRACKET_XOBJS) -MZOBJS = ../../mzscheme/libmzscheme3m.@LIBSFX@ +MZOBJS = ../../mzscheme/libracket3m.@LIBSFX@ wx_xt_PLAIN_OBJS = \ ../../wxxt/src/XWidgets/xwArrow.@LTO@ \ @@ -1213,7 +1213,7 @@ wx_file_dialog.o : $(srcdir)/../../wxmac/src/mac/wx_file_dialog.m wx_xt_LIBS = ../../wxxt/contrib/xpm/lib/libXpm.@LTA@ @JPEG_A@ @PNG_A@ @ZLIB_A@ wx_mac_LIBS = -framework Carbon -framework Cocoa -framework QuickTime -framework AGL -framework OpenGL @JPEG_A@ @PNG_A@ -lz @LIBS@ -MREDLINKER = @MREDLINKER@ +GRACKETLINKER = @GRACKETLINKER@ FOREIGN_OBJS = ../../foreign/gcc/libffi/src/*.@LTO@ ../../foreign/gcc/libffi/src/*/*.@LTO@ FOREIGN_LIB = ../../foreign/gcc/libffi/libffi@FOREIGN_CONVENIENCE@.@LTA@ @@ -1228,45 +1228,45 @@ EXTRA_GMP := $(if @EXTRA_GMP_OBJ@,../../mzscheme/src/@EXTRA_GMP_OBJ@,) EXTRA_MZ_OBJS = ../../mzscheme/src/gmp.@LTO@ $(EXTRA_GMP) ../../mzscheme/src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) -LIBMREDLIBS_a = -LIBMREDLIBS_la = $(LDFLAGS) $(LDLIBS) $(@WXVARIANT@_LIBS) -LIBMREDMZOBJS_a = -LIBMREDMZOBJS_la = $(MZOBJS) -MREDLIBS_a = $(LDLIBS) $(@WXVARIANT@_LIBS) -MREDLIBS_la = -MREDMZOBJS_a = $(MZOBJS) -MREDMZOBJS_la = +LIBGRACKETLIBS_a = +LIBGRACKETLIBS_la = $(LDFLAGS) $(LDLIBS) $(@WXVARIANT@_LIBS) +LIBGRACKETMZOBJS_a = +LIBGRACKETMZOBJS_la = $(MZOBJS) +GRACKETLIBS_a = $(LDLIBS) $(@WXVARIANT@_LIBS) +GRACKETLIBS_la = +GRACKETMZOBJS_a = $(MZOBJS) +GRACKETMZOBJS_la = -../libmred3m.@LIBSFX@: $(XOBJS) $(MZOBJS) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) - $(AR) $(ARFLAGS) ../libmred3m.@LIBSFX@ $(XOBJS) $(LIBMREDMZOBJS_@LIBSFX@) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) $(LIBMREDLIBS_@LIBSFX@) - $(RANLIB) ../libmred3m.@LIBSFX@ +../libgracket3m.@LIBSFX@: $(XOBJS) $(MZOBJS) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) + $(AR) $(ARFLAGS) ../libgracket3m.@LIBSFX@ $(XOBJS) $(LIBGRACKETMZOBJS_@LIBSFX@) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) $(LIBGRACKETLIBS_@LIBSFX@) + $(RANLIB) ../libgracket3m.@LIBSFX@ -../mred@MMM@@NOT_OSX@: mrmain.@LTO@ ../libmred3m.@LIBSFX@ - $(MREDLINKER) $(MREDLDFLAGS) -o ../mred@MMM@ mrmain.@LTO@ ../libmred3m.@LIBSFX@ $(MREDMZOBJS_@LIBSFX@) $(MREDLIBS_@LIBSFX@) +../gracket@MMM@@NOT_OSX@: mrmain.@LTO@ ../libgracket3m.@LIBSFX@ + $(GRACKETLINKER) $(GRACKETLDFLAGS) -o ../gracket@MMM@ mrmain.@LTO@ ../libgracket3m.@LIBSFX@ $(GRACKETMZOBJS_@LIBSFX@) $(GRACKETLIBS_@LIBSFX@) -MRFW = PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd -MRFWRES = PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources/PLT_MrEd.rsrc +MRFW = GRacket.framework/Versions/$(FWVERSION)_3m/GRacket +MRFWRES = GRacket.framework/Versions/$(FWVERSION)_3m/Resources/GRacket.rsrc -../MrEd@MMM@.app/Contents/MacOS/MrEd@MMM@: $(MRFWRES) $(MRFW) mrmain.@LTO@ - $(MREDLINKER) $(LDFLAGS) -o ../MrEd@MMM@.app/Contents/MacOS/MrEd@MMM@ mrmain.@LTO@ -Wl,-headerpad_max_install_names -F. -framework PLT_MrEd -framework Carbon -framework Cocoa - mkdir -p "../PLT_MrEd.framework/Versions/$(FWVERSION)_3m" +../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 + mkdir -p "../GRacket.framework/Versions/$(FWVERSION)_3m" cp "$(MRFW)" "../$(MRFW)" - rm -rf "../PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources" - cp -r "PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources" "../PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources" - /usr/bin/install_name_tool -change "PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "../MrEd@MMM@.app/Contents/MacOS/MrEd@MMM@" + 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/libmzscheme3m.@LIBSFX@ wx_font.o wx_file_dialog.o $(MRFWRES) - $(MREDLINKER) $(LDFLAGS) -dynamiclib -o $(MRFW) -Wl,-headerpad_max_install_names $(XOBJS) $(@WXVARIANT@_PLAIN_OBJS) ../../mzscheme/libmzscheme3m.@LIBSFX@ $(@WXVARIANT@_LIBS) @X_EXTRA_LIBS@ wx_font.o wx_file_dialog.o +$(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 $(MRFWRES): $(srcdir)/../../mac/osx_appl.ss $(srcdir)/../../mac/cw/MrEd.r - rm -rf PLT_MrEd.framework/Resources PLT_MrEd.framework/PLT_MrEd - env BUILDBASE=../.. BUILDING_3M=yes ../../mzscheme/mzscheme@CGC@ -cqu $(srcdir)/../../mac/osx_appl.ss $(srcdir)/../.. "@MMM@" - ln -s Versions/$(FWVERSION)_3m/PLT_MrEd PLT_MrEd.framework/PLT_MrEd - ln -s Versions/$(FWVERSION)_3m/Resources PLT_MrEd.framework/Resources + rm -rf GRacket.framework/Resources GRacket.framework/GRacket + env BUILDBASE=../.. BUILDING_3M=yes ../../mzscheme/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 -../mred@MMM@@OSX@ : +../gracket@MMM@@OSX@ : $(MAKE) macxsrc/xform_precomp.h - $(MAKE) ../MrEd@MMM@.app/Contents/MacOS/MrEd@MMM@ + $(MAKE) ../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@ xsrc: mkdir xsrc @@ -1277,14 +1277,14 @@ XSRC_EXTRA_DIR_wx_xt = XSRC_EXTRA_DIR_wx_mac = macxsrc 3m: xsrc $(XSRC_EXTRA_DIR_@WXVARIANT@) - $(MAKE) ../mred@MMM@ + $(MAKE) ../gracket@MMM@ ######################################## # Make Depends # ######################################## gen-deps: - ../../mzscheme/mzscheme@MMM@ -cqu "$(srcdir)/gen-deps.ss" + ../../mzscheme/racket@MMM@ -cqu "$(srcdir)/gen-deps.ss" @INCLUDEDEP@ mrmain.dd @INCLUDEDEP@ mred.dd diff --git a/src/mred/mred.h b/src/mred/mred.h index 4ce575be8a..5ba3ea74e0 100644 --- a/src/mred/mred.h +++ b/src/mred/mred.h @@ -187,7 +187,7 @@ MRED_EXTERN void mred_set_run_from_cmd_line(MrEd_Run_From_Cmd_Line_Proc); # define mrVERSION_SUFFIX " [cgc]" # endif #endif -#define BANNER "MrEd v" MZSCHEME_VERSION mrVERSION_SUFFIX ", Copyright (c) 2004-2010 PLT Scheme Inc.\n" +#define BANNER "GRacket v" MZSCHEME_VERSION mrVERSION_SUFFIX ", Copyright (c) 2004-2010 PLT Scheme Inc.\n" #ifndef WCONSOLE_STDIO # if defined(wx_msw) diff --git a/src/mred/mrmain.cxx b/src/mred/mrmain.cxx index 9f63f174f9..5ec59cf904 100644 --- a/src/mred/mrmain.cxx +++ b/src/mred/mrmain.cxx @@ -1,6 +1,6 @@ /* * File: mred.cc - * Purpose: MrEd main file, including a hodge-podge of global stuff + * Purpose: GRacket main file, including a hodge-podge of global stuff * Author: Matthew Flatt * Created: 1995 * Copyright: (c) 2004-2010 PLT Scheme Inc. @@ -98,15 +98,15 @@ extern "C" Scheme_Object *scheme_initialize(Scheme_Env *env); #endif #ifdef wx_x -# define INIT_FILENAME "~/.mredrc" +# define INIT_FILENAME "~/.gracketrc" #else # ifdef wx_msw -# define INIT_FILENAME "%%HOMEDIRVE%%\\%%HOMEPATH%%\\mredrc.ss" +# define INIT_FILENAME "%%HOMEDIRVE%%\\%%HOMEPATH%%\\gracketrc.ss" # else # ifdef OS_X -# define INIT_FILENAME "~/.mredrc" +# define INIT_FILENAME "~/.gracketrc" # else -# define INIT_FILENAME "PREFERENCES:mredrc.ss" +# define INIT_FILENAME "PREFERENCES:gracketrc.ss" # endif # endif #endif @@ -118,8 +118,8 @@ static void (*mred_console_printf)(char *str, ...); #else # define PRINTF printf #endif -#define PROGRAM "MrEd" -#define PROGRAM_LC "mred" +#define PROGRAM "GRacket" +#define PROGRAM_LC "gracket" #define INITIAL_BIN_TYPE "ri" #ifdef wx_mac @@ -141,7 +141,7 @@ static char *pltcollects_from_resource; #define CMDLINE_STDIO_FLAG #define YIELD_BEFORE_EXIT -#define INITIAL_NAMESPACE_MODULE "scheme/gui/init" +#define INITIAL_NAMESPACE_MODULE "racket/gui/init" # include "../mzscheme/cmdline.inc" @@ -241,7 +241,7 @@ static int main_after_stack(int argc, char *argv[]) #endif #ifdef SGC_STD_DEBUGGING - fprintf(stderr, "Starting MrEd with sgc for debugging\n"); + fprintf(stderr, "Starting GRacket with sgc for debugging\n"); #endif #ifdef wx_mac @@ -644,8 +644,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR ignored # ifndef MZ_PRECISE_GC load_delayed_dll(NULL, "libmzgcxxxxxxx.dll"); # endif - load_delayed_dll(NULL, "libmzsch" DLL_3M_SUFFIX "xxxxxxx.dll"); - load_delayed_dll(NULL, "libmred" DLL_3M_SUFFIX "xxxxxxx.dll"); + load_delayed_dll(NULL, "libracket" DLL_3M_SUFFIX "xxxxxxx.dll"); + load_delayed_dll(NULL, "libgracket" DLL_3M_SUFFIX "xxxxxxx.dll"); record_dll_path(); # ifdef IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS scheme_register_tls_space(&tls_space, _tls_index); diff --git a/src/mzscheme/Makefile.in b/src/mzscheme/Makefile.in index f9d7425895..10d3cd44a6 100644 --- a/src/mzscheme/Makefile.in +++ b/src/mzscheme/Makefile.in @@ -1,5 +1,5 @@ # -# Makefile for mzscheme +# Makefile for racket # srcdir = @srcdir@ @@ -66,13 +66,13 @@ cgc: $(MAKE) common $(MAKE) dynlib $(MAKE) mzlibrary - $(MAKE) mzscheme@CGC@ + $(MAKE) racket@CGC@ 3m: $(MAKE) cgc cd gc2; $(MAKE) all cd dynsrc; $(MAKE) dynlib3m - cd gc2; $(MAKE) ../mzscheme@MMM@ + cd gc2; $(MAKE) ../racket@MMM@ both: $(MAKE) cgc @@ -81,9 +81,9 @@ both: oskit: $(MAKE) common $(MAKE) mzlibrary - $(MAKE) mzscheme.multiboot + $(MAKE) racket.multiboot -mzschemelib: +racketlib: $(MAKE) g-c $(MAKE) @FOREIGNTARGET@ $(MAKE) mzlibrary @@ -119,16 +119,16 @@ foreign-nothing: mzlibrary: cd src; $(MAKE) all - $(MAKE) libmzscheme.@LIBSFX@ + $(MAKE) libracket.@LIBSFX@ FOREIGN_USED_LIB = $(FOREIGN_OBJ) $(FOREIGN_LIB) FOREIGN_USED_OBJSLIB = $(FOREIGN_OBJSLIB) FOREIGN_NOT_USED_LIB = FOREIGN_NOT_USED_OBJSLIB = -libmzscheme.@LIBSFX@: src/*.@LTO@ $(@FOREIGN_IF_USED@_LIB) - $(AR) $(ARFLAGS) libmzscheme.@LIBSFX@ src/*.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) @LIBMZSCHEME_DEP@ - $(RANLIB) libmzscheme.@LIBSFX@ +libracket.@LIBSFX@: src/*.@LTO@ $(@FOREIGN_IF_USED@_LIB) + $(AR) $(ARFLAGS) libracket.@LIBSFX@ src/*.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) @LIBRACKET_DEP@ + $(RANLIB) libracket.@LIBSFX@ # Irix sproc, only sproc.@LTO@: @GCDIR@/sproc.@LTO@ @@ -136,28 +136,28 @@ sproc.@LTO@: @GCDIR@/sproc.@LTO@ # Unix ---------------------------------------- -mzscheme@CGC@@NOT_OSX@: libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ main.@LTO@ $(SPECIALIZINGOBJECTS) - @MZLINKER@ -o mzscheme@CGC@ main.@LTO@ $(SPECIALIZINGOBJECTS) libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ @LDFLAGS@ @LIBS@ +racket@CGC@@NOT_OSX@: libracket.@LIBSFX@ libmzgc.@LIBSFX@ main.@LTO@ $(SPECIALIZINGOBJECTS) + @MZLINKER@ -o racket@CGC@ main.@LTO@ $(SPECIALIZINGOBJECTS) libracket.@LIBSFX@ libmzgc.@LIBSFX@ @LDFLAGS@ @LIBS@ # Mac OS ---------------------------------------- -MZFW = PLT_MzScheme.framework/Versions/$(FWVERSION)/PLT_MzScheme +MZFW = Racket.framework/Versions/$(FWVERSION)/Racket -$(MZFW): libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ $(SPECIALIZINGOBJECTS) - mkdir -p PLT_MzScheme.framework/Versions/$(FWVERSION) - @MZLINKER@ -o $(MZFW) @LDFLAGS@ -framework CoreFoundation -dynamiclib -all_load $(SPECIALIZINGOBJECTS) libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ @LIBS@ - rm -f PLT_MzScheme.framework/PLT_MzScheme - ln -s Versions/$(FWVERSION)/PLT_MzScheme PLT_MzScheme.framework/PLT_MzScheme +$(MZFW): libracket.@LIBSFX@ libmzgc.@LIBSFX@ $(SPECIALIZINGOBJECTS) + mkdir -p Racket.framework/Versions/$(FWVERSION) + @MZLINKER@ -o $(MZFW) @LDFLAGS@ -framework CoreFoundation -dynamiclib -all_load $(SPECIALIZINGOBJECTS) libracket.@LIBSFX@ libmzgc.@LIBSFX@ @LIBS@ + rm -f Racket.framework/Racket + ln -s Versions/$(FWVERSION)/Racket Racket.framework/Racket -mzscheme@CGC@@OSX@: $(MZFW) main.@LTO@ - @MZLINKER@ -o mzscheme@CGC@ @PROFFLAGS@ @LDFLAGS@ main.@LTO@ -Wl,-headerpad_max_install_names -F. -framework PLT_MzScheme @LIBS@ - /usr/bin/install_name_tool -change "PLT_MzScheme.framework/Versions/$(FWVERSION)/PLT_MzScheme" "@executable_path/PLT_MzScheme.framework/Versions/$(FWVERSION)/PLT_MzScheme" "mzscheme@CGC@" +racket@CGC@@OSX@: $(MZFW) main.@LTO@ + @MZLINKER@ -o racket@CGC@ @PROFFLAGS@ @LDFLAGS@ main.@LTO@ -Wl,-headerpad_max_install_names -F. -framework Racket @LIBS@ + /usr/bin/install_name_tool -change "Racket.framework/Versions/$(FWVERSION)/Racket" "@executable_path/Racket.framework/Versions/$(FWVERSION)/Racket" "racket@CGC@" # OSKit ---------------------------------------- -mzscheme.multiboot : libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ main.@LTO@ +racket.multiboot : libracket.@LIBSFX@ libmzgc.@LIBSFX@ main.@LTO@ $(LD) -Ttext 100000 $(LDFLAGS) @OSKHOME@/lib/oskit/multiboot.@LTO@ \ - -o mzscheme.multiboot main.@LTO@ -L. -lmzscheme -lgc \ + -o racket.multiboot main.@LTO@ -L. -lracket -lgc \ -L@OSKHOME@/lib -loskit_kern -loskit_clientos @EXTRA_OSK_LIBS@ \ -loskit_freebsd_c -loskit_c -loskit_lmm \ -loskit_freebsd_m -loskit_memfs -loskit_fsnamespace \ @@ -178,8 +178,8 @@ main_ee.@LTO@: main.@LTO@ ee-main: $(MAKE) main_ee.@LTO@ -ee-app: $(MZSCHEME) main_ee.@LTO@ - if [ "$(EEAPP)" = '' ] ; then echo "ERROR: You must specify EEAPP" ; else $(CC) $(MAIN_CFLAGS_NODBG) -o $(EEAPP) main_ee.@LTO@ $(EEOBJECTS) $(SPECIALIZINGOBJECTS) libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ @LIBS@ ; fi +ee-app: $(RACKET) main_ee.@LTO@ + if [ "$(EEAPP)" = '' ] ; then echo "ERROR: You must specify EEAPP" ; else $(CC) $(MAIN_CFLAGS_NODBG) -o $(EEAPP) main_ee.@LTO@ $(EEOBJECTS) $(SPECIALIZINGOBJECTS) libracket.@LIBSFX@ libmzgc.@LIBSFX@ @LIBS@ ; fi testext.@LTO@: testext.c $(CC) $(MAIN_CFLAGS) -I/home/scheme/plt/compiler/ -c testext.c -o testext.@LTO@ @@ -212,18 +212,18 @@ mark: $(MAKE) $(srcdir)/src/mzmark.c headers: - ./mzscheme@CGC@ -cqu $(srcdir)/mkincludes.ss "$(DESTDIR)$(includepltdir)" "$(srcdir)" . + ./racket@CGC@ -cqu $(srcdir)/mkincludes.ss "$(DESTDIR)$(includepltdir)" "$(srcdir)" . $(srcdir)/src/schexn.h: $(srcdir)/src/makeexn - ./mzscheme@CGC@ -um $(srcdir)/src/makeexn > $(srcdir)/src/schexn.h + ./racket@CGC@ -um $(srcdir)/src/makeexn > $(srcdir)/src/schexn.h $(collectsdir)/scheme/private/kernstruct.ss: $(srcdir)/src/makeexn - ./mzscheme@CGC@ -um $(srcdir)/src/makeexn kernstruct $(collectsdir)/scheme/private/kernstruct.ss + ./racket@CGC@ -um $(srcdir)/src/makeexn kernstruct $(collectsdir)/scheme/private/kernstruct.ss $(srcdir)/src/$(CSTARTUPDEST): $(srcdir)/src/startup.ss $(srcdir)/src/schvers.h $(srcdir)/src/schminc.h - ./mzscheme@CGC@ -cqu $(srcdir)/src/sstoinc.ss $(CSTARTUPEXTRA) $(srcdir)/src/$(CSTARTUPDEST) < $(srcdir)/src/startup.ss + ./racket@CGC@ -cqu $(srcdir)/src/sstoinc.ss $(CSTARTUPEXTRA) $(srcdir)/src/$(CSTARTUPDEST) < $(srcdir)/src/startup.ss $(srcdir)/src/mzmark.c: $(srcdir)/src/mzmarksrc.c $(srcdir)/src/mkmark.ss - mzscheme -cu $(srcdir)/src/mkmark.ss < $(srcdir)/src/mzmarksrc.c > $(srcdir)/src/mzmark.c + racket -cu $(srcdir)/src/mkmark.ss < $(srcdir)/src/mzmarksrc.c > $(srcdir)/src/mzmark.c cstartup.zo: $(MAKE) startup CSTARTUPEXTRA='zo' CSTARTUPDEST="../cstartup.zo" @@ -232,7 +232,7 @@ clean@NOT_OSX@: /bin/rm -rf tmp[123456789] tests/tmp[123456789] tests/sub[123] /bin/rm -f tests/*~ /bin/rm -f *.@LTO@ core - /bin/rm -f mzdyn.o libmzgc.@LIBSFX@ libmzscheme.@LIBSFX@ libmzscheme3m.@LIBSFX@ libdl.a mzscheme mzscheme.multiboot + /bin/rm -f mzdyn.o libmzgc.@LIBSFX@ libracket.@LIBSFX@ libracket3m.@LIBSFX@ libdl.a racket racket.multiboot /bin/rm -f include/macosxpre /bin/rm -f include/macosxpre.p cd gc; $(MAKE) clean @@ -243,7 +243,7 @@ clean@NOT_OSX@: if [ -d ../foreign ] ; then cd ../foreign ; $(MAKE) clean ; fi clean@OSX@: - rm -rf PLT_MzScheme.framework + rm -rf Racket.framework $(MAKE) clean@NOT_OSX@ BUILDINFO=$(DESTDIR)$(libpltdir)/buildinfo @@ -277,8 +277,8 @@ install-both: # have to go up and install things from there. unix-install: - cd ..; rm -f "$(DESTDIR)$(bindir)/mzscheme@CGC_INSTALLED@" - cd ..; rm -f "$(DESTDIR)$(bindir)/mzscheme@MMM_INSTALLED@" + cd ..; rm -f "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@" + cd ..; rm -f "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@" cd ..; cp mzscheme/starter "$(DESTDIR)$(libpltdir)/starter" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/starter" cd ..; echo 'CC=@CC@' > "$(BUILDINFO)" @@ -290,32 +290,32 @@ unix-install: unix-install-cgc: cd ..; $(ICP) mzscheme/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" - cd ..; $(ICP) mzscheme/libmzscheme.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzscheme.@LIBSFX@" - cd ..; $(ICP) mzscheme/mzscheme@CGC@ "$(DESTDIR)$(bindir)/mzscheme@CGC_INSTALLED@" + 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" - ./mzscheme@CGC@ -cu "$(srcdir)/collects-path.ss" "$(DESTDIR)$(bindir)/mzscheme@CGC_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ + ./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/mzscheme@MMM@ "$(DESTDIR)$(bindir)/mzscheme@MMM_INSTALLED@" - cd ..; $(ICP) mzscheme/libmzscheme3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzscheme3m.@LIBSFX@" + 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" - ./mzscheme@MMM@ -cu "$(srcdir)/collects-path.ss" "$(DESTDIR)$(bindir)/mzscheme@MMM_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ + ./racket@MMM@ -cu "$(srcdir)/collects-path.ss" "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ unix-install-3m-final: $(NOOP) # OS X install ---------------------------------------- -MZFWDIR = @FRAMEWORK_INSTALL_DIR@/PLT_MzScheme.framework -MZFWMMM = PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme +MZFWDIR = @FRAMEWORK_INSTALL_DIR@/Racket.framework +MZFWMMM = Racket.framework/Versions/$(FWVERSION)_3m/Racket FRAMEWORK_REL_PREFIX = "@executable_path/../lib/" osx-install: $(MAKE) unix-install - rm -f $(MZFWDIR)/PLT_MzScheme + rm -f $(MZFWDIR)/Racket rm -rf $(MZFWDIR)/Versions/$(FWVERSION) rm -rf $(MZFWDIR)/Versions/$(FWVERSION)_3m if [ @FRAMEWORK_REL_INSTALL@ = yes ] ; then rm -rf $(MZFWDIR) ; fi @@ -325,23 +325,23 @@ osx-install-cgc: $(MAKE) unix-install-cgc mkdir -p "$(MZFWDIR)/Versions/$(FWVERSION)" cp $(MZFW) $(MZFWDIR)/Versions/$(FWVERSION)/ - /usr/bin/install_name_tool -change "@executable_path/PLT_MzScheme.framework/Versions/$(FWVERSION)/PLT_MzScheme" "@FRAMEWORK_PREFIX@PLT_MzScheme.framework/Versions/$(FWVERSION)/PLT_MzScheme" "$(bindir)/mzscheme@CGC_INSTALLED@" - $(STRIP_DEBUG) "$(bindir)/mzscheme@CGC_INSTALLED@" + /usr/bin/install_name_tool -change "@executable_path/Racket.framework/Versions/$(FWVERSION)/Racket" "@FRAMEWORK_PREFIX@Racket.framework/Versions/$(FWVERSION)/Racket" "$(bindir)/racket@CGC_INSTALLED@" + $(STRIP_DEBUG) "$(bindir)/racket@CGC_INSTALLED@" osx-install-cgc-final: $(MAKE) unix-install-cgc-final - ln -s Versions/$(FWVERSION)/PLT_MzScheme $(MZFWDIR)/ + ln -s Versions/$(FWVERSION)/Racket $(MZFWDIR)/ osx-install-3m: $(MAKE) unix-install-3m mkdir -p "$(MZFWDIR)/Versions/$(FWVERSION)_3m" cp $(MZFWMMM) $(MZFWDIR)/Versions/$(FWVERSION)_3m/ - /usr/bin/install_name_tool -change "@executable_path/PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "@FRAMEWORK_PREFIX@PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "$(bindir)/mzscheme@MMM_INSTALLED@" - $(STRIP_DEBUG) "$(bindir)/mzscheme@MMM_INSTALLED@" + /usr/bin/install_name_tool -change "@executable_path/Racket.framework/Versions/$(FWVERSION)_3m/Racket" "@FRAMEWORK_PREFIX@Racket.framework/Versions/$(FWVERSION)_3m/Racket" "$(bindir)/racket@MMM_INSTALLED@" + $(STRIP_DEBUG) "$(bindir)/racket@MMM_INSTALLED@" osx-install-3m-final: $(MAKE) unix-install-3m-final - ln -s Versions/$(FWVERSION)_3m/PLT_MzScheme $(MZFWDIR)/ + ln -s Versions/$(FWVERSION)_3m/Racket $(MZFWDIR)/ # Cygwin install ---------------------------------------- @@ -367,4 +367,4 @@ unix-cygwin-install-3m-final: # Generate plt-gdbinit ---------------------------------------- mz-gdbinit: $(srcdir)/mk-gdbinit.ss $(srcdir)/src/stypes.h - mzscheme $(srcdir)/mk-gdbinit.ss + racket $(srcdir)/mk-gdbinit.ss diff --git a/src/mzscheme/cmdline.inc b/src/mzscheme/cmdline.inc index c16a6cc63d..82a00985ec 100644 --- a/src/mzscheme/cmdline.inc +++ b/src/mzscheme/cmdline.inc @@ -1,7 +1,7 @@ -/***************************************************************/ -/* This command-line parser is used by both MzScheme and MrEd. */ -/***************************************************************/ +/****************************************************************/ +/* This command-line parser is used by both Racket and Gracket. */ +/****************************************************************/ #define SDESC "Set! works on undefined identifiers" @@ -17,7 +17,7 @@ char *cmdline_exe_hack = char *binary_type_hack = "bINARy tYPe:" INITIAL_BIN_TYPE GC_PRECISION_TYPE; /* The format of bINARy tYPe is e?[zr]i[3c]. e indicates a starter executable - z/r indicates MzScheme or MrEd + z/r indicates Racket or GRacket i indicates ??? 3/c indicates 3m or CGC */ @@ -1049,7 +1049,7 @@ static int run_from_cmd_line(int argc, char *_argv[], init_ns = 0; if (show_vers) { -#ifndef MZSCHEME_CMD_LINE +#ifndef RACKET_CMD_LINE if (!use_repl #ifdef CMDLINE_STDIO_FLAG || alternate_rep @@ -1057,7 +1057,7 @@ static int run_from_cmd_line(int argc, char *_argv[], ) #endif PRINTF("%s", BANNER); -#ifdef MZSCHEME_CMD_LINE +#ifdef RACKET_CMD_LINE # ifdef DOS_FILE_SYSTEM # if !defined(FILES_HAVE_FDS) # if !defined(WINDOWS_FILE_HANDLES) @@ -1202,7 +1202,7 @@ static int run_from_cmd_line(int argc, char *_argv[], show_help: prog =("%s" PROGRAM_LC " [