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

create core binaries as 'racket' and 'gracket'

Browse Source
This commit is contained in:
Matthew Flatt 2010-04-15 21:15:57 -04:00
parent a8999166d7
commit 0f0a59732e
43 changed files with 4517 additions and 2541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
collects/compiler/embed-unit.ss
View File

@ -71,7 +71,7 @@
(lambda () (lambda ()
(error 'create-embedding-executable (error 'create-embedding-executable
"can't find ~a executable for variant ~a" "can't find ~a executable for variant ~a"
(if mred? "MrEd" "MzScheme") (if mred? "GRacket" "Racket")
variant))]) variant))])
(let ([exe (build-path (let ([exe (build-path
base base
@ -80,22 +80,22 @@
(cond (cond
[(not mred?) [(not mred?)
;; Need MzScheme: ;; Need MzScheme:
(string-append "mzscheme" (variant-suffix variant #f))] (string-append "racket" (variant-suffix variant #f))]
[mred? [mred?
;; Need MrEd: ;; Need MrEd:
(let ([sfx (variant-suffix variant #t)]) (let ([sfx (variant-suffix variant #t)])
(build-path (format "MrEd~a.app" sfx) (build-path (format "GRacket~a.app" sfx)
"Contents" "MacOS" "Contents" "MacOS"
(format "MrEd~a" sfx)))])] (format "GRacket~a" sfx)))])]
[(windows) [(windows)
(format "~a~a.exe" (if mred? (format "~a~a.exe" (if mred?
"MrEd" "Gracket"
"MzScheme") "Racket")
(variant-suffix variant #t))] (variant-suffix variant #t))]
[(unix) [(unix)
(format "~a~a" (if mred? (format "~a~a" (if mred?
"mred" "gracket"
"mzscheme") "racket")
(variant-suffix variant #f))]))]) (variant-suffix variant #f))]))])
(unless (or (file-exists? exe) (unless (or (file-exists? exe)
(directory-exists? exe)) (directory-exists? exe))
@ -989,7 +989,8 @@
;; Use `write-module-bundle', but figure out how to put it into an executable ;; Use `write-module-bundle', but figure out how to put it into an executable
(define (create-embedding-executable dest (define (create-embedding-executable dest
#:mred? [mred? #f] #:mred? [really-mred? #f]
#:gracket? [gracket? #f]
#:verbose? [verbose? #f] #:verbose? [verbose? #f]
#:modules [modules null] #:modules [modules null]
#:configure-via-first-module? [config? #f] #:configure-via-first-module? [config? #f]
@ -1012,6 +1013,7 @@
(compile expr)))] (compile expr)))]
#:src-filter [src-filter (lambda (filename) #f)] #:src-filter [src-filter (lambda (filename) #f)]
#:get-extra-imports [get-extra-imports (lambda (filename code) null)]) #:get-extra-imports [get-extra-imports (lambda (filename code) null)])
(define mred? (or really-mred? gracket?))
(define keep-exe? (and launcher? (define keep-exe? (and launcher?
(let ([m (assq 'forget-exe? aux)]) (let ([m (assq 'forget-exe? aux)])
(or (not m) (or (not m)
@ -1088,8 +1090,8 @@
(when (regexp-match #rx"^@executable_path" (when (regexp-match #rx"^@executable_path"
(get-current-framework-path dest (get-current-framework-path dest
(if mred? (if mred?
"PLT_MrEd" "GRacket"
"PLT_MzScheme"))) "Racket")))
(update-framework-path (string-append (update-framework-path (string-append
(path->string (find-lib-dir)) (path->string (find-lib-dir))
"/") "/")

4
collects/compiler/private/macfw.ss
View File

@ -37,8 +37,8 @@
#"$")) #"$"))
(string->bytes/utf-8 new-path)))) (string->bytes/utf-8 new-path))))
(if mred? (if mred?
'("PLT_MrEd") '("GRacket")
'("PLT_MzScheme"))))) '("Racket")))))
(define (get-current-framework-path dest p) (define (get-current-framework-path dest p)
(let ([v (get/set-dylib-path dest (let ([v (get/set-dylib-path dest

4
collects/drscheme/info.ss
View File

@ -2,5 +2,9 @@
(define tools '("syncheck.ss" #;"sprof.ss")) (define tools '("syncheck.ss" #;"sprof.ss"))
(define tool-names '("Check Syntax" #;"Sampling Profiler")) (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-names '("DrScheme"))
(define mred-launcher-libraries '("drscheme.ss")) (define mred-launcher-libraries '("drscheme.ss"))

21
collects/launcher/launcher-sig.ss
View File

@ -1,30 +1,47 @@
#lang scheme/signature #lang scheme/signature
make-gracket-launcher
make-racket-launcher
make-mred-launcher make-mred-launcher
make-mzscheme-launcher make-mzscheme-launcher
make-gracket-program-launcher
make-racket-program-launcher
make-mred-program-launcher make-mred-program-launcher
make-mzscheme-program-launcher make-mzscheme-program-launcher
gracket-program-launcher-path
racket-program-launcher-path
mred-program-launcher-path mred-program-launcher-path
mzscheme-program-launcher-path mzscheme-program-launcher-path
install-gracket-program-launcher
install-racket-program-launcher
install-mred-program-launcher install-mred-program-launcher
install-mzscheme-program-launcher install-mzscheme-program-launcher
gracket-launcher-up-to-date?
racket-launcher-up-to-date?
mred-launcher-up-to-date? mred-launcher-up-to-date?
mzscheme-launcher-up-to-date? mzscheme-launcher-up-to-date?
gracket-launcher-is-directory?
racket-launcher-is-directory?
mred-launcher-is-directory? mred-launcher-is-directory?
mzscheme-launcher-is-directory? mzscheme-launcher-is-directory?
gracket-launcher-is-actually-directory?
racket-launcher-is-actually-directory?
mred-launcher-is-actually-directory? mred-launcher-is-actually-directory?
mzscheme-launcher-is-actually-directory? mzscheme-launcher-is-actually-directory?
gracket-launcher-add-suffix
racket-launcher-add-suffix
mred-launcher-add-suffix mred-launcher-add-suffix
mzscheme-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 mred-launcher-put-file-extension+style+filters
mzscheme-launcher-put-file-extension+style+filters mzscheme-launcher-put-file-extension+style+filters
@ -32,3 +49,5 @@ build-aux-from-path
current-launcher-variant current-launcher-variant
available-mred-variants available-mred-variants
available-mzscheme-variants available-mzscheme-variants
available-gracket-variants
available-racket-variants

92
collects/launcher/launcher-unit.ss
View File

@ -26,7 +26,7 @@
v)) v))
v))) v)))
(define (variant-available? kind cased-kind-name variant) (define (variant-available? kind cased-kind-name variant)
(cond (cond
[(or (eq? 'unix (system-type)) [(or (eq? 'unix (system-type))
(and (eq? 'macosx (system-type)) (and (eq? 'macosx (system-type))
@ -35,7 +35,11 @@
(and bin-dir (and bin-dir
(file-exists? (file-exists?
(build-path bin-dir (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)) [(eq? 'macosx (system-type))
;; kind must be mred, because mzscheme case is caught above ;; kind must be mred, because mzscheme case is caught above
(directory-exists? (build-path (find-gui-bin-dir) (directory-exists? (build-path (find-gui-bin-dir)
@ -51,8 +55,8 @@
(define (available-variants kind) (define (available-variants kind)
(let* ([cased-kind-name (if (eq? kind 'mzscheme) (let* ([cased-kind-name (if (eq? kind 'mzscheme)
"MzScheme" "Racket"
"MrEd")] "GRacket")]
[normal-kind (system-type 'gc)] [normal-kind (system-type 'gc)]
[alt-kind (if (eq? '3m normal-kind) [alt-kind (if (eq? '3m normal-kind)
'cgc 'cgc
@ -78,9 +82,13 @@
null)]) null)])
(append normal alt script script-alt))) (append normal alt script script-alt)))
(define (available-gracket-variants)
(available-variants 'mred))
(define (available-mred-variants) (define (available-mred-variants)
(available-variants 'mred)) (available-variants 'mred))
(define (available-racket-variants)
(available-variants 'mzscheme))
(define (available-mzscheme-variants) (define (available-mzscheme-variants)
(available-variants 'mzscheme)) (available-variants 'mzscheme))
@ -323,7 +331,9 @@
(make-absolute-path-header bindir)))] (make-absolute-path-header bindir)))]
[exec (format [exec (format
"exec \"${bindir}/~a~a\" ~a" "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)) (if alt-exe "" (variant-suffix variant #f))
pre-str)] pre-str)]
[args (format [args (format
@ -434,12 +444,12 @@
;; OS X launcher code: ;; 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) (define (make-macosx-launcher kind variant flags dest aux)
(if (or (eq? kind 'mzscheme) (script-variant? variant)) (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) (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 (make-embedding-executable dest (eq? kind 'mred) #f
null null null null null null
flags flags
@ -474,11 +484,15 @@
[(macos) make-macos-launcher] [(macos) make-macos-launcher]
[(macosx) make-macosx-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)) ((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)) ((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) (define (strip-suffix s)
(path-replace-suffix s #"")) (path-replace-suffix s #""))
@ -530,19 +544,23 @@
(let ([d (read)]) (let ([d (read)])
(list (cons 'uti-exports d))))))))))) (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)) (make-mred-launcher (list "-l-" (string-append collection "/" file))
dest dest
(build-aux-from-path (build-aux-from-path
(build-path (collection-path collection) (build-path (collection-path collection)
(strip-suffix file))))) (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)) (make-mzscheme-launcher (list "-l-" (string-append collection "/" file))
dest dest
(build-aux-from-path (build-aux-from-path
(build-path (collection-path collection) (build-path (collection-path collection)
(strip-suffix file))))) (strip-suffix file)))))
(define (make-mzscheme-program-launcher file collection dest)
(make-racket-program-launcher file collection dest))
(define (unix-sfx file mred?) (define (unix-sfx file mred?)
(string-downcase (regexp-replace* #px"\\s" file "-"))) (string-downcase (regexp-replace* #px"\\s" file "-")))
@ -571,25 +589,37 @@
(path-replace-suffix p #".app") (path-replace-suffix p #".app")
p)))) p))))
(define (mred-program-launcher-path name) (define (gracket-program-launcher-path name)
(program-launcher-path name #t)) (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) (case (system-type)
[(macosx) [(macosx)
(add-file-suffix (build-path (find-console-bin-dir) (unix-sfx name #f)) (add-file-suffix (build-path (find-console-bin-dir) (unix-sfx name #f))
(current-launcher-variant) (current-launcher-variant)
#f)] #f)]
[else (program-launcher-path name #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?) (define (mred-launcher-is-directory?)
#f) #f)
(define (mzscheme-launcher-is-directory?) (define (mzscheme-launcher-is-directory?)
#f) #f)
(define (mred-launcher-is-actually-directory?) (define (gracket-launcher-is-actually-directory?)
(and (eq? 'macosx (system-type)) (and (eq? 'macosx (system-type))
(not (script-variant? (current-launcher-variant))))) (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?) (define (mzscheme-launcher-is-actually-directory?)
#f) #f)
@ -600,27 +630,39 @@
[(macosx) (values "app" '(packages) '(("App" "*.app")))] [(macosx) (values "app" '(packages) '(("App" "*.app")))]
[else (values #f null null)])) [else (values #f null null)]))
(define (mred-launcher-add-suffix path) (define (gracket-launcher-add-suffix path)
(embedding-executable-add-suffix path #t)) (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)) (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 (put-file-extension+style+filters
(if (and (eq? 'macosx (system-type)) (if (and (eq? 'macosx (system-type))
(script-variant? (current-launcher-variant))) (script-variant? (current-launcher-variant)))
'unix 'unix
(system-type)))) (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 (put-file-extension+style+filters
(if (eq? 'macosx (system-type)) 'unix (system-type)))) (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]) (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]) (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 (cond
;; When running Setup PLT under Windows, the ;; When running Setup PLT under Windows, the
;; launcher process stays running until MzScheme ;; launcher process stays running until MzScheme
@ -636,6 +678,14 @@
;; launchers. ;; launchers.
[else #f])) [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) (define (install-mred-program-launcher file collection name)
(make-mred-program-launcher file collection (make-mred-program-launcher file collection
(mred-program-launcher-path name))) (mred-program-launcher-path name)))

18
collects/meta/checker.ss
View File

@ -479,10 +479,18 @@
(define (set-bin-files-delayed-lists! p) (define (set-bin-files-delayed-lists! p)
(set! bin-files-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) (define (check-dependencies spec distname)
(add-dependency-contents!) (add-dependency-contents!)
(dprintf "Verifying dependencies for ~s..." distname) (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*) [deps0 (or (tree-filter `(and ,spec "*.dep") *plt-tree*)
(error 'check-dependencies (error 'check-dependencies
"got no .dep files for ~s" distname))] "got no .dep files for ~s" distname))]
@ -507,8 +515,12 @@
;; trees). No need to optimize since this happens very ;; trees). No need to optimize since this happens very
;; infrequently. ;; infrequently.
(let ([dep (regexp-replace #rx"/([^/]+)\\.([^/]+)$" (car deps) (let ([dep (regexp-replace #rx"/([^/]+)\\.([^/]+)$" (car deps)
"/compiled/\\1_\\2.zo")]) "/compiled/\\1_\\2.zo")]
(if (andmap (lambda (files) (member dep files)) [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)) (force bin-files-lists))
(loop files (cdr deps) (car deps)) (loop files (cdr deps) (car deps))
(error 'dependencies "unsatisfied dependency for ~s: ~s ~s" (error 'dependencies "unsatisfied dependency for ~s: ~s ~s"

14
collects/meta/dist-specs.ss
View File

@ -204,7 +204,7 @@ binary-keep/throw-templates :=
(cond win => "/plt/*<!>.exe" (cond win => "/plt/*<!>.exe"
"/plt/lib/**/lib*<!>???????.{dll|lib|exp}" "/plt/lib/**/lib*<!>???????.{dll|lib|exp}"
mac => "/plt/*<!>.app/" mac => "/plt/*<!>.app/"
"/plt/lib/PLT_*.framework/Versions/*<_!>/") "/plt/lib/*Racket*.framework/Versions/*<_!>/")
"/plt/collects/**/compiled/**/<!/>*.*" "/plt/collects/**/compiled/**/<!/>*.*"
binary-keep := "3[mM]" binary-keep := "3[mM]"
@ -332,7 +332,7 @@ mz-base := "/plt/readme.txt" ; generated
(cond (not src) => (collects: "info-domain/")) ; filtered (cond (not src) => (collects: "info-domain/")) ; filtered
(package: "config") (package: "config")
;; basic code ;; basic code
(collects: "scheme" "s-exp" "reader") (collects: "scheme" "s-exp" "reader" "racket")
;; include the time-stamp collection when not a public release ;; include the time-stamp collection when not a public release
(cond (not release) (cond (not release)
=> (- (collects: "repos-time-stamp/") => (- (collects: "repos-time-stamp/")
@ -391,14 +391,14 @@ foreign-src := (src: "foreign/{Makefile.in|README}"
;; queries have no point elsewhere.) ;; queries have no point elsewhere.)
mz-bins := (lib: "buildinfo" "**/mzdyn{|w}{|3[mM]|cgc|CGC}.{o|obj|exp|def}") mz-bins := (lib: "buildinfo" "**/mzdyn{|w}{|3[mM]|cgc|CGC}.{o|obj|exp|def}")
(cond mac => (lib: "PLT_MzScheme*/") (cond mac => (lib: "Racket*/")
win => (dll: "libmz{gc|sch}" "UnicoWS" "iconv") win => (dll: "lib{mzgc|racket}" "UnicoWS" "iconv")
(lib: "gcc/{fixup|init}.o" "bcc/mzdynb.{obj|def}") (lib: "gcc/{fixup|init}.o" "bcc/mzdynb.{obj|def}")
unix => (lib: "starter")) unix => (lib: "starter"))
extra-dynlibs extra-dynlibs
mr-bins := (cond mac => (lib: "PLT_MrEd*/") mr-bins := (cond mac => (lib: "GRacket*/")
win => (dll: "libmred")) win => (dll: "libgracket"))
extra-dynlibs := (cond win => (dll: "{ssl|lib}eay32")) extra-dynlibs := (cond win => (dll: "{ssl|lib}eay32"))
@ -411,10 +411,12 @@ binaries := (+ "/plt/bin/"
"/plt/include/" "/plt/include/"
"/plt/collects/**/compiled/native/" "/plt/collects/**/compiled/native/"
(cond unix => "/plt/bin/{mzscheme|mred}*" (cond unix => "/plt/bin/{mzscheme|mred}*"
"/plt/bin/{|g}racket*"
win => "/plt/*.exe" win => "/plt/*.exe"
"/plt/*.dll" "/plt/*.dll"
"/plt/collects/launcher/*.exe" "/plt/collects/launcher/*.exe"
mac => "/plt/bin/mzscheme*" mac => "/plt/bin/mzscheme*"
"/plt/bin/racket*"
"/plt/*.app" "/plt/*.app"
"/plt/collects/launcher/*.app") "/plt/collects/launcher/*.app")
platform-dependent) platform-dependent)

38
collects/mred/installer.ss
View File

@ -1,27 +1,51 @@
#lang scheme/base #lang scheme/base
(require launcher) (require launcher compiler/embed)
(provide post-installer) (provide post-installer)
(define (post-installer path) (define (post-installer path)
(define variants (available-mred-variants)) (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) ;; add a mred-text executable that uses the -z flag (preferring a script)
(for ([vs '((script-3m 3m) (script-cgc cgc))]) (for ([vs '((script-3m 3m) (script-cgc cgc))])
(let ([v (findf (lambda (v) (memq v variants)) vs)]) (let ([v (findf (lambda (v) (memq v variants)) vs)])
(when v (when v
(parameterize ([current-launcher-variant v]) (parameterize ([current-launcher-variant v])
(make-mred-launcher (make-gracket-launcher
'("-z") '("-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") (mred-program-launcher-path "mred-text")
'([relative? . #t] [subsystem . console] [single-instance? . #f] '([relative? . #t] [subsystem . console] [single-instance? . #f]
;; the following two are required to avoid using a full path, ;; the following two are required to avoid using a full path,
;; should be removed when `relative?' will imply this ;; should be removed when `relative?' will imply this
[framework-root . #f] [dll-dir . #f])))))) [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)) (when (eq? 'macosx (system-type))
(for ([v variants] #:when (memq v '(script-3m script-cgc))) (for ([v variants] #:when (memq v '(script-3m script-cgc)))
(parameterize ([current-launcher-variant v]) (parameterize ([current-launcher-variant v])
(make-mred-launcher null (make-gracket-launcher
(mred-program-launcher-path "MrEd") '()
'([exe-name . "MrEd"] [relative? . #t] (mred-program-launcher-path "GRacket")
[framework-root . #f] [dll-dir . #f])))))) '([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]))))))

6
collects/mred/private/repl.ss
View File

@ -50,14 +50,14 @@
(super-init) (super-init)
(let ([s (last-position)] (let ([s (last-position)]
[m (regexp-match #rx"^(.*), (Copyright.*)$" (banner))]) [m (regexp-match #rx"^(.*), (Copyright.*)$" (banner))])
(insert (format "Welcome to ~a." (cadr m))) (insert (format "~a." (cadr m)))
(let ([e (last-position)]) (let ([e (last-position)])
(insert #\newline) (insert #\newline)
(change-style (send (make-object wx:style-delta% 'change-bold) set-delta-foreground "BLUE") s e)) (change-style (send (make-object wx:style-delta% 'change-bold) set-delta-foreground "BLUE") s e))
(output (caddr m))) (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)]) (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)]) (let ([e (last-position)])
(insert #\newline) (insert #\newline)
(change-style (change-style

2
collects/mzlib/restart.ss
View File

@ -111,7 +111,7 @@
(init-namespace) (init-namespace)
(when scheme? (when scheme?
(namespace-require 'scheme)) (namespace-require 'scheme/init))
(let/ec k (let/ec k
(exit-handler (exit-handler

2
collects/mzscheme/info.ss
View File

@ -2,6 +2,8 @@
(define version '(400)) (define version '(400))
(define post-install-collection "installer.ss")
(define scribblings '(("mzscheme.scrbl" (multi-page) (legacy)))) (define scribblings '(("mzscheme.scrbl" (multi-page) (legacy))))
(define compile-omit-paths '("examples")) (define compile-omit-paths '("examples"))

16
collects/mzscheme/installer.ss Normal file
View File

@ -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)))))

3
collects/racket/gui/info.ss Normal file
View File

@ -0,0 +1,3 @@
#lang setup/infotab
(define post-install-collection "installer.ss")

6
collects/racket/gui/init.ss Normal file
View File

@ -0,0 +1,6 @@
#lang racket
(require racket/init
scheme/gui/base)
(provide (all-from-out racket/init
scheme/gui/base))

27
collects/racket/gui/installer.ss Normal file
View File

@ -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]))))))

4
collects/rico/info.ss
View File

@ -2,5 +2,5 @@
(define compile-omit-paths '("main.ss")) (define compile-omit-paths '("main.ss"))
(define mzscheme-launcher-libraries '("main.ss")) (define racket-launcher-libraries '("main.ss"))
(define mzscheme-launcher-names '("Rico")) (define racket-launcher-names '("Rico"))

8
collects/scribblings/mzc/exe-api.scrbl
View File

@ -243,6 +243,14 @@ currently supported keys are as follows:
executable, instead of a wrapper binary that execs the executable, instead of a wrapper binary that execs the
original; the default is @scheme[#f].} 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 If the @scheme[#:collects-path] argument is @scheme[#f], then the

18
collects/setup/setup-unit.ss
View File

@ -834,8 +834,15 @@
kind mzlns kind mzlns
(if (eq? 'l fault) "library" "flags") (if (eq? 'l fault) "library" "flags")
(if (eq? fault 'l) mzlls mzlfs)))])) (if (eq? fault 'l) mzlls mzlfs)))]))
(for ([variant (available-mred-variants)]) (for ([variant (available-gracket-variants)])
(parameterize ([current-launcher-variant variant]) (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 (make-launcher 'gui
'mred-launcher-names 'mred-launcher-names
'mred-launcher-libraries 'mred-launcher-libraries
@ -843,8 +850,15 @@
mred-program-launcher-path mred-program-launcher-path
make-mred-launcher make-mred-launcher
mred-launcher-up-to-date?))) mred-launcher-up-to-date?)))
(for ([variant (available-mzscheme-variants)]) (for ([variant (available-racket-variants)])
(parameterize ([current-launcher-variant variant]) (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 (make-launcher 'console
'mzscheme-launcher-names 'mzscheme-launcher-names
'mzscheme-launcher-libraries 'mzscheme-launcher-libraries

6
collects/setup/variant.ss
View File

@ -6,11 +6,11 @@
(define plain-mz-is-cgc? (define plain-mz-is-cgc?
(delay (let* ([dir (find-console-bin-dir)] (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)) [(equal? #".dll" (system-type 'so-suffix))
;; in cygwin so-suffix is ".dll" ;; in cygwin so-suffix is ".dll"
"mzscheme.exe"] "racket.exe"]
[else "mzscheme"])] [else "racket"])]
[f (build-path dir exe)]) [f (build-path dir exe)])
(and (file-exists? f) (and (file-exists? f)
(with-input-from-file f (with-input-from-file f

38
src/Makefile.in
View File

@ -1,5 +1,5 @@
# Builds MzScheme and MrEd (if enabled), and # Builds Racket and GRacket (if enabled), and
# drives the main install # drives the main install
srcdir = @srcdir@ srcdir = @srcdir@
@ -30,9 +30,9 @@ all:
3m: 3m:
cd mzscheme; $(MAKE) 3m cd mzscheme; $(MAKE) 3m
$(MAKE) @MAKE_MRED@-3m $(MAKE) @MAKE_GRACKET@-3m
mred-3m: gracket-3m:
cd mred; $(MAKE) 3m cd mred; $(MAKE) 3m
no-3m: no-3m:
@ -40,9 +40,9 @@ no-3m:
cgc: cgc:
cd mzscheme; $(MAKE) cgc cd mzscheme; $(MAKE) cgc
$(MAKE) @MAKE_MRED@-cgc $(MAKE) @MAKE_GRACKET@-cgc
mred-cgc: gracket-cgc:
cd mred; $(MAKE) cgc cd mred; $(MAKE) cgc
no-cgc: no-cgc:
@ -54,7 +54,7 @@ both:
# Install (common) ---------------------------------------- # Install (common) ----------------------------------------
SETUP_ARGS = -X "$(DESTDIR)$(collectsdir)" -l setup SETUP_ARGS = -X "$(DESTDIR)$(collectsdir)" -N "rico setup" -l setup
install: install:
$(MAKE) install-@MAIN_VARIANT@ $(MAKE) install-@MAIN_VARIANT@
@ -70,7 +70,7 @@ install-common-first:
install-common-middle: install-common-middle:
$(MAKE) @MAKE_COPYTREE@-run $(MAKE) @MAKE_COPYTREE@-run
$(MAKE) install-@MAKE_MRED@-post-collects $(MAKE) install-@MAKE_GRACKET@-post-collects
$(MAKE) lib-finish $(MAKE) lib-finish
install-common-last: install-common-last:
@ -83,12 +83,12 @@ no-run:
$(NOOP) $(NOOP)
copytree-run: copytree-run:
mzscheme/mzscheme@CGC@ -u \ mzscheme/racket@CGC@ -u \
"$(srcdir)/../collects/setup/unixstyle-install.ss" \ "$(srcdir)/../collects/setup/unixstyle-install.ss" \
make-install-copytree "$(srcdir)/.." \ make-install-copytree "$(srcdir)/.." \
$(ALLDIRINFO) "@INSTALL_ORIG_TREE@" $(ALLDIRINFO) "@INSTALL_ORIG_TREE@"
install-mred-post-collects: install-gracket-post-collects:
cd mred; $(MAKE) install-post-collects cd mred; $(MAKE) install-post-collects
install-no-post-collects: install-no-post-collects:
@ -96,7 +96,7 @@ install-no-post-collects:
fix-paths: fix-paths:
if [ "$(DESTDIR)" != "" ]; then \ if [ "$(DESTDIR)" != "" ]; then \
mzscheme/mzscheme@CGC@ -u \ mzscheme/racket@CGC@ -u \
"$(srcdir)/../collects/setup/unixstyle-install.ss" \ "$(srcdir)/../collects/setup/unixstyle-install.ss" \
make-install-destdir-fix "$(srcdir)/.." \ make-install-destdir-fix "$(srcdir)/.." \
$(ALLDIRINFO) "@INSTALL_ORIG_TREE@"; \ $(ALLDIRINFO) "@INSTALL_ORIG_TREE@"; \
@ -107,12 +107,12 @@ fix-paths:
install-3m-common: install-3m-common:
$(MAKE) install-common-first $(MAKE) install-common-first
cd mzscheme; $(MAKE) install-3m cd mzscheme; $(MAKE) install-3m
$(MAKE) install-@MAKE_MRED@-3m $(MAKE) install-@MAKE_GRACKET@-3m
$(MAKE) install-common-middle $(MAKE) install-common-middle
install-3m: install-3m:
$(MAKE) install-3m-common $(MAKE) install-3m-common
mzscheme/mzscheme@MMM@ $(SETUP_ARGS) mzscheme/racket@MMM@ $(SETUP_ARGS)
$(MAKE) install-common-last $(MAKE) install-common-last
plain-install-3m: plain-install-3m:
@ -122,7 +122,7 @@ plain-install-3m:
install-no-3m: install-no-3m:
$(NOOP) $(NOOP)
install-mred-3m: install-gracket-3m:
cd mred; $(MAKE) install-3m cd mred; $(MAKE) install-3m
# CGC install ---------------------------------------- # CGC install ----------------------------------------
@ -130,12 +130,12 @@ install-mred-3m:
install-cgc-common: install-cgc-common:
$(MAKE) install-common-first $(MAKE) install-common-first
cd mzscheme; $(MAKE) install-cgc cd mzscheme; $(MAKE) install-cgc
$(MAKE) install-@MAKE_MRED@-cgc $(MAKE) install-@MAKE_GRACKET@-cgc
$(MAKE) install-common-middle $(MAKE) install-common-middle
install-cgc: install-cgc:
$(MAKE) install-cgc-common $(MAKE) install-cgc-common
mzscheme/mzscheme@CGC@ $(SETUP_ARGS) mzscheme/racket@CGC@ $(SETUP_ARGS)
$(MAKE) install-common-last $(MAKE) install-common-last
plain-install-cgc: plain-install-cgc:
@ -145,7 +145,7 @@ plain-install-cgc:
install-no-cgc: install-no-cgc:
$(NOOP) $(NOOP)
install-mred-cgc: install-gracket-cgc:
cd mred; $(MAKE) install-cgc cd mred; $(MAKE) install-cgc
# Both install ---------------------------------------- # Both install ----------------------------------------
@ -153,12 +153,12 @@ install-mred-cgc:
install-both-common: install-both-common:
$(MAKE) install-common-first $(MAKE) install-common-first
cd mzscheme; $(MAKE) install-both cd mzscheme; $(MAKE) install-both
$(MAKE) install-@MAKE_MRED@-both $(MAKE) install-@MAKE_GRACKET@-both
$(MAKE) install-common-middle $(MAKE) install-common-middle
install-both: install-both:
$(MAKE) install-both-common $(MAKE) install-both-common
mzscheme/mzscheme@MAIN_VARIANT@ $(SETUP_ARGS) mzscheme/racket@MAIN_VARIANT@ $(SETUP_ARGS)
$(MAKE) install-common-last $(MAKE) install-common-last
plain-install-both: plain-install-both:
@ -168,7 +168,7 @@ plain-install-both:
install-no-both: install-no-both:
$(NOOP) $(NOOP)
install-mred-both: install-gracket-both:
cd mred; $(MAKE) install-both cd mred; $(MAKE) install-both
# Clean ---------------------------------------- # Clean ----------------------------------------

97
src/configure vendored
View File

@ -708,14 +708,14 @@ INSTALL_ORIG_TREE
EXE_SUFFIX EXE_SUFFIX
MZRT_CGC_FLAGS MZRT_CGC_FLAGS
LIBATOM LIBATOM
MREDLINKER GRACKETLINKER
LIBSFX LIBSFX
WXLIBS WXLIBS
WXVARIANT WXVARIANT
ICP ICP
MRLIBINSTALL MRLIBINSTALL
LIBFINISH LIBFINISH
MAKE_MRED MAKE_GRACKET
MAKE_WBUILD MAKE_WBUILD
MAKE_COPYTREE MAKE_COPYTREE
MAKE_FINISH MAKE_FINISH
@ -734,8 +734,8 @@ FOREIGN_IF_USED
FOREIGN_OBJSLIB FOREIGN_OBJSLIB
FOREIGN_CONVENIENCE FOREIGN_CONVENIENCE
FOREIGNTARGET FOREIGNTARGET
LIBMZSCHEME_DEP LIBRACKET_DEP
LIBMRED_DEP LIBGRACKET_DEP
LTO LTO
LTA LTA
collectsdir collectsdir
@ -1335,7 +1335,7 @@ if test -n "$ac_init_help"; then
Optional Features: Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] --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-gl use OpenGL when available (enabled by default)
--enable-xrender use Xrender when available (enabled by default) --enable-xrender use Xrender when available (enabled by default)
--enable-xft use Xft 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-backtrace 3m: support GC backtrace dumps
--enable-float include support for single-precision floats --enable-float include support for single-precision floats
--enable-floatinstead compile to use single-precision by default --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-stackup assume "up" if stack direction cannot be determined
--enable-bigendian assume "big" if endianness cannot be determined --enable-bigendian assume "big" if endianness cannot be determined
--enable-oskit compile OSKit-based MzScheme kernel --enable-oskit compile OSKit-based Racket kernel
--enable-smalloskit compile small OSKit-based MzScheme kernel --enable-smalloskit compile small OSKit-based Racket kernel
--enable-wbuild compile and use wbuild for .w sources --enable-wbuild compile and use wbuild for .w sources
--enable-perl use perl to regenerate certain sources --enable-perl use perl to regenerate certain sources
--enable-gprof compile for profiling with gprof (gcc only) --enable-gprof compile for profiling with gprof (gcc only)
--enable-gcov compile to gather gcov statistics (gcc3 only) --enable-gcov compile to gather gcov statistics (gcc3 only)
--enable-noopt drop -O C flags --enable-noopt drop -O C flags
--enable-sdk=<path> use Mac OS X 10.4 SDK directory --enable-sdk=<path> 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-libfw install Mac OS X frameworks to /Library/Frameworks
--enable-userfw 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-macprefix allow --prefix with a Mac OS X install
--enable-mac64 do not force 32-bit build --enable-mac64 do not force 32-bit build
--enable-gc2-places-testing compile gc2 places tesging support
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --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" ac_config_headers="$ac_config_headers mzscheme/mzconfig.h"
# Check whether --enable-mred was given. # Check whether --enable-gracket was given.
if test "${enable_mred+set}" = set; then if test "${enable_gracket+set}" = set; then
enableval=$enable_mred; enableval=$enable_gracket;
else else
enable_mred=yes enable_gracket=yes
fi fi
@ -2041,6 +2042,11 @@ if test "${enable_mac64+set}" = set; then
fi 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 ####### ###### Get OS Type #######
@ -2064,7 +2070,7 @@ if test "${enable_smalloskit}" = "yes" ; then
fi fi
if test "${enable_oskit}" = "yes" ; then if test "${enable_oskit}" = "yes" ; then
enable_mred=no enable_gracket=no
fi fi
if test "${enable_dynlib}" = "no" ; then if test "${enable_dynlib}" = "no" ; then
@ -2114,6 +2120,12 @@ else
fi fi
fi fi
if test "${enable_gc2_places_testing}" = "yes" ; then
enable_shared=yes
enable_places=yes
fi
# Hack for the implementor: # Hack for the implementor:
if test "${enable_perl}" = "" ; then if test "${enable_perl}" = "" ; then
if test "$USER" = "mflatt" ; then if test "$USER" = "mflatt" ; then
@ -2198,15 +2210,15 @@ else
INSTALL_ORIG_TREE=no INSTALL_ORIG_TREE=no
fi 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 if test ! -d $srcdir/mred ; then
enable_mred=no enable_gracket=no
fi fi
fi fi
if test "${enable_mred}" = "no" ; then if test "${enable_gracket}" = "no" ; then
enable_wbuild=no enable_wbuild=no
enable_xrender=no enable_xrender=no
enable_cairo=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_xonx}" "X-on-X"
show_explicitly_enabled "${enable_shared}" "Shared libraries" show_explicitly_enabled "${enable_shared}" "Shared libraries"
show_explicitly_disabled "${enable_mred}" MrEd show_explicitly_disabled "${enable_gracket}" GRacket
if test "${enable_mred}" != "no" ; then if test "${enable_gracket}" != "no" ; then
show_explicitly_disabled "${enable_gl}" OpenGL show_explicitly_disabled "${enable_gl}" OpenGL
show_explicitly_disabled "${enable_xrender}" Xrender show_explicitly_disabled "${enable_xrender}" Xrender
show_explicitly_disabled "${enable_xft}" Xft show_explicitly_disabled "${enable_xft}" Xft
@ -2257,6 +2269,7 @@ show_explicitly_disabled "${enable_jit}" JIT
show_explicitly_disabled "${enable_foreign}" Foreign show_explicitly_disabled "${enable_foreign}" Foreign
show_explicitly_enabled "${enable_places}" Places show_explicitly_enabled "${enable_places}" Places
show_explicitly_enabled "${enable_gc2_places_testing}" "GC2 Places Testing"
show_explicitly_enabled "${enable_futures}" Futures show_explicitly_enabled "${enable_futures}" Futures
show_explicitly_disabled "${enable_futures}" Futures show_explicitly_disabled "${enable_futures}" Futures
@ -2321,7 +2334,7 @@ MZRT_CGC_FLAGS=""
LIBATOM="LIBATOM_NONE" LIBATOM="LIBATOM_NONE"
ar_libtool_no_undefined="" ar_libtool_no_undefined=""
LIBMZSCHEME_DEP="" LIBRACKET_DEP=""
XFT_EXTRA_FLAGS= XFT_EXTRA_FLAGS=
XFT_EXTRA_LIBS= XFT_EXTRA_LIBS=
@ -4311,7 +4324,7 @@ if test "$REZ" = '' ; then
REZ=/Developer/Tools/Rez REZ=/Developer/Tools/Rez
fi fi
if test "${enable_mred}" = "yes" ; then if test "${enable_gracket}" = "yes" ; then
if test "${enable_quartz}" = "yes" ; then if test "${enable_quartz}" = "yes" ; then
: :
else else
@ -5633,9 +5646,9 @@ fi
fi fi
MAKE_MRED=mred MAKE_GRACKET=gracket
else else
MAKE_MRED=no MAKE_GRACKET=no
fi fi
@ -5817,7 +5830,7 @@ EXTRALIBS=
# for gmp assembly: # for gmp assembly:
EXTRA_GMP_OBJ= EXTRA_GMP_OBJ=
# For MzScheme targets: # For Racket targets:
OSX=".osx" OSX=".osx"
NOT_OSX="" NOT_OSX=""
CGC_X86_64="" CGC_X86_64=""
@ -5837,7 +5850,7 @@ case $OS in
;; ;;
AIX) AIX)
enable_cgcdefault="yes" enable_cgcdefault="yes"
EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../mzscheme/include/mzscheme.exp" EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../mzscheme/include/racket.exp"
;; ;;
FreeBSD) FreeBSD)
LIBS="$LIBS -rdynamic" LIBS="$LIBS -rdynamic"
@ -5917,8 +5930,8 @@ case $OS in
MZINSTALLTARGET=unix-cygwin-install MZINSTALLTARGET=unix-cygwin-install
if test "${enable_shared}" = "yes" ; then if test "${enable_shared}" = "yes" ; then
ar_libtool_no_undefined=" -no-undefined" ar_libtool_no_undefined=" -no-undefined"
LIBMZSCHEME_DEP="libmzgc.la -liconv" LIBRACKET_DEP="libmzgc.la -liconv"
LIBMRED_DEP="../mzscheme/libmzgc.la ../mzscheme/libmred.la" LIBGRACKET_DEP="../mzscheme/libmzgc.la ../mzscheme/libgracket.la"
fi fi
EXE_SUFFIX=".exe" EXE_SUFFIX=".exe"
;; ;;
@ -9472,6 +9485,16 @@ _ACEOF
fi fi
############### GC2_PLACES_TESTING ###################
if test "${enable_gc2_places_testing}" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
#define GC2_PLACES_TESTING 1
_ACEOF
fi
############### places ################### ############### places ###################
if test "${enable_places}" = "yes" ; then if test "${enable_places}" = "yes" ; then
@ -9653,7 +9676,7 @@ fi
############## C++ grunge ################ ############## C++ grunge ################
if test "${enable_mred}" = "yes" ; then if test "${enable_gracket}" = "yes" ; then
CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS"
ac_ext=cpp ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS' ac_cpp='$CXXCPP $CPPFLAGS'
@ -10441,7 +10464,7 @@ fi
else else
echo "******************************************************" echo "******************************************************"
echo "configure: cannot find X11 development files that are" echo "configure: cannot find X11 development files that are"
echo " needed to compile MrEd:" echo " needed to compile GRacket:"
echo "$xmissing" echo "$xmissing"
echo "******************************************************" echo "******************************************************"
echo configure aborted echo configure aborted
@ -12003,7 +12026,7 @@ if test "${enable_shared}" = "yes" ; then
ARFLAGS="" ARFLAGS=""
RANLIB=":" RANLIB=":"
MZLINKER="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc} -rpath ${abslibdir}" 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" PLAIN_CC="$CC"
CC="${LIBTOOLPROG} --mode=compile --tag=CC $CC" CC="${LIBTOOLPROG} --mode=compile --tag=CC $CC"
CXX="${LIBTOOLPROG} --mode=compile --tag=CXX $CXX" CXX="${LIBTOOLPROG} --mode=compile --tag=CXX $CXX"
@ -12020,7 +12043,7 @@ if test "${enable_shared}" = "yes" ; then
MZOPTIONS="$MZOPTIONS -DMZ_USES_SHARED_LIB" MZOPTIONS="$MZOPTIONS -DMZ_USES_SHARED_LIB"
else else
LIBSFX=a LIBSFX=a
MREDLINKER='$(CXX)' GRACKETLINKER='$(CXX)'
WXLIBS=WXLIBSNORM WXLIBS=WXLIBSNORM
ICP=cp ICP=cp
MRLIBINSTALL="install-no-lib" MRLIBINSTALL="install-no-lib"
@ -12245,7 +12268,7 @@ else
fi fi
ac_configure_args="$ac_configure_args$SUB_CONFIGURE_EXTRAS" 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 if test "${enable_quartz}" = "yes" ; then
mk_needed_dir wxmac mk_needed_dir wxmac
mk_needed_dir wxmac/src mk_needed_dir wxmac/src
@ -13061,7 +13084,7 @@ INSTALL_ORIG_TREE!$INSTALL_ORIG_TREE$ac_delim
EXE_SUFFIX!$EXE_SUFFIX$ac_delim EXE_SUFFIX!$EXE_SUFFIX$ac_delim
MZRT_CGC_FLAGS!$MZRT_CGC_FLAGS$ac_delim MZRT_CGC_FLAGS!$MZRT_CGC_FLAGS$ac_delim
LIBATOM!$LIBATOM$ac_delim LIBATOM!$LIBATOM$ac_delim
MREDLINKER!$MREDLINKER$ac_delim GRACKETLINKER!$GRACKETLINKER$ac_delim
LIBSFX!$LIBSFX$ac_delim LIBSFX!$LIBSFX$ac_delim
WXLIBS!$WXLIBS$ac_delim WXLIBS!$WXLIBS$ac_delim
_ACEOF _ACEOF
@ -13109,7 +13132,7 @@ WXVARIANT!$WXVARIANT$ac_delim
ICP!$ICP$ac_delim ICP!$ICP$ac_delim
MRLIBINSTALL!$MRLIBINSTALL$ac_delim MRLIBINSTALL!$MRLIBINSTALL$ac_delim
LIBFINISH!$LIBFINISH$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_WBUILD!$MAKE_WBUILD$ac_delim
MAKE_COPYTREE!$MAKE_COPYTREE$ac_delim MAKE_COPYTREE!$MAKE_COPYTREE$ac_delim
MAKE_FINISH!$MAKE_FINISH$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_OBJSLIB!$FOREIGN_OBJSLIB$ac_delim
FOREIGN_CONVENIENCE!$FOREIGN_CONVENIENCE$ac_delim FOREIGN_CONVENIENCE!$FOREIGN_CONVENIENCE$ac_delim
FOREIGNTARGET!$FOREIGNTARGET$ac_delim FOREIGNTARGET!$FOREIGNTARGET$ac_delim
LIBMZSCHEME_DEP!$LIBMZSCHEME_DEP$ac_delim LIBRACKET_DEP!$LIBRACKET_DEP$ac_delim
LIBMRED_DEP!$LIBMRED_DEP$ac_delim LIBGRACKET_DEP!$LIBGRACKET_DEP$ac_delim
LTO!$LTO$ac_delim LTO!$LTO$ac_delim
LTA!$LTA$ac_delim LTA!$LTA$ac_delim
collectsdir!$collectsdir$ac_delim collectsdir!$collectsdir$ac_delim

20
src/mac/osx_appl.ss
View File

@ -1,9 +1,9 @@
#| #|
# OS X pre-make script # 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 # and srcdir must be provided as the first argument
|# |#
@ -24,15 +24,15 @@
; Rez where needed: ; Rez where needed:
(let* ([cw-path (build-path plthome "src" "mac" "cw")] (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")) (printf "Writing ~a~n" (string-append app ".rsrc.OSX"))
(system* rez-path (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" "-UseDF" "-o"
(path->string (path->string
(path-replace-suffix app #".rsrc.OSX"))))]) (path-replace-suffix app #".rsrc.OSX"))))])
; (rez-it "MzScheme") ; useless under OS X... ; (rez-it "MzScheme") ; useless under OS X...
(rez-it "MrEd")) (rez-it "GRacket" "MrEd"))
; make .app templates in the right places: ; make .app templates in the right places:
@ -91,7 +91,7 @@
(realize-template fw-path fw-template-tree) (realize-template fw-path fw-template-tree)
(write-info (build-path fw-path "Resources") info-plist) (write-info (build-path fw-path "Resources") info-plist)
;; maybe someday we'll have Contents/Resources/English.lproj ? ;; 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))]) [rsrc-dest (build-path fw-path "Resources" (format "~a.rsrc" fw-name))])
(when (file-exists? rsrc-dest) (when (file-exists? rsrc-dest)
(delete-file rsrc-dest)) (delete-file rsrc-dest))
@ -121,14 +121,14 @@
,(version)))) ,(version))))
(create-app (build-path (current-directory) (if for-3m? 'up 'same)) (create-app (build-path (current-directory) (if for-3m? 'up 'same))
(string-append "MrEd" suffix) (string-append "GRacket" suffix)
"MrEd" "MrEd"
"APPLmReD" "APPLmReD"
(make-info-plist (string-append "MrEd" suffix) "mReD" #t)) (make-info-plist (string-append "GRacket" suffix) "mReD" #t))
(create-fw (current-directory) (create-fw (current-directory)
"PLT_MrEd" "GRacket"
(make-info-plist "PLT_MrEd" "MrEd" #f)) (make-info-plist "GRacket" "GRacket" #f))
(create-app (build-path (current-directory) (if for-3m? 'up 'same)) (create-app (build-path (current-directory) (if for-3m? 'up 'same))
"Starter" "Starter"

130
src/mred/Makefile.in
View File

@ -1,5 +1,5 @@
# #
# Makefile for mred # Makefile for gracket
# #
srcdir = @srcdir@ srcdir = @srcdir@
@ -52,7 +52,7 @@ LDFLAGS = @LDFLAGS@ $(XLIB)
ARLIBFLAGS = $(LDFLAGS) $(LDLIBS) ARLIBFLAGS = $(LDFLAGS) $(LDLIBS)
########################### ###########################
MREDLINKER = @MREDLINKER@ GRACKETLINKER = @GRACKETLINKER@
JPEG_A = ../wxcommon/jpeg/libjpeg.@LIBSFX@ JPEG_A = ../wxcommon/jpeg/libjpeg.@LIBSFX@
JPEG_INC = -I../wxcommon/jpeg -I$(srcdir)/../wxcommon/jpeg JPEG_INC = -I../wxcommon/jpeg -I$(srcdir)/../wxcommon/jpeg
@ -62,24 +62,24 @@ PNG_A = ../wxcommon/libpng/libpng.@LIBSFX@
EXTRALDFLAGS_wx_xt = EXTRALDFLAGS_wx_xt =
EXTRALDFLAGS_wx_mac = -framework Carbon -framework Cocoa -framework QuickTime -framework AGL -framework OpenGL -lz 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@ 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@ WXLIBS_wx_mac = ../wxmac/src/libwxmac.@LIBSFX@
MREDX_wx_mac = mredmac.@LTO@ simpledrop.@LTO@ GRACKETX_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@ WXLIBSNORM = mred.@LTO@ $(GRACKETX_@WXVARIANT@) wxGC.@LTO@ wxJPEG.@LTO@ wxs/libwxscheme.@LIBSFX@ $(WXLIBS_@WXVARIANT@) @JPEG_A@ @PNG_A@ @ZLIB_A@
WXLIBSDYN = libmred.@LIBSFX@ WXLIBSDYN = libgracket.@LIBSFX@
GUILIBS_wx_xt = $(LDLIBS) GUILIBS_wx_xt = $(LDLIBS)
GUILIBS_wx_mac = @LIBS@ 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_xt = @WX_MMD_FLAG@
LOCALFLAGS_wx_mac = -I$(srcdir)/../mac/mzscheme -MMD -DWX_CARBON LOCALFLAGS_wx_mac = -I$(srcdir)/../mac/mzscheme -MMD -DWX_CARBON
LOCALFLAGS = $(LOCALFLAGS_@WXVARIANT@) 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@ WXSCHEME = wxs/libwxscheme.@LIBSFX@
INSTALLDEST=/home/scheme/plt INSTALLDEST=/home/scheme/plt
@ -94,8 +94,8 @@ WXINCDEP = $(WXINCDEP_@WXVARIANT@)
MZEXTRAEXPORT='GCDIR=$(GCDIRECTORY)' MZEXTRAEXPORT='GCDIR=$(GCDIRECTORY)'
LINKRESULT_wx_xt = mred@CGC@ LINKRESULT_wx_xt = gracket@CGC@
LINKRESULT_wx_mac = MrEd@CGC@.app/Contents/MacOS/MrEd@CGC@ LINKRESULT_wx_mac = GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@
LINKRESULT = $(LINKRESULT_@WXVARIANT@) LINKRESULT = $(LINKRESULT_@WXVARIANT@)
bin: bin:
@ -121,41 +121,41 @@ both:
ext-libs: @JPEG_A@ @PNG_A@ @ZLIB_A@ ext-libs: @JPEG_A@ @PNG_A@ @ZLIB_A@
$(NOOP) $(NOOP)
mred@CGC@ : $(MZSCHEMEDEPS) mrmain.@LTO@ $(MREDOBJECTS) $(@WXLIBS@) $(MRSTATIC_STUB) gracket@CGC@ : $(RACKETDEPS) mrmain.@LTO@ $(GRACKETOBJECTS) $(@WXLIBS@) $(MRSTATIC_STUB)
$(MREDLINKER) $(MREDLDFLAGS) $(MRSTATIC) -o mred@CGC@ $(MREDOBJECTS) $(MREDLDLIBS) $(MRSTATIC_STUB) $(GRACKETLINKER) $(GRACKETLDFLAGS) $(MRSTATIC) -o gracket@CGC@ $(GRACKETOBJECTS) $(GRACKETLDLIBS) $(MRSTATIC_STUB)
libmred.@LIBSFX@: $(WXLIBSNORM) libgracket.@LIBSFX@: $(WXLIBSNORM)
$(AR) $(ARFLAGS) libmred.@LIBSFX@ $(WXLIBSNORM) @LIBMRED_DEP@ $(AR) $(ARFLAGS) libgracket.@LIBSFX@ $(WXLIBSNORM) @LIBGRACKET_DEP@
MRFW = PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd MRFW = GRacket.framework/Versions/$(FWVERSION)/GRacket
MRFWRES = PLT_MrEd.framework/Versions/$(FWVERSION)/Resources/PLT_MrEd.rsrc MRFWRES = GRacket.framework/Versions/$(FWVERSION)/Resources/GRacket.rsrc
$(MRFW) : $(MZSCHEMEDEPS) $(MREDOBJECTS) $(@WXLIBS@) $(MRSTATIC_STUB) $(MRFWRES) $(MRFW) : $(RACKETDEPS) $(GRACKETOBJECTS) $(@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@ $(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@ GRacket@CGC@.app/Contents/MacOS/GRacket@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@ $(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 "PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" MrEd@CGC@.app/Contents/MacOS/MrEd@CGC@ /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/MrEd.r
rm -rf PLT_MrEd.framework/Resources PLT_MrEd.framework/PLT_MrEd rm -rf GRacket.framework/Resources GRacket.framework/GRacket
env BUILDBASE=.. ../mzscheme/mzscheme@CGC@ -cqu $(srcdir)/../mac/osx_appl.ss $(srcdir)/.. "@CGC@" env BUILDBASE=.. ../mzscheme/racket@CGC@ -cqu $(srcdir)/../mac/osx_appl.ss $(srcdir)/.. "@CGC@"
ln -s Versions/$(FWVERSION)/PLT_MrEd PLT_MrEd.framework/PLT_MrEd ln -s Versions/$(FWVERSION)/GRacket GRacket.framework/GRacket
ln -s Versions/$(FWVERSION)/Resources PLT_MrEd.framework/Resources ln -s Versions/$(FWVERSION)/Resources GRacket.framework/Resources
MZSCHEME = ../mzscheme/mzscheme@CGC@ RACKET = ../mzscheme/racket@CGC@
ee-app: mred mrmain_ee.@LTO@ ee-app: gracket 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 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@ 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: 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: linux-static:
$(MAKE) mred MRSTATIC=--static LDNONSTATICLIBS='-ldl' $(MAKE) gracket MRSTATIC=--static LDNONSTATICLIBS='-ldl'
wx_xt: wx_xt:
cd ../wxxt/src/x; $(MAKE) cd ../wxxt/src/x; $(MAKE)
@ -233,7 +233,7 @@ CLEANDIR_wx_mac = ../wxmac/src
clean: clean:
cd $(CLEANDIR_@WXVARIANT@); $(MAKE) 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 -f gc2/*.@LTO@ gc2/xsrc/* gc2/macxsrc/* gc2/*.d gc2/*.dd
rm -rf gc2/xform-collects rm -rf gc2/xform-collects
cd wxs; $(MAKE) clean cd wxs; $(MAKE) clean
@ -247,8 +247,8 @@ clean_wx_xt:
echo clean done echo clean done
clean_wx_mac: clean_wx_mac:
rm -rf PLT_MrEd.framework MrEd@CGC@.app Starter.app MrEd@MMM@.app MrEd.rsrc.OSX rm -rf GRacket.framework GRacket@CGC@.app Starter.app GRacket@MMM@.app GRacket.rsrc.OSX
rm -rf gc2/PLT_MrEd.framework gc2/MrEd.rsrc.OSX gc2/*.pfe gc2/macxsrc/* rm -rf gc2/GRacket.framework gc2/GRacket.rsrc.OSX gc2/*.pfe gc2/macxsrc/*
echo clean done echo clean done
ICP=@ICP@ ICP=@ICP@
@ -280,15 +280,15 @@ install-post-collects:
$(MAKE) install-@WXVARIANT@-post-collects $(MAKE) install-@WXVARIANT@-post-collects
install-common: install-common:
cd ..; rm -f "$(DESTDIR)$(bindir)/mred@CGC_INSTALLED@" cd ..; rm -f "$(DESTDIR)$(bindir)/gracket@CGC_INSTALLED@"
cd ..; rm -f "$(DESTDIR)$(bindir)/mred@MMM_INSTALLED@" cd ..; rm -f "$(DESTDIR)$(bindir)/gracket@MMM_INSTALLED@"
cd ..; echo 'CXX=@CXX@' >> $(BUILDINFO) cd ..; echo 'CXX=@CXX@' >> $(BUILDINFO)
cd ..; echo 'CXXFLAGS=@CXXFLAGS@ @PREFLAGS@ @COMPFLAGS@' >> $(BUILDINFO) cd ..; echo 'CXXFLAGS=@CXXFLAGS@ @PREFLAGS@ @COMPFLAGS@' >> $(BUILDINFO)
cd ..; echo 'MROPTIONS=@MROPTIONS@' >> $(BUILDINFO) cd ..; echo 'MROPTIONS=@MROPTIONS@' >> $(BUILDINFO)
cd ..; echo 'X_CFLAGS=@X_CFLAGS@' >> $(BUILDINFO) cd ..; echo 'X_CFLAGS=@X_CFLAGS@' >> $(BUILDINFO)
cd ..; echo 'X_LIB=@X_LIBS@' >> $(BUILDINFO) cd ..; echo 'X_LIB=@X_LIBS@' >> $(BUILDINFO)
cd ..; echo "MRLIBS=$(GUILIBS_@WXVARIANT@)" >> $(BUILDINFO) cd ..; echo "MRLIBS=$(GUILIBS_@WXVARIANT@)" >> $(BUILDINFO)
cd ..; echo "MRLDFLAGS=$(MREDLDFLAGS)" >> $(BUILDINFO) cd ..; echo "MRLDFLAGS=$(GRACKETLDFLAGS)" >> $(BUILDINFO)
# X11 ---------------------------------------- # X11 ----------------------------------------
@ -300,12 +300,12 @@ install-no-lib-cgc-wx_xt:
echo "no dynamic libs" echo "no dynamic libs"
install-lib-cgc-wx_xt: install-lib-cgc-wx_xt:
cd ..; $(ICP) mred/libmred.@LIBSFX@ "$(DESTDIR)$(libdir)" cd ..; $(ICP) mred/libgracket.@LIBSFX@ "$(DESTDIR)$(libdir)"
install-wx_xt-cgc: install-wx_xt-cgc:
$(MAKE) @MRLIBINSTALL@-cgc-wx_xt $(MAKE) @MRLIBINSTALL@-cgc-wx_xt
cd ..; $(ICP) mred/mred@CGC@ "$(DESTDIR)$(bindir)/mred@CGC_INSTALLED@" cd ..; $(ICP) mred/gracket@CGC@ "$(DESTDIR)$(bindir)/gracket@CGC_INSTALLED@"
$(MZSCHEME) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(DESTDIR)$(bindir)/mred@CGC_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ $(RACKET) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(DESTDIR)$(bindir)/gracket@CGC_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@
install-wx_xt-cgc-final: install-wx_xt-cgc-final:
$(NOOP) $(NOOP)
@ -314,12 +314,12 @@ install-no-lib-3m-wx_xt:
echo "no dynamic libs" echo "no dynamic libs"
install-lib-3m-wx_xt: install-lib-3m-wx_xt:
cd ..; $(ICP) mred/libmred3m.@LIBSFX@ "$(DESTDIR)$(libdir)" cd ..; $(ICP) mred/libgracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)"
install-wx_xt-3m: install-wx_xt-3m:
$(MAKE) @MRLIBINSTALL@-3m-wx_xt $(MAKE) @MRLIBINSTALL@-3m-wx_xt
cd ..; $(ICP) mred/mred@MMM@ "$(DESTDIR)$(bindir)/mred@MMM_INSTALLED@" cd ..; $(ICP) mred/gracket@MMM@ "$(DESTDIR)$(bindir)/gracket@MMM_INSTALLED@"
$(MZSCHEME) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(DESTDIR)$(bindir)/mred@MMM_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ $(RACKET) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(DESTDIR)$(bindir)/gracket@MMM_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@
install-wx_xt-3m-final: install-wx_xt-3m-final:
$(NOOP) $(NOOP)
@ -329,45 +329,45 @@ install-wx_xt-post-collects:
# Mac OS X ---------------------------------------- # Mac OS X ----------------------------------------
MRFWDIR = @FRAMEWORK_INSTALL_DIR@/PLT_MrEd.framework MRFWDIR = @FRAMEWORK_INSTALL_DIR@/GRacket.framework
FRAMEWORK_REL_PREFIX="@executable_path/../../../lib/" FRAMEWORK_REL_PREFIX="@executable_path/../../../lib/"
install-wx_mac: install-wx_mac:
rm -rf $(MRFWDIR)/Versions/$(FWVERSION) rm -rf $(MRFWDIR)/Versions/$(FWVERSION)
rm -rf $(MRFWDIR)/Versions/$(FWVERSION)_3m rm -rf $(MRFWDIR)/Versions/$(FWVERSION)_3m
rm -f $(MRFWDIR)/PLT_MrEd rm -f $(MRFWDIR)/GRacket
rm -rf $(MRFWDIR)/Resources rm -rf $(MRFWDIR)/Resources
cd ..; rm -rf "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app" cd ..; rm -rf "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app"
cd ..; rm -rf "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app" cd ..; rm -rf "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app"
if [ @FRAMEWORK_REL_INSTALL@ = yes ] ; then rm -rf $(MRFWDIR) ; fi if [ @FRAMEWORK_REL_INSTALL@ = yes ] ; then rm -rf $(MRFWDIR) ; fi
mkdir -p "@FRAMEWORK_INSTALL_DIR@" mkdir -p "@FRAMEWORK_INSTALL_DIR@"
install-wx_mac-cgc: install-wx_mac-cgc:
mkdir -p "$(MRFWDIR)/Versions/$(FWVERSION)" mkdir -p "$(MRFWDIR)/Versions/$(FWVERSION)"
cd ..; $(ICP) -r mred/MrEd@CGC@.app "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app" cd ..; $(ICP) -r mred/GRacket@CGC@.app "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app"
$(MZSCHEME) -cqu "$(srcdir)/../mac/rename-app.ss" "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app" "MrEd@CGC@" "MrEd@CGC_CAP_INSTALLED@" $(RACKET) -cqu "$(srcdir)/../mac/rename-app.ss" "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app" "GRacket@CGC@" "GRacket@CGC_CAP_INSTALLED@"
$(ICP) PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd $(MRFWDIR)/Versions/$(FWVERSION)/PLT_MrEd $(ICP) GRacket.framework/Versions/$(FWVERSION)/GRacket $(MRFWDIR)/Versions/$(FWVERSION)/GRacket
$(ICP) -r PLT_MrEd.framework/Versions/$(FWVERSION)/Resources $(MRFWDIR)/Versions/$(FWVERSION)/Resources $(ICP) -r GRacket.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@" /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@"
$(MZSCHEME) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app/Contents/MacOS/MrEd@CGC_CAP_INSTALLED@" ../../../collects $(RACKET) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@" ../../../collects
@STRIP_DEBUG@ "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app/Contents/MacOS/MrEd@CGC_CAP_INSTALLED@" @STRIP_DEBUG@ "$(prefix)/GRacket@CGC_CAP_INSTALLED@.app/Contents/MacOS/GRacket@CGC_CAP_INSTALLED@"
install-wx_mac-cgc-final: install-wx_mac-cgc-final:
ln -s Versions/$(FWVERSION)/PLT_MrEd $(MRFWDIR)/ ln -s Versions/$(FWVERSION)/GRacket $(MRFWDIR)/
ln -s Versions/$(FWVERSION)/Resources $(MRFWDIR)/ ln -s Versions/$(FWVERSION)/Resources $(MRFWDIR)/
install-wx_mac-3m: install-wx_mac-3m:
mkdir -p "$(MRFWDIR)/Versions/$(FWVERSION)_3m" mkdir -p "$(MRFWDIR)/Versions/$(FWVERSION)_3m"
cd ..; $(ICP) -r "mred/MrEd@MMM@.app" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app" cd ..; $(ICP) -r "mred/GRacket@MMM@.app" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app"
$(MZSCHEME) -cqu "$(srcdir)/../mac/rename-app.ss" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app" "MrEd@MMM@" "MrEd@MMM_CAP_INSTALLED@" $(RACKET) -cqu "$(srcdir)/../mac/rename-app.ss" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app" "GRacket@MMM@" "GRacket@MMM_CAP_INSTALLED@"
$(ICP) "PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "$(MRFWDIR)/Versions/$(FWVERSION)_3m/PLT_MrEd" $(ICP) "GRacket.framework/Versions/$(FWVERSION)_3m/GRacket" "$(MRFWDIR)/Versions/$(FWVERSION)_3m/GRacket"
$(ICP) -r "PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources" "$(MRFWDIR)/Versions/$(FWVERSION)_3m/Resources" $(ICP) -r "GRacket.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@" /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@"
$(MZSCHEME) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app/Contents/MacOS/MrEd@MMM_CAP_INSTALLED@" "../../../collects" $(RACKET) -cu "$(srcdir)/../mzscheme/collects-path.ss" "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@" "../../../collects"
@STRIP_DEBUG@ "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app/Contents/MacOS/MrEd@MMM_CAP_INSTALLED@" @STRIP_DEBUG@ "$(prefix)/GRacket@MMM_CAP_INSTALLED@.app/Contents/MacOS/GRacket@MMM_CAP_INSTALLED@"
install-wx_mac-3m-final: 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)/ ln -s Versions/$(FWVERSION)_3m/Resources $(MRFWDIR)/
install-wx_mac-post-collects: install-wx_mac-post-collects:

88
src/mred/gc2/Makefile.in
View File

@ -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_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/mzscheme
MZMMM_wx_xt = ../../mzscheme/mzscheme@MMM@ MZMMM_wx_xt = ../../mzscheme/racket@MMM@
MZMMM_wx_mac = ../../mzscheme/mzscheme@MMM@ MZMMM_wx_mac = ../../mzscheme/racket@MMM@
MZMMM = $(MZMMM_@WXVARIANT@) MZMMM = $(MZMMM_@WXVARIANT@)
XFORM_CMD = $(MZMMM) -cqu $(srcdir)/../../mzscheme/gc2/xform.ss --setup ../../mzscheme/gc2 XFORM_CMD = $(MZMMM) -cqu $(srcdir)/../../mzscheme/gc2/xform.ss --setup ../../mzscheme/gc2
@ -76,7 +76,7 @@ NONPRECOMPDEP = $(srcdir)/../../mzscheme/include/schthread.h
WXBDIR=../../wxxt WXBDIR=../../wxxt
WXMACBDIR=../../wxmac/src 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`"'"' DEF_COLLECTS_DIR = +D INITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../../collects; pwd`"'"'
@ -929,10 +929,10 @@ wx_mac_XSRCS = \
\ \
macxsrc/simpledrop.cc macxsrc/simpledrop.cc
MRED_wx_xt = mredx GRACKET_wx_xt = mredx
MRED_wx_mac = mredmac GRACKET_wx_mac = mredmac
MRED_XSRCS = \ GRACKET_XSRCS = \
xsrc/wxs_bmap.cc \ xsrc/wxs_bmap.cc \
xsrc/wxs_butn.cc \ xsrc/wxs_butn.cc \
xsrc/wxs_chce.cc \ xsrc/wxs_chce.cc \
@ -961,9 +961,9 @@ MRED_XSRCS = \
\ \
xsrc/mred.cc \ xsrc/mred.cc \
xsrc/mrmain.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@ \ wx_xt_XOBJS = Window.@LTO@ \
Button.@LTO@ \ Button.@LTO@ \
@ -1109,7 +1109,7 @@ wx_mac_XOBJS = \
\ \
simpledrop.@LTO@ simpledrop.@LTO@
MRED_XOBJS = \ GRACKET_XOBJS = \
wxs_bmap.@LTO@ \ wxs_bmap.@LTO@ \
wxs_butn.@LTO@ \ wxs_butn.@LTO@ \
wxs_chce.@LTO@ \ wxs_chce.@LTO@ \
@ -1137,14 +1137,14 @@ MRED_XOBJS = \
wxJPEG.@LTO@ \ wxJPEG.@LTO@ \
\ \
mred.@LTO@ \ mred.@LTO@ \
$(MRED_@WXVARIANT@).@LTO@ \ $(GRACKET_@WXVARIANT@).@LTO@ \
\ \
xcglue.@LTO@ \ xcglue.@LTO@ \
wxGC.@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 = \ wx_xt_PLAIN_OBJS = \
../../wxxt/src/XWidgets/xwArrow.@LTO@ \ ../../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_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@ 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_OBJS = ../../foreign/gcc/libffi/src/*.@LTO@ ../../foreign/gcc/libffi/src/*/*.@LTO@
FOREIGN_LIB = ../../foreign/gcc/libffi/libffi@FOREIGN_CONVENIENCE@.@LTA@ 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) EXTRA_MZ_OBJS = ../../mzscheme/src/gmp.@LTO@ $(EXTRA_GMP) ../../mzscheme/src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB)
LIBMREDLIBS_a = LIBGRACKETLIBS_a =
LIBMREDLIBS_la = $(LDFLAGS) $(LDLIBS) $(@WXVARIANT@_LIBS) LIBGRACKETLIBS_la = $(LDFLAGS) $(LDLIBS) $(@WXVARIANT@_LIBS)
LIBMREDMZOBJS_a = LIBGRACKETMZOBJS_a =
LIBMREDMZOBJS_la = $(MZOBJS) LIBGRACKETMZOBJS_la = $(MZOBJS)
MREDLIBS_a = $(LDLIBS) $(@WXVARIANT@_LIBS) GRACKETLIBS_a = $(LDLIBS) $(@WXVARIANT@_LIBS)
MREDLIBS_la = GRACKETLIBS_la =
MREDMZOBJS_a = $(MZOBJS) GRACKETMZOBJS_a = $(MZOBJS)
MREDMZOBJS_la = GRACKETMZOBJS_la =
../libmred3m.@LIBSFX@: $(XOBJS) $(MZOBJS) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) ../libgracket3m.@LIBSFX@: $(XOBJS) $(MZOBJS) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS)
$(AR) $(ARFLAGS) ../libmred3m.@LIBSFX@ $(XOBJS) $(LIBMREDMZOBJS_@LIBSFX@) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) $(LIBMREDLIBS_@LIBSFX@) $(AR) $(ARFLAGS) ../libgracket3m.@LIBSFX@ $(XOBJS) $(LIBGRACKETMZOBJS_@LIBSFX@) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) $(LIBGRACKETLIBS_@LIBSFX@)
$(RANLIB) ../libmred3m.@LIBSFX@ $(RANLIB) ../libgracket3m.@LIBSFX@
../mred@MMM@@NOT_OSX@: mrmain.@LTO@ ../libmred3m.@LIBSFX@ ../gracket@MMM@@NOT_OSX@: mrmain.@LTO@ ../libgracket3m.@LIBSFX@
$(MREDLINKER) $(MREDLDFLAGS) -o ../mred@MMM@ mrmain.@LTO@ ../libmred3m.@LIBSFX@ $(MREDMZOBJS_@LIBSFX@) $(MREDLIBS_@LIBSFX@) $(GRACKETLINKER) $(GRACKETLDFLAGS) -o ../gracket@MMM@ mrmain.@LTO@ ../libgracket3m.@LIBSFX@ $(GRACKETMZOBJS_@LIBSFX@) $(GRACKETLIBS_@LIBSFX@)
MRFW = PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd MRFW = GRacket.framework/Versions/$(FWVERSION)_3m/GRacket
MRFWRES = PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources/PLT_MrEd.rsrc MRFWRES = GRacket.framework/Versions/$(FWVERSION)_3m/Resources/GRacket.rsrc
../MrEd@MMM@.app/Contents/MacOS/MrEd@MMM@: $(MRFWRES) $(MRFW) mrmain.@LTO@ ../GRacket@MMM@.app/Contents/MacOS/GRacket@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 $(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 "../PLT_MrEd.framework/Versions/$(FWVERSION)_3m" mkdir -p "../GRacket.framework/Versions/$(FWVERSION)_3m"
cp "$(MRFW)" "../$(MRFW)" cp "$(MRFW)" "../$(MRFW)"
rm -rf "../PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources" rm -rf "../GRacket.framework/Versions/$(FWVERSION)_3m/Resources"
cp -r "PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources" "../PLT_MrEd.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 "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@" /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) $(MRFW) : $(XOBJS) $(@WXVARIANT@_PLAIN_OBJS) ../../mzscheme/libracket3m.@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 $(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 $(MRFWRES): $(srcdir)/../../mac/osx_appl.ss $(srcdir)/../../mac/cw/MrEd.r
rm -rf PLT_MrEd.framework/Resources PLT_MrEd.framework/PLT_MrEd rm -rf GRacket.framework/Resources GRacket.framework/GRacket
env BUILDBASE=../.. BUILDING_3M=yes ../../mzscheme/mzscheme@CGC@ -cqu $(srcdir)/../../mac/osx_appl.ss $(srcdir)/../.. "@MMM@" env BUILDBASE=../.. BUILDING_3M=yes ../../mzscheme/racket@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/GRacket GRacket.framework/GRacket
ln -s Versions/$(FWVERSION)_3m/Resources PLT_MrEd.framework/Resources ln -s Versions/$(FWVERSION)_3m/Resources GRacket.framework/Resources
../mred@MMM@@OSX@ : ../gracket@MMM@@OSX@ :
$(MAKE) macxsrc/xform_precomp.h $(MAKE) macxsrc/xform_precomp.h
$(MAKE) ../MrEd@MMM@.app/Contents/MacOS/MrEd@MMM@ $(MAKE) ../GRacket@MMM@.app/Contents/MacOS/GRacket@MMM@
xsrc: xsrc:
mkdir xsrc mkdir xsrc
@ -1277,14 +1277,14 @@ XSRC_EXTRA_DIR_wx_xt =
XSRC_EXTRA_DIR_wx_mac = macxsrc XSRC_EXTRA_DIR_wx_mac = macxsrc
3m: xsrc $(XSRC_EXTRA_DIR_@WXVARIANT@) 3m: xsrc $(XSRC_EXTRA_DIR_@WXVARIANT@)
$(MAKE) ../mred@MMM@ $(MAKE) ../gracket@MMM@
######################################## ########################################
# Make Depends # # Make Depends #
######################################## ########################################
gen-deps: gen-deps:
../../mzscheme/mzscheme@MMM@ -cqu "$(srcdir)/gen-deps.ss" ../../mzscheme/racket@MMM@ -cqu "$(srcdir)/gen-deps.ss"
@INCLUDEDEP@ mrmain.dd @INCLUDEDEP@ mrmain.dd
@INCLUDEDEP@ mred.dd @INCLUDEDEP@ mred.dd

2
src/mred/mred.h
View File

@ -187,7 +187,7 @@ MRED_EXTERN void mred_set_run_from_cmd_line(MrEd_Run_From_Cmd_Line_Proc);
# define mrVERSION_SUFFIX " [cgc]" # define mrVERSION_SUFFIX " [cgc]"
# endif # endif
#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 #ifndef WCONSOLE_STDIO
# if defined(wx_msw) # if defined(wx_msw)

22
src/mred/mrmain.cxx
View File

@ -1,6 +1,6 @@
/* /*
* File: mred.cc * 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 * Author: Matthew Flatt
* Created: 1995 * Created: 1995
* Copyright: (c) 2004-2010 PLT Scheme Inc. * Copyright: (c) 2004-2010 PLT Scheme Inc.
@ -98,15 +98,15 @@ extern "C" Scheme_Object *scheme_initialize(Scheme_Env *env);
#endif #endif
#ifdef wx_x #ifdef wx_x
# define INIT_FILENAME "~/.mredrc" # define INIT_FILENAME "~/.gracketrc"
#else #else
# ifdef wx_msw # ifdef wx_msw
# define INIT_FILENAME "%%HOMEDIRVE%%\\%%HOMEPATH%%\\mredrc.ss" # define INIT_FILENAME "%%HOMEDIRVE%%\\%%HOMEPATH%%\\gracketrc.ss"
# else # else
# ifdef OS_X # ifdef OS_X
# define INIT_FILENAME "~/.mredrc" # define INIT_FILENAME "~/.gracketrc"
# else # else
# define INIT_FILENAME "PREFERENCES:mredrc.ss" # define INIT_FILENAME "PREFERENCES:gracketrc.ss"
# endif # endif
# endif # endif
#endif #endif
@ -118,8 +118,8 @@ static void (*mred_console_printf)(char *str, ...);
#else #else
# define PRINTF printf # define PRINTF printf
#endif #endif
#define PROGRAM "MrEd" #define PROGRAM "GRacket"
#define PROGRAM_LC "mred" #define PROGRAM_LC "gracket"
#define INITIAL_BIN_TYPE "ri" #define INITIAL_BIN_TYPE "ri"
#ifdef wx_mac #ifdef wx_mac
@ -141,7 +141,7 @@ static char *pltcollects_from_resource;
#define CMDLINE_STDIO_FLAG #define CMDLINE_STDIO_FLAG
#define YIELD_BEFORE_EXIT #define YIELD_BEFORE_EXIT
#define INITIAL_NAMESPACE_MODULE "scheme/gui/init" #define INITIAL_NAMESPACE_MODULE "racket/gui/init"
# include "../mzscheme/cmdline.inc" # include "../mzscheme/cmdline.inc"
@ -241,7 +241,7 @@ static int main_after_stack(int argc, char *argv[])
#endif #endif
#ifdef SGC_STD_DEBUGGING #ifdef SGC_STD_DEBUGGING
fprintf(stderr, "Starting MrEd with sgc for debugging\n"); fprintf(stderr, "Starting GRacket with sgc for debugging\n");
#endif #endif
#ifdef wx_mac #ifdef wx_mac
@ -644,8 +644,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR ignored
# ifndef MZ_PRECISE_GC # ifndef MZ_PRECISE_GC
load_delayed_dll(NULL, "libmzgcxxxxxxx.dll"); load_delayed_dll(NULL, "libmzgcxxxxxxx.dll");
# endif # endif
load_delayed_dll(NULL, "libmzsch" DLL_3M_SUFFIX "xxxxxxx.dll"); load_delayed_dll(NULL, "libracket" DLL_3M_SUFFIX "xxxxxxx.dll");
load_delayed_dll(NULL, "libmred" DLL_3M_SUFFIX "xxxxxxx.dll"); load_delayed_dll(NULL, "libgracket" DLL_3M_SUFFIX "xxxxxxx.dll");
record_dll_path(); record_dll_path();
# ifdef IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS # ifdef IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS
scheme_register_tls_space(&tls_space, _tls_index); scheme_register_tls_space(&tls_space, _tls_index);

98
src/mzscheme/Makefile.in
View File

@ -1,5 +1,5 @@
# #
# Makefile for mzscheme # Makefile for racket
# #
srcdir = @srcdir@ srcdir = @srcdir@
@ -66,13 +66,13 @@ cgc:
$(MAKE) common $(MAKE) common
$(MAKE) dynlib $(MAKE) dynlib
$(MAKE) mzlibrary $(MAKE) mzlibrary
$(MAKE) mzscheme@CGC@ $(MAKE) racket@CGC@
3m: 3m:
$(MAKE) cgc $(MAKE) cgc
cd gc2; $(MAKE) all cd gc2; $(MAKE) all
cd dynsrc; $(MAKE) dynlib3m cd dynsrc; $(MAKE) dynlib3m
cd gc2; $(MAKE) ../mzscheme@MMM@ cd gc2; $(MAKE) ../racket@MMM@
both: both:
$(MAKE) cgc $(MAKE) cgc
@ -81,9 +81,9 @@ both:
oskit: oskit:
$(MAKE) common $(MAKE) common
$(MAKE) mzlibrary $(MAKE) mzlibrary
$(MAKE) mzscheme.multiboot $(MAKE) racket.multiboot
mzschemelib: racketlib:
$(MAKE) g-c $(MAKE) g-c
$(MAKE) @FOREIGNTARGET@ $(MAKE) @FOREIGNTARGET@
$(MAKE) mzlibrary $(MAKE) mzlibrary
@ -119,16 +119,16 @@ foreign-nothing:
mzlibrary: mzlibrary:
cd src; $(MAKE) all cd src; $(MAKE) all
$(MAKE) libmzscheme.@LIBSFX@ $(MAKE) libracket.@LIBSFX@
FOREIGN_USED_LIB = $(FOREIGN_OBJ) $(FOREIGN_LIB) FOREIGN_USED_LIB = $(FOREIGN_OBJ) $(FOREIGN_LIB)
FOREIGN_USED_OBJSLIB = $(FOREIGN_OBJSLIB) FOREIGN_USED_OBJSLIB = $(FOREIGN_OBJSLIB)
FOREIGN_NOT_USED_LIB = FOREIGN_NOT_USED_LIB =
FOREIGN_NOT_USED_OBJSLIB = FOREIGN_NOT_USED_OBJSLIB =
libmzscheme.@LIBSFX@: src/*.@LTO@ $(@FOREIGN_IF_USED@_LIB) libracket.@LIBSFX@: src/*.@LTO@ $(@FOREIGN_IF_USED@_LIB)
$(AR) $(ARFLAGS) libmzscheme.@LIBSFX@ src/*.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) @LIBMZSCHEME_DEP@ $(AR) $(ARFLAGS) libracket.@LIBSFX@ src/*.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) @LIBRACKET_DEP@
$(RANLIB) libmzscheme.@LIBSFX@ $(RANLIB) libracket.@LIBSFX@
# Irix sproc, only # Irix sproc, only
sproc.@LTO@: @GCDIR@/sproc.@LTO@ sproc.@LTO@: @GCDIR@/sproc.@LTO@
@ -136,28 +136,28 @@ sproc.@LTO@: @GCDIR@/sproc.@LTO@
# Unix ---------------------------------------- # Unix ----------------------------------------
mzscheme@CGC@@NOT_OSX@: libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ main.@LTO@ $(SPECIALIZINGOBJECTS) racket@CGC@@NOT_OSX@: libracket.@LIBSFX@ libmzgc.@LIBSFX@ main.@LTO@ $(SPECIALIZINGOBJECTS)
@MZLINKER@ -o mzscheme@CGC@ main.@LTO@ $(SPECIALIZINGOBJECTS) libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ @LDFLAGS@ @LIBS@ @MZLINKER@ -o racket@CGC@ main.@LTO@ $(SPECIALIZINGOBJECTS) libracket.@LIBSFX@ libmzgc.@LIBSFX@ @LDFLAGS@ @LIBS@
# Mac OS ---------------------------------------- # Mac OS ----------------------------------------
MZFW = PLT_MzScheme.framework/Versions/$(FWVERSION)/PLT_MzScheme MZFW = Racket.framework/Versions/$(FWVERSION)/Racket
$(MZFW): libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ $(SPECIALIZINGOBJECTS) $(MZFW): libracket.@LIBSFX@ libmzgc.@LIBSFX@ $(SPECIALIZINGOBJECTS)
mkdir -p PLT_MzScheme.framework/Versions/$(FWVERSION) mkdir -p Racket.framework/Versions/$(FWVERSION)
@MZLINKER@ -o $(MZFW) @LDFLAGS@ -framework CoreFoundation -dynamiclib -all_load $(SPECIALIZINGOBJECTS) libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ @LIBS@ @MZLINKER@ -o $(MZFW) @LDFLAGS@ -framework CoreFoundation -dynamiclib -all_load $(SPECIALIZINGOBJECTS) libracket.@LIBSFX@ libmzgc.@LIBSFX@ @LIBS@
rm -f PLT_MzScheme.framework/PLT_MzScheme rm -f Racket.framework/Racket
ln -s Versions/$(FWVERSION)/PLT_MzScheme PLT_MzScheme.framework/PLT_MzScheme ln -s Versions/$(FWVERSION)/Racket Racket.framework/Racket
mzscheme@CGC@@OSX@: $(MZFW) main.@LTO@ racket@CGC@@OSX@: $(MZFW) main.@LTO@
@MZLINKER@ -o mzscheme@CGC@ @PROFFLAGS@ @LDFLAGS@ main.@LTO@ -Wl,-headerpad_max_install_names -F. -framework PLT_MzScheme @LIBS@ @MZLINKER@ -o racket@CGC@ @PROFFLAGS@ @LDFLAGS@ main.@LTO@ -Wl,-headerpad_max_install_names -F. -framework Racket @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@" /usr/bin/install_name_tool -change "Racket.framework/Versions/$(FWVERSION)/Racket" "@executable_path/Racket.framework/Versions/$(FWVERSION)/Racket" "racket@CGC@"
# OSKit ---------------------------------------- # 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@ \ $(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@ \ -L@OSKHOME@/lib -loskit_kern -loskit_clientos @EXTRA_OSK_LIBS@ \
-loskit_freebsd_c -loskit_c -loskit_lmm \ -loskit_freebsd_c -loskit_c -loskit_lmm \
-loskit_freebsd_m -loskit_memfs -loskit_fsnamespace \ -loskit_freebsd_m -loskit_memfs -loskit_fsnamespace \
@ -178,8 +178,8 @@ main_ee.@LTO@: main.@LTO@
ee-main: ee-main:
$(MAKE) main_ee.@LTO@ $(MAKE) main_ee.@LTO@
ee-app: $(MZSCHEME) main_ee.@LTO@ 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) libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ @LIBS@ ; fi 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 testext.@LTO@: testext.c
$(CC) $(MAIN_CFLAGS) -I/home/scheme/plt/compiler/ -c testext.c -o testext.@LTO@ $(CC) $(MAIN_CFLAGS) -I/home/scheme/plt/compiler/ -c testext.c -o testext.@LTO@
@ -212,18 +212,18 @@ mark:
$(MAKE) $(srcdir)/src/mzmark.c $(MAKE) $(srcdir)/src/mzmark.c
headers: 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 $(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 $(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 $(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 $(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: cstartup.zo:
$(MAKE) startup CSTARTUPEXTRA='zo' CSTARTUPDEST="../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 -rf tmp[123456789] tests/tmp[123456789] tests/sub[123]
/bin/rm -f tests/*~ /bin/rm -f tests/*~
/bin/rm -f *.@LTO@ core /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
/bin/rm -f include/macosxpre.p /bin/rm -f include/macosxpre.p
cd gc; $(MAKE) clean cd gc; $(MAKE) clean
@ -243,7 +243,7 @@ clean@NOT_OSX@:
if [ -d ../foreign ] ; then cd ../foreign ; $(MAKE) clean ; fi if [ -d ../foreign ] ; then cd ../foreign ; $(MAKE) clean ; fi
clean@OSX@: clean@OSX@:
rm -rf PLT_MzScheme.framework rm -rf Racket.framework
$(MAKE) clean@NOT_OSX@ $(MAKE) clean@NOT_OSX@
BUILDINFO=$(DESTDIR)$(libpltdir)/buildinfo BUILDINFO=$(DESTDIR)$(libpltdir)/buildinfo
@ -277,8 +277,8 @@ install-both:
# have to go up and install things from there. # have to go up and install things from there.
unix-install: unix-install:
cd ..; rm -f "$(DESTDIR)$(bindir)/mzscheme@CGC_INSTALLED@" cd ..; rm -f "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@"
cd ..; rm -f "$(DESTDIR)$(bindir)/mzscheme@MMM_INSTALLED@" cd ..; rm -f "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@"
cd ..; cp mzscheme/starter "$(DESTDIR)$(libpltdir)/starter" cd ..; cp mzscheme/starter "$(DESTDIR)$(libpltdir)/starter"
cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/starter" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/starter"
cd ..; echo 'CC=@CC@' > "$(BUILDINFO)" cd ..; echo 'CC=@CC@' > "$(BUILDINFO)"
@ -290,32 +290,32 @@ unix-install:
unix-install-cgc: unix-install-cgc:
cd ..; $(ICP) mzscheme/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" cd ..; $(ICP) mzscheme/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@"
cd ..; $(ICP) mzscheme/libmzscheme.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzscheme.@LIBSFX@" cd ..; $(ICP) mzscheme/libracket.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket.@LIBSFX@"
cd ..; $(ICP) mzscheme/mzscheme@CGC@ "$(DESTDIR)$(bindir)/mzscheme@CGC_INSTALLED@" cd ..; $(ICP) mzscheme/racket@CGC@ "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@"
cd ..; cp mzscheme/mzdyn.o "$(DESTDIR)$(libpltdir)/mzdyn.o" 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: unix-install-cgc-final:
$(NOOP) $(NOOP)
unix-install-3m: unix-install-3m:
cd ..; $(ICP) mzscheme/mzscheme@MMM@ "$(DESTDIR)$(bindir)/mzscheme@MMM_INSTALLED@" cd ..; $(ICP) mzscheme/racket@MMM@ "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@"
cd ..; $(ICP) mzscheme/libmzscheme3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzscheme3m.@LIBSFX@" cd ..; $(ICP) mzscheme/libracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@"
cd ..; $(ICP) mzscheme/mzdyn3m.o "$(DESTDIR)$(libpltdir)/mzdyn3m.o" 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: unix-install-3m-final:
$(NOOP) $(NOOP)
# OS X install ---------------------------------------- # OS X install ----------------------------------------
MZFWDIR = @FRAMEWORK_INSTALL_DIR@/PLT_MzScheme.framework MZFWDIR = @FRAMEWORK_INSTALL_DIR@/Racket.framework
MZFWMMM = PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme MZFWMMM = Racket.framework/Versions/$(FWVERSION)_3m/Racket
FRAMEWORK_REL_PREFIX = "@executable_path/../lib/" FRAMEWORK_REL_PREFIX = "@executable_path/../lib/"
osx-install: osx-install:
$(MAKE) unix-install $(MAKE) unix-install
rm -f $(MZFWDIR)/PLT_MzScheme rm -f $(MZFWDIR)/Racket
rm -rf $(MZFWDIR)/Versions/$(FWVERSION) rm -rf $(MZFWDIR)/Versions/$(FWVERSION)
rm -rf $(MZFWDIR)/Versions/$(FWVERSION)_3m rm -rf $(MZFWDIR)/Versions/$(FWVERSION)_3m
if [ @FRAMEWORK_REL_INSTALL@ = yes ] ; then rm -rf $(MZFWDIR) ; fi if [ @FRAMEWORK_REL_INSTALL@ = yes ] ; then rm -rf $(MZFWDIR) ; fi
@ -325,23 +325,23 @@ osx-install-cgc:
$(MAKE) unix-install-cgc $(MAKE) unix-install-cgc
mkdir -p "$(MZFWDIR)/Versions/$(FWVERSION)" mkdir -p "$(MZFWDIR)/Versions/$(FWVERSION)"
cp $(MZFW) $(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@" /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)/mzscheme@CGC_INSTALLED@" $(STRIP_DEBUG) "$(bindir)/racket@CGC_INSTALLED@"
osx-install-cgc-final: osx-install-cgc-final:
$(MAKE) unix-install-cgc-final $(MAKE) unix-install-cgc-final
ln -s Versions/$(FWVERSION)/PLT_MzScheme $(MZFWDIR)/ ln -s Versions/$(FWVERSION)/Racket $(MZFWDIR)/
osx-install-3m: osx-install-3m:
$(MAKE) unix-install-3m $(MAKE) unix-install-3m
mkdir -p "$(MZFWDIR)/Versions/$(FWVERSION)_3m" mkdir -p "$(MZFWDIR)/Versions/$(FWVERSION)_3m"
cp $(MZFWMMM) $(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@" /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)/mzscheme@MMM_INSTALLED@" $(STRIP_DEBUG) "$(bindir)/racket@MMM_INSTALLED@"
osx-install-3m-final: osx-install-3m-final:
$(MAKE) unix-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 ---------------------------------------- # Cygwin install ----------------------------------------
@ -367,4 +367,4 @@ unix-cygwin-install-3m-final:
# Generate plt-gdbinit ---------------------------------------- # Generate plt-gdbinit ----------------------------------------
mz-gdbinit: $(srcdir)/mk-gdbinit.ss $(srcdir)/src/stypes.h mz-gdbinit: $(srcdir)/mk-gdbinit.ss $(srcdir)/src/stypes.h
mzscheme $(srcdir)/mk-gdbinit.ss racket $(srcdir)/mk-gdbinit.ss

14
src/mzscheme/cmdline.inc
View File

@ -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" #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; char *binary_type_hack = "bINARy tYPe:" INITIAL_BIN_TYPE GC_PRECISION_TYPE;
/* The format of bINARy tYPe is e?[zr]i[3c]. /* The format of bINARy tYPe is e?[zr]i[3c].
e indicates a starter executable e indicates a starter executable
z/r indicates MzScheme or MrEd z/r indicates Racket or GRacket
i indicates ??? i indicates ???
3/c indicates 3m or CGC */ 3/c indicates 3m or CGC */
@ -1049,7 +1049,7 @@ static int run_from_cmd_line(int argc, char *_argv[],
init_ns = 0; init_ns = 0;
if (show_vers) { if (show_vers) {
#ifndef MZSCHEME_CMD_LINE #ifndef RACKET_CMD_LINE
if (!use_repl if (!use_repl
#ifdef CMDLINE_STDIO_FLAG #ifdef CMDLINE_STDIO_FLAG
|| alternate_rep || alternate_rep
@ -1057,7 +1057,7 @@ static int run_from_cmd_line(int argc, char *_argv[],
) )
#endif #endif
PRINTF("%s", BANNER); PRINTF("%s", BANNER);
#ifdef MZSCHEME_CMD_LINE #ifdef RACKET_CMD_LINE
# ifdef DOS_FILE_SYSTEM # ifdef DOS_FILE_SYSTEM
# if !defined(FILES_HAVE_FDS) # if !defined(FILES_HAVE_FDS)
# if !defined(WINDOWS_FILE_HANDLES) # if !defined(WINDOWS_FILE_HANDLES)
@ -1202,7 +1202,7 @@ static int run_from_cmd_line(int argc, char *_argv[],
show_help: show_help:
prog =("%s" prog =("%s"
PROGRAM_LC " [<option> ...] <argument> ...\n" PROGRAM_LC " [<option> ...] <argument> ...\n"
# ifndef MZSCHEME_CMD_LINE # ifndef RACKET_CMD_LINE
# ifdef wx_x # ifdef wx_x
" X configuration options (must precede all other options):\n" " X configuration options (must precede all other options):\n"
" -display <display>, -geometry <geometry>, -fn <font>, -font <font>,\n" " -display <display>, -geometry <geometry>, -fn <font>, -font <font>,\n"

64
src/mzscheme/configure.ac
View File

@ -11,20 +11,20 @@
# COMPFLAGS - C and C++ compilation, but not configure-time tests # COMPFLAGS - C and C++ compilation, but not configure-time tests
# PREFLAGS - C and C++ preprocessing, but not configure-time tests # PREFLAGS - C and C++ preprocessing, but not configure-time tests
# OPTIONS - C and C++ flags, not needed for configure-time tests # OPTIONS - C and C++ flags, not needed for configure-time tests
# MZOPTIONS - MzScheme-only flags # MZOPTIONS - Racket-only flags
# MROPTIONS - MrEd-only flags # MROPTIONS - GRacket-only flags
# CGCOPTIONS - Boehm-GC-only flags # CGCOPTIONS - Boehm-GC-only flags
# GC2OPTIONS - GC2-only flags # GC2OPTIONS - GC2-only flags
# #
# Note: we use CPPFLAGS for configure-time testing only because # Note: we use CPPFLAGS for configure-time testing only because
# it needs to include C++ flags that we don't want for MzScheme. # it needs to include C++ flags that we don't want for Racket.
# hence PREFLAGS, which is initialized to the original CPPFLAGS. # hence PREFLAGS, which is initialized to the original CPPFLAGS.
AC_INIT([PLT Scheme]) AC_INIT([PLT Scheme])
AC_CONFIG_SRCDIR(mzscheme/src/bignum.c) AC_CONFIG_SRCDIR(mzscheme/src/bignum.c)
AC_CONFIG_HEADERS([mzscheme/mzconfig.h]) AC_CONFIG_HEADERS([mzscheme/mzconfig.h])
AC_ARG_ENABLE(mred, [ --enable-mred compile MrEd as well as MzScheme (enabled by default)], , enable_mred=yes ) AC_ARG_ENABLE(gracket, [ --enable-gracket compile GRacket as well as Racket (enabled by default)], , enable_gracket=yes )
AC_ARG_ENABLE(gl, [ --enable-gl use OpenGL when available (enabled by default)]) AC_ARG_ENABLE(gl, [ --enable-gl use OpenGL when available (enabled by default)])
AC_ARG_ENABLE(xrender, [ --enable-xrender use Xrender when available (enabled by default)]) AC_ARG_ENABLE(xrender, [ --enable-xrender use Xrender when available (enabled by default)])
@ -56,12 +56,12 @@ AC_ARG_ENABLE(backtrace, [ --enable-backtrace 3m: support GC backtrace dum
AC_ARG_ENABLE(float, [ --enable-float include support for single-precision floats]) AC_ARG_ENABLE(float, [ --enable-float include support for single-precision floats])
AC_ARG_ENABLE(floatinstead, [ --enable-floatinstead compile to use single-precision by default]) AC_ARG_ENABLE(floatinstead, [ --enable-floatinstead compile to use single-precision by default])
AC_ARG_ENABLE(pthread, [ --enable-pthread link MrEd with pthreads (sometimes needed for GL)]) AC_ARG_ENABLE(pthread, [ --enable-pthread link with pthreads (sometimes needed for GL)])
AC_ARG_ENABLE(stackup, [ --enable-stackup assume "up" if stack direction cannot be determined]) AC_ARG_ENABLE(stackup, [ --enable-stackup assume "up" if stack direction cannot be determined])
AC_ARG_ENABLE(bigendian, [ --enable-bigendian assume "big" if endianness cannot be determined]) AC_ARG_ENABLE(bigendian, [ --enable-bigendian assume "big" if endianness cannot be determined])
AC_ARG_ENABLE(oskit, [ --enable-oskit compile OSKit-based MzScheme kernel]) AC_ARG_ENABLE(oskit, [ --enable-oskit compile OSKit-based Racket kernel])
AC_ARG_ENABLE(smalloskit, [ --enable-smalloskit compile small OSKit-based MzScheme kernel]) AC_ARG_ENABLE(smalloskit, [ --enable-smalloskit compile small OSKit-based Racket kernel])
AC_ARG_ENABLE(wbuild, [ --enable-wbuild compile and use wbuild for .w sources]) AC_ARG_ENABLE(wbuild, [ --enable-wbuild compile and use wbuild for .w sources])
AC_ARG_ENABLE(perl, [ --enable-perl use perl to regenerate certain sources]) AC_ARG_ENABLE(perl, [ --enable-perl use perl to regenerate certain sources])
@ -73,7 +73,7 @@ AC_ARG_ENABLE(noopt, [ --enable-noopt drop -O C flags])
AC_ARG_ENABLE(noopt, [ --enable-sdk=<path> use Mac OS X 10.4 SDK directory]) AC_ARG_ENABLE(noopt, [ --enable-sdk=<path> use Mac OS X 10.4 SDK directory])
AC_ARG_ENABLE(xonx, [ --enable-xonx compile X11 (not Quartz) MrEd for Mac OS X]) AC_ARG_ENABLE(xonx, [ --enable-xonx compile X11 (not Quartz) GRacket for Mac OS X])
AC_ARG_ENABLE(libfw, [ --enable-libfw install Mac OS X frameworks to /Library/Frameworks]) AC_ARG_ENABLE(libfw, [ --enable-libfw install Mac OS X frameworks to /Library/Frameworks])
AC_ARG_ENABLE(libfw, [ --enable-userfw install Mac OS X frameworks to ~/Library/Frameworks]) AC_ARG_ENABLE(libfw, [ --enable-userfw install Mac OS X frameworks to ~/Library/Frameworks])
AC_ARG_ENABLE(macprefix, [ --enable-macprefix allow --prefix with a Mac OS X install]) AC_ARG_ENABLE(macprefix, [ --enable-macprefix allow --prefix with a Mac OS X install])
@ -103,7 +103,7 @@ if test "${enable_smalloskit}" = "yes" ; then
fi fi
if test "${enable_oskit}" = "yes" ; then if test "${enable_oskit}" = "yes" ; then
enable_mred=no enable_gracket=no
fi fi
if test "${enable_dynlib}" = "no" ; then if test "${enable_dynlib}" = "no" ; then
@ -243,15 +243,15 @@ else
INSTALL_ORIG_TREE=no INSTALL_ORIG_TREE=no
fi 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 if test ! -d $srcdir/mred ; then
enable_mred=no enable_gracket=no
fi fi
fi fi
if test "${enable_mred}" = "no" ; then if test "${enable_gracket}" = "no" ; then
enable_wbuild=no enable_wbuild=no
enable_xrender=no enable_xrender=no
enable_cairo=no enable_cairo=no
@ -282,8 +282,8 @@ show_explicitly_enabled "${enable_cgcdefault}" "CGC as default"
show_explicitly_enabled "${enable_xonx}" "X-on-X" show_explicitly_enabled "${enable_xonx}" "X-on-X"
show_explicitly_enabled "${enable_shared}" "Shared libraries" show_explicitly_enabled "${enable_shared}" "Shared libraries"
show_explicitly_disabled "${enable_mred}" MrEd show_explicitly_disabled "${enable_gracket}" GRacket
if test "${enable_mred}" != "no" ; then if test "${enable_gracket}" != "no" ; then
show_explicitly_disabled "${enable_gl}" OpenGL show_explicitly_disabled "${enable_gl}" OpenGL
show_explicitly_disabled "${enable_xrender}" Xrender show_explicitly_disabled "${enable_xrender}" Xrender
show_explicitly_disabled "${enable_xft}" Xft show_explicitly_disabled "${enable_xft}" Xft
@ -367,7 +367,7 @@ MZRT_CGC_FLAGS=""
LIBATOM="LIBATOM_NONE" LIBATOM="LIBATOM_NONE"
ar_libtool_no_undefined="" ar_libtool_no_undefined=""
LIBMZSCHEME_DEP="" LIBRACKET_DEP=""
XFT_EXTRA_FLAGS= XFT_EXTRA_FLAGS=
XFT_EXTRA_LIBS= XFT_EXTRA_LIBS=
@ -484,16 +484,16 @@ if test "$REZ" = '' ; then
REZ=/Developer/Tools/Rez REZ=/Developer/Tools/Rez
fi fi
if test "${enable_mred}" = "yes" ; then if test "${enable_gracket}" = "yes" ; then
if test "${enable_quartz}" = "yes" ; then if test "${enable_quartz}" = "yes" ; then
: :
else else
AC_PATH_XTRA AC_PATH_XTRA
fi fi
MAKE_MRED=mred MAKE_GRACKET=gracket
else else
MAKE_MRED=no MAKE_GRACKET=no
fi fi
AC_CHECK_LIB(m, cos) AC_CHECK_LIB(m, cos)
@ -535,7 +535,7 @@ EXTRALIBS=
# for gmp assembly: # for gmp assembly:
EXTRA_GMP_OBJ= EXTRA_GMP_OBJ=
# For MzScheme targets: # For Racket targets:
OSX=".osx" OSX=".osx"
NOT_OSX="" NOT_OSX=""
CGC_X86_64="" CGC_X86_64=""
@ -555,7 +555,7 @@ case $OS in
;; ;;
AIX) AIX)
enable_cgcdefault="yes" enable_cgcdefault="yes"
EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../mzscheme/include/mzscheme.exp" EXTRALIBS="-Wl,-brtl,-bE:\$(srcdir)/../mzscheme/include/racket.exp"
;; ;;
FreeBSD) FreeBSD)
LIBS="$LIBS -rdynamic" LIBS="$LIBS -rdynamic"
@ -635,8 +635,8 @@ case $OS in
MZINSTALLTARGET=unix-cygwin-install MZINSTALLTARGET=unix-cygwin-install
if test "${enable_shared}" = "yes" ; then if test "${enable_shared}" = "yes" ; then
ar_libtool_no_undefined=" -no-undefined" ar_libtool_no_undefined=" -no-undefined"
LIBMZSCHEME_DEP="libmzgc.la -liconv" LIBRACKET_DEP="libmzgc.la -liconv"
LIBMRED_DEP="../mzscheme/libmzgc.la ../mzscheme/libmred.la" LIBGRACKET_DEP="../mzscheme/libmzgc.la ../mzscheme/libgracket.la"
fi fi
EXE_SUFFIX=".exe" EXE_SUFFIX=".exe"
;; ;;
@ -1074,7 +1074,7 @@ fi
############## C++ grunge ################ ############## C++ grunge ################
if test "${enable_mred}" = "yes" ; then if test "${enable_gracket}" = "yes" ; then
CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
@ -1132,7 +1132,7 @@ if test "${enable_mred}" = "yes" ; then
else else
echo "******************************************************" echo "******************************************************"
echo "configure: cannot find X11 development files that are" echo "configure: cannot find X11 development files that are"
echo " needed to compile MrEd:" echo " needed to compile GRacket:"
echo "$xmissing" echo "$xmissing"
echo "******************************************************" echo "******************************************************"
echo configure aborted echo configure aborted
@ -1402,7 +1402,7 @@ if test "${enable_shared}" = "yes" ; then
ARFLAGS="" ARFLAGS=""
RANLIB=":" RANLIB=":"
MZLINKER="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc} -rpath ${abslibdir}" 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" PLAIN_CC="$CC"
CC="${LIBTOOLPROG} --mode=compile --tag=CC $CC" CC="${LIBTOOLPROG} --mode=compile --tag=CC $CC"
CXX="${LIBTOOLPROG} --mode=compile --tag=CXX $CXX" CXX="${LIBTOOLPROG} --mode=compile --tag=CXX $CXX"
@ -1419,7 +1419,7 @@ if test "${enable_shared}" = "yes" ; then
MZOPTIONS="$MZOPTIONS -DMZ_USES_SHARED_LIB" MZOPTIONS="$MZOPTIONS -DMZ_USES_SHARED_LIB"
else else
LIBSFX=a LIBSFX=a
MREDLINKER='$(CXX)' GRACKETLINKER='$(CXX)'
WXLIBS=WXLIBSNORM WXLIBS=WXLIBSNORM
ICP=cp ICP=cp
MRLIBINSTALL="install-no-lib" MRLIBINSTALL="install-no-lib"
@ -1489,7 +1489,7 @@ AC_SUBST(EXE_SUFFIX)
AC_SUBST(MZRT_CGC_FLAGS) AC_SUBST(MZRT_CGC_FLAGS)
AC_SUBST(LIBATOM) AC_SUBST(LIBATOM)
AC_SUBST(MREDLINKER) AC_SUBST(GRACKETLINKER)
AC_SUBST(LIBSFX) AC_SUBST(LIBSFX)
AC_SUBST(WXLIBS) AC_SUBST(WXLIBS)
AC_SUBST(WXVARIANT) AC_SUBST(WXVARIANT)
@ -1497,7 +1497,7 @@ AC_SUBST(ICP)
AC_SUBST(MRLIBINSTALL) AC_SUBST(MRLIBINSTALL)
AC_SUBST(LIBFINISH) AC_SUBST(LIBFINISH)
AC_SUBST(MAKE_MRED) AC_SUBST(MAKE_GRACKET)
AC_SUBST(MAKE_WBUILD) AC_SUBST(MAKE_WBUILD)
AC_SUBST(MAKE_COPYTREE) AC_SUBST(MAKE_COPYTREE)
AC_SUBST(MAKE_FINISH) AC_SUBST(MAKE_FINISH)
@ -1521,8 +1521,8 @@ AC_SUBST(FOREIGN_OBJSLIB)
AC_SUBST(FOREIGN_CONVENIENCE) AC_SUBST(FOREIGN_CONVENIENCE)
AC_SUBST(FOREIGNTARGET) AC_SUBST(FOREIGNTARGET)
AC_SUBST(LIBMZSCHEME_DEP) AC_SUBST(LIBRACKET_DEP)
AC_SUBST(LIBMRED_DEP) AC_SUBST(LIBGRACKET_DEP)
AC_SUBST(LTO) AC_SUBST(LTO)
AC_SUBST(LTA) AC_SUBST(LTA)
@ -1582,7 +1582,7 @@ else
fi fi
ac_configure_args="$ac_configure_args$SUB_CONFIGURE_EXTRAS" 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 if test "${enable_quartz}" = "yes" ; then
mk_needed_dir wxmac mk_needed_dir wxmac
mk_needed_dir wxmac/src mk_needed_dir wxmac/src

4
src/mzscheme/dynsrc/ustart.c
View File

@ -396,14 +396,14 @@ int main(int argc, char **argv)
int offset, len; int offset, len;
offset = _coldir_offset; offset = _coldir_offset;
new_argv[argpos++] = "-X"; new_argv[argpos++] = "-X";
new_argv[argpos++] = _coldir + offset; new_argv[argpos++] = absolutize(_coldir + offset, me);
while (1) { while (1) {
len = strlen(_coldir + offset); len = strlen(_coldir + offset);
offset += len + 1; offset += len + 1;
if (!_coldir[offset]) if (!_coldir[offset])
break; break;
new_argv[argpos++] = "-S"; new_argv[argpos++] = "-S";
new_argv[argpos++] = _coldir + offset; new_argv[argpos++] = absolutize(_coldir + offset, me);
} }
} }

4833
src/mzscheme/gc/libatomic_ops/configure vendored
View File

File diff suppressed because it is too large Load Diff

40
src/mzscheme/gc2/Makefile.in
View File

@ -27,7 +27,7 @@ ARLIBFLAGS = @LDFLAGS@ $(LIBS)
DEF_COLLECTS_DIR = +D INITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../../collects; pwd`"'"' DEF_COLLECTS_DIR = +D INITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../../collects; pwd`"'"'
XFORM_SETUP = ../mzscheme@CGC@ -cqu $(srcdir)/xform.ss --setup . XFORM_SETUP = ../racket@CGC@ -cqu $(srcdir)/xform.ss --setup .
XFORM_NOPRECOMP = $(XFORM_SETUP) --cpp "$(CPP) $(CPPFLAGS)" @XFORMFLAGS@ -o XFORM_NOPRECOMP = $(XFORM_SETUP) --cpp "$(CPP) $(CPPFLAGS)" @XFORMFLAGS@ -o
XSRCDIR = xsrc XSRCDIR = xsrc
XFORM = env XFORM_USE_PRECOMP=$(XSRCDIR)/precomp.h $(XFORM_NOPRECOMP) XFORM = env XFORM_USE_PRECOMP=$(XSRCDIR)/precomp.h $(XFORM_NOPRECOMP)
@ -126,7 +126,7 @@ XSRCS = $(XSRCDIR)/salloc.c \
all: xsrc all: xsrc
$(MAKE) $(XSRCDIR)/precomp.h $(MAKE) $(XSRCDIR)/precomp.h
$(MAKE) xobjects $(MAKE) xobjects
$(MAKE) ../mzscheme3m $(MAKE) ../racket3m
xsrcs: $(XSRCS) xsrcs: $(XSRCS)
@ -377,35 +377,35 @@ EXTRA_GMP := $(if @EXTRA_GMP_OBJ@,../src/@EXTRA_GMP_OBJ@,)
EXTRA_OBJS_T = ../src/gmp.@LTO@ $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_LIB) EXTRA_OBJS_T = ../src/gmp.@LTO@ $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_LIB)
EXTRA_OBJS_L = ../src/gmp.@LTO@ $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB) EXTRA_OBJS_L = ../src/gmp.@LTO@ $(EXTRA_GMP) ../src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB)
../libmzscheme3m.@LIBSFX@: $(OBJS) $(EXTRA_OBJS_T) gc2.@LTO@ ../libracket3m.@LIBSFX@: $(OBJS) $(EXTRA_OBJS_T) gc2.@LTO@
$(AR) $(ARFLAGS) ../libmzscheme3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L) gc2.@LTO@ $(AR) $(ARFLAGS) ../libracket3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L) gc2.@LTO@
$(RANLIB) ../libmzscheme3m.@LIBSFX@ $(RANLIB) ../libracket3m.@LIBSFX@
../mzscheme@MMM@@NOT_OSX@: main.@LTO@ ../libmzscheme3m.@LIBSFX@ ../racket@MMM@@NOT_OSX@: main.@LTO@ ../libracket3m.@LIBSFX@
cd ..; @MZLINKER@ -o mzscheme@MMM@ @PROFFLAGS@ gc2/main.@LTO@ libmzscheme3m.@LIBSFX@ @LDFLAGS@ $(LIBS) cd ..; @MZLINKER@ -o racket@MMM@ @PROFFLAGS@ gc2/main.@LTO@ libracket3m.@LIBSFX@ @LDFLAGS@ $(LIBS)
# The above "cd .." prevents a problem with libtool's generated script in --enable-shared mode, # The above "cd .." prevents a problem with libtool's generated script in --enable-shared mode,
# at least for Mac OS X. Beware of changing LIBS or LDFLAGS to inclucde something with a relative # at least for Mac OS X. Beware of changing LIBS or LDFLAGS to inclucde something with a relative
# path. # path.
MZFWMMM = PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme MZFWMMM = Racket.framework/Versions/$(FWVERSION)_3m/Racket
$(MZFWMMM): ../libmzscheme3m.@LIBSFX@ $(MZFWMMM): ../libracket3m.@LIBSFX@
mkdir -p "PLT_MzScheme.framework/Versions/$(FWVERSION)_3m" mkdir -p "Racket.framework/Versions/$(FWVERSION)_3m"
@MZLINKER@ -o $(MZFWMMM) -framework CoreFoundation -dynamiclib -all_load ../libmzscheme3m.@LIBSFX@ @LDFLAGS@ $(LIBS) @MZLINKER@ -o $(MZFWMMM) -framework CoreFoundation -dynamiclib -all_load ../libracket3m.@LIBSFX@ @LDFLAGS@ $(LIBS)
rm -f PLT_MzScheme.framework/PLT_MzScheme rm -f Racket.framework/Racket
ln -s Versions/$(FWVERSION)_3m/PLT_MzScheme PLT_MzScheme.framework/PLT_MzScheme ln -s Versions/$(FWVERSION)_3m/Racket Racket.framework/Racket
../mzscheme@MMM@@OSX@: $(MZFWMMM) main.@LTO@ ../racket@MMM@@OSX@: $(MZFWMMM) main.@LTO@
@MZLINKER@ -o ../mzscheme@MMM@ @PROFFLAGS@ @LDFLAGS@ main.@LTO@ -Wl,-headerpad_max_install_names -F. -framework PLT_MzScheme @MZLINKER@ -o ../racket@MMM@ @PROFFLAGS@ @LDFLAGS@ main.@LTO@ -Wl,-headerpad_max_install_names -F. -framework Racket
mkdir -p "../PLT_MzScheme.framework/Versions/$(FWVERSION)_3m" mkdir -p "../Racket.framework/Versions/$(FWVERSION)_3m"
cp "PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "../PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" cp "Racket.framework/Versions/$(FWVERSION)_3m/Racket" "../Racket.framework/Versions/$(FWVERSION)_3m/Racket"
/usr/bin/install_name_tool -change "PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "@executable_path/PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "../mzscheme@MMM@" /usr/bin/install_name_tool -change "Racket.framework/Versions/$(FWVERSION)_3m/Racket" "@executable_path/Racket.framework/Versions/$(FWVERSION)_3m/Racket" "../racket@MMM@"
clean: clean:
/bin/rm -f ../mzscheme@MMM@ *.@LTO@ $(XSRCDIR)/* /bin/rm -f ../racket@MMM@ *.@LTO@ $(XSRCDIR)/*
/bin/rm -rf xform-collects /bin/rm -rf xform-collects
/bin/rm -rf PLT_MzScheme.framework /bin/rm -rf Racket.framework
#-------------------------------------------------- #--------------------------------------------------

591
src/mzscheme/include/racket.exp Normal file
View File

@ -0,0 +1,591 @@
#!..
scheme_init_jmpup_buf
scheme_setjmpup_relative
scheme_longjmpup
scheme_reset_jmpup_buf
scheme_clear_escape
scheme_new_jmpupbuf_holder
scheme_current_config
scheme_extend_config
scheme_install_config
scheme_get_param
scheme_set_param
scheme_get_thread_param
scheme_set_thread_param
scheme_get_env
scheme_inherit_cells
scheme_current_break_cell
scheme_current_thread
scheme_fuel_counter
scheme_current_thread_ptr
scheme_fuel_counter_ptr
scheme_get_current_thread
scheme_start_atomic
scheme_end_atomic
scheme_end_atomic_no_swap
scheme_start_in_scheduler
scheme_end_in_scheduler
scheme_out_of_fuel
scheme_thread
scheme_thread_w_details
scheme_kill_thread
scheme_break_thread
scheme_break_main_thread
scheme_set_break_main_target
scheme_thread_block
scheme_thread_block_enable_break
scheme_swap_thread
scheme_making_progress
scheme_weak_suspend_thread
scheme_weak_resume_thread
scheme_block_until
scheme_block_until_enable_break
scheme_block_until_unless
scheme_wait_input_allowed
scheme_unless_ready
scheme_in_main_thread
scheme_cancel_sleep
scheme_start_sleeper_thread
scheme_end_sleeper_thread
scheme_notify_sleep_progress
scheme_make_thread_cell
scheme_thread_cell_get
scheme_thread_cell_set
scheme_tls_allocate
scheme_tls_set
scheme_tls_get
scheme_make_custodian
scheme_add_managed
scheme_custodian_check_available
scheme_custodian_is_available
scheme_remove_managed
scheme_close_managed
scheme_schedule_custodian_close
scheme_add_custodian_extractor
scheme_add_atexit_closer
scheme_add_evt
scheme_add_evt_through_sema
scheme_is_evt
scheme_sync
scheme_sync_enable_break
scheme_sync_timeout
scheme_make_evt_set
scheme_add_swap_callback
scheme_add_swap_out_callback
scheme_call_enable_break
scheme_close_should_force_port_closed
scheme_push_kill_action
scheme_pop_kill_action
scheme_set_can_break
scheme_push_break_enable
scheme_pop_break_enable
scheme_with_stack_freeze
scheme_frozen_run_some
scheme_is_in_frozen_stack
scheme_signal_error
scheme_raise_exn
scheme_warning
scheme_raise
scheme_log_level_p
scheme_log
scheme_log_message
scheme_log_abort
scheme_out_of_memory_abort
scheme_wrong_count
scheme_wrong_count_m
scheme_case_lambda_wrong_count
scheme_wrong_type
scheme_wrong_field_type
scheme_arg_mismatch
scheme_wrong_return_arity
scheme_unbound_global
scheme_dynamic_wind
scheme_make_type
scheme_get_type_name
scheme_eof
scheme_make_eof
scheme_null
scheme_make_null
scheme_true
scheme_make_true
scheme_false
scheme_make_false
scheme_void
scheme_make_void
scheme_undefined
scheme_tail_call_waiting
scheme_multiple_values
scheme_uchar_table
scheme_uchar_cases_table
scheme_uchar_cats_table
scheme_uchar_ups
scheme_uchar_downs
scheme_uchar_titles
scheme_uchar_folds
scheme_uchar_combining_classes
scheme_eval
scheme_eval_multi
scheme_eval_with_prompt
scheme_eval_multi_with_prompt
scheme_eval_compiled
scheme_eval_compiled_multi
_scheme_eval_compiled
_scheme_eval_compiled_multi
scheme_apply
scheme_apply_multi
scheme_apply_no_eb
scheme_apply_multi_no_eb
scheme_apply_to_list
scheme_apply_with_prompt
scheme_apply_multi_with_prompt
_scheme_apply_with_prompt
_scheme_apply_multi_with_prompt
scheme_eval_string
scheme_eval_string_multi
scheme_eval_string_all
scheme_eval_string_with_prompt
scheme_eval_string_multi_with_prompt
scheme_eval_string_all_with_prompt
scheme_eval_module_string
_scheme_apply_known_prim_closure
_scheme_apply_known_prim_closure_multi
_scheme_apply_prim_closure
_scheme_apply_prim_closure_multi
scheme_current_argument_stack
scheme_call_with_prompt
scheme_call_with_prompt_multi
_scheme_call_with_prompt
_scheme_call_with_prompt_multi
scheme_values
scheme_check_one_value
scheme_tail_apply
scheme_tail_apply_no_copy
scheme_tail_apply_to_list
scheme_tail_eval_expr
scheme_set_tail_buffer_size
scheme_force_value
scheme_force_one_value
scheme_set_cont_mark
scheme_push_continuation_frame
scheme_pop_continuation_frame
scheme_temp_dec_mark_depth
scheme_temp_inc_mark_depth
scheme_current_continuation_marks
scheme_extract_one_cc_mark
scheme_extract_one_cc_mark_to_tag
scheme_do_eval
scheme_eval_compiled_stx_string
scheme_load_compiled_stx_string
scheme_compiled_stx_symbol
scheme_eval_compiled_sized_string
scheme_eval_compiled_sized_string_with_magic
scheme_detach_multple_array
GC_malloc
GC_malloc_atomic
GC_malloc_stubborn
GC_malloc_uncollectable
scheme_malloc_code
scheme_free_code
scheme_malloc_gcable_code
scheme_malloc_eternal
scheme_end_stubborn_change
scheme_calloc
scheme_strdup
scheme_strdup_eternal
scheme_malloc_fail_ok
scheme_weak_reference
scheme_weak_reference_indirect
scheme_unweak_reference
scheme_add_finalizer
scheme_add_finalizer_once
scheme_subtract_finalizer
scheme_add_scheme_finalizer
scheme_add_scheme_finalizer_once
scheme_register_finalizer
scheme_remove_all_finalization
scheme_dont_gc_ptr
scheme_gc_ptr_ok
scheme_collect_garbage
GC_register_traversers
GC_resolve
GC_mark
GC_fixup
GC_fixup_self
scheme_malloc_immobile_box
scheme_free_immobile_box
scheme_make_bucket_table
scheme_add_to_table
scheme_change_in_table
scheme_lookup_in_table
scheme_bucket_from_table
scheme_bucket_table_equal
scheme_clone_bucket_table
scheme_make_hash_table
scheme_make_hash_table_equal
scheme_make_hash_table_eqv
scheme_hash_set
scheme_hash_get
scheme_eq_hash_get
scheme_hash_set_atomic
scheme_hash_get_atomic
scheme_hash_table_equal
scheme_is_hash_table_equal
scheme_is_hash_table_eqv
scheme_clone_hash_table
scheme_make_hash_tree
scheme_hash_tree_set
scheme_hash_tree_get
scheme_hash_tree_next
scheme_hash_tree_index
scheme_hash_tree_equal
scheme_is_hash_tree_equal
scheme_is_hash_tree_eqv
scheme_make_prim
scheme_make_noneternal_prim
scheme_make_prim_w_arity
scheme_make_folding_prim
scheme_make_immed_prim
scheme_make_noncm_prim
scheme_make_noneternal_prim_w_arity
scheme_make_prim_w_everything
scheme_make_prim_closure_w_arity
scheme_make_folding_prim_closure
scheme_make_closed_prim
scheme_make_closed_prim_w_arity
scheme_make_folding_closed_prim
scheme_make_closed_prim_w_everything
scheme_prim_is_method
scheme_make_pair
scheme_make_mutable_pair
scheme_make_raw_pair
scheme_make_byte_string
scheme_make_sized_byte_string
scheme_make_sized_offset_byte_string
scheme_make_immutable_sized_byte_string
scheme_make_byte_string_without_copying
scheme_alloc_byte_string
scheme_append_byte_string
scheme_make_utf8_string
scheme_make_sized_utf8_string
scheme_make_sized_offset_utf8_string
scheme_make_immutable_sized_utf8_string
scheme_make_locale_string
scheme_char_string_to_byte_string
scheme_byte_string_to_char_string
scheme_char_string_to_byte_string_locale
scheme_byte_string_to_char_string_locale
scheme_char_string_to_path
scheme_path_to_char_string
scheme_make_char_string
scheme_make_sized_char_string
scheme_make_sized_offset_char_string
scheme_make_immutable_sized_char_string
scheme_make_char_string_without_copying
scheme_alloc_char_string
scheme_append_char_string
scheme_string_recase
scheme_make_vector
scheme_make_integer_value
scheme_make_integer_value_from_unsigned
scheme_make_integer_value_from_long_long
scheme_make_integer_value_from_unsigned_long_long
scheme_make_integer_value_from_long_halves
scheme_make_integer_value_from_unsigned_long_halves
scheme_make_double
scheme_make_char
scheme_make_char_or_nul
scheme_make_sema
scheme_post_sema
scheme_post_sema_all
scheme_wait_sema
scheme_try_plain_sema
scheme_char_constants
scheme_make_channel
scheme_make_channel_put_evt
scheme_get_int_val
scheme_get_unsigned_int_val
scheme_get_long_long_val
scheme_get_unsigned_long_long_val
scheme_real_to_double
scheme_make_cptr
scheme_make_offset_cptr
scheme_make_external_cptr
scheme_make_offset_external_cptr
scheme_get_proc_name
scheme_utf8_decode
scheme_utf8_decode_as_prefix
scheme_utf8_decode_all
scheme_utf8_decode_prefix
scheme_utf8_decode_to_buffer
scheme_utf8_decode_to_buffer_len
scheme_utf8_decode_count
scheme_utf8_encode
scheme_utf8_encode_all
scheme_utf8_encode_to_buffer
scheme_utf8_encode_to_buffer_len
scheme_ucs4_to_utf16
scheme_utf16_to_ucs4
scheme_open_converter
scheme_close_converter
scheme_make_bignum
scheme_make_bignum_from_unsigned
scheme_make_bignum_from_long_long
scheme_make_bignum_from_unsigned_long_long
scheme_bignum_to_double
scheme_bignum_from_double
scheme_bignum_to_string
scheme_bignum_to_allocated_string
scheme_read_bignum
scheme_read_bignum_bytes
scheme_bignum_normalize
scheme_make_rational
scheme_rational_to_double
scheme_rational_from_double
scheme_rational_normalize
scheme_rational_numerator
scheme_rational_denominator
scheme_make_complex
scheme_complex_normalize
scheme_complex_real_part
scheme_complex_imaginary_part
scheme_is_exact
scheme_is_inexact
scheme_expand
scheme_compile
scheme_read
scheme_read_syntax
scheme_write
scheme_print
scheme_display
scheme_write_w_max
scheme_display_w_max
scheme_print_w_max
scheme_write_byte_string
scheme_write_char_string
scheme_put_byte_string
scheme_put_char_string
scheme_write_to_string
scheme_display_to_string
scheme_print_to_string
scheme_write_to_string_w_max
scheme_display_to_string_w_max
scheme_print_to_string_w_max
scheme_debug_print
scheme_flush_output
scheme_format
scheme_printf
scheme_format_utf8
scheme_printf_utf8
scheme_getc
scheme_get_byte
scheme_peekc
scheme_peek_byte
scheme_peekc_skip
scheme_peek_byte_skip
scheme_getc_special_ok
scheme_get_byte_special_ok
scheme_peekc_special_ok
scheme_peek_byte_special_ok_skip
scheme_peekc_special_ok_skip
scheme_ungetc
scheme_byte_ready
scheme_char_ready
scheme_peekc_is_ungetc
scheme_need_wakeup
scheme_get_byte_string
scheme_get_byte_string_unless
scheme_get_byte_string_special_ok_unless
scheme_progress_evt
scheme_peeked_read
scheme_get_char_string
scheme_get_bytes
scheme_get_ready_special
scheme_tell
scheme_output_tell
scheme_tell_line
scheme_tell_column
scheme_tell_all
scheme_count_lines
scheme_close_input_port
scheme_close_output_port
scheme_write_special
scheme_write_special_nonblock
scheme_make_write_evt
scheme_port_record
scheme_input_port_record
scheme_output_port_record
scheme_is_input_port
scheme_is_output_port
scheme_make_port_type
scheme_make_input_port
scheme_make_output_port
scheme_set_next_port_custodian
scheme_set_port_location_fun
scheme_set_port_count_lines_fun
scheme_progress_evt_via_get
scheme_peeked_read_via_get
scheme_write_evt_via_write
scheme_write_special_evt_via_write_special
scheme_open_input_file
scheme_open_output_file
scheme_open_input_output_file
scheme_open_output_file_with_mode
scheme_make_file_input_port
scheme_make_named_file_input_port
scheme_make_file_output_port
scheme_make_fd_input_port
scheme_make_fd_output_port
scheme_make_byte_string_input_port
scheme_make_sized_byte_string_input_port
scheme_make_byte_string_output_port
scheme_get_sized_byte_string_output
scheme_get_reset_sized_byte_string_output
scheme_pipe
scheme_pipe_with_limit
scheme_make_null_output_port
scheme_make_redirect_output_port
scheme_set_file_position
scheme_file_exists
scheme_directory_exists
scheme_expand_filename
scheme_expand_user_filename
scheme_expand_string_filename
scheme_os_getcwd
scheme_os_setcwd
scheme_getdrive
scheme_split_path
scheme_build_path
scheme_path_to_directory_path
scheme_path_to_complete_path
scheme_make_path
scheme_make_sized_path
scheme_make_sized_offset_path
scheme_make_sized_offset_kind_path
scheme_make_path_without_copying
scheme_alloc_fdset_array
scheme_init_fdset_array
scheme_get_fdset
scheme_fdzero
scheme_fdset
scheme_fdclr
scheme_fdisset
scheme_add_fd_handle
scheme_add_fd_eventmask
scheme_collapse_win_fd
scheme_security_check_file
scheme_security_check_file_link
scheme_security_check_network
scheme_get_host_address
scheme_free_host_address
scheme_host_address_strerror
scheme_getnameinfo
scheme_get_port_file_descriptor
scheme_get_port_fd
scheme_get_port_socket
scheme_socket_to_ports
scheme_set_type_printer
scheme_print_bytes
scheme_print_utf8
scheme_print_string
scheme_read_byte_string
scheme_make_namespace
scheme_add_global
scheme_add_global_symbol
scheme_make_envunbox
scheme_lookup_global
scheme_global_bucket
scheme_global_keyword_bucket
scheme_module_bucket
scheme_builtin_value
scheme_set_global_bucket
scheme_install_macro
scheme_save_initial_module_set
scheme_primitive_module
scheme_finish_primitive_module
scheme_protect_primitive_provide
scheme_make_modidx
scheme_apply_for_syntax_in_env
scheme_dynamic_require
scheme_namespace_require
scheme_is_module_path
scheme_datum_to_kernel_stx
scheme_intern_symbol
scheme_intern_exact_symbol
scheme_intern_exact_char_symbol
scheme_make_symbol
scheme_make_exact_symbol
scheme_make_exact_char_symbol
scheme_symbol_name
scheme_symbol_name_and_size
scheme_symbol_val
scheme_intern_exact_keyword
scheme_intern_exact_char_keyword
scheme_make_struct_values
scheme_make_struct_names
scheme_make_struct_type
scheme_make_struct_type2
scheme_make_struct_instance
scheme_is_struct_instance
scheme_struct_ref
scheme_struct_set
scheme_make_struct_type_property
scheme_make_struct_type_property_w_guard
scheme_struct_type_property_ref
scheme_chaperone_struct_type_property_ref
scheme_make_location
scheme_is_location
scheme_make_inspector
scheme_is_subinspector
scheme_eq
scheme_eqv
scheme_equal
scheme_chaperone_of
scheme_equal_hash_key
scheme_equal_hash_key2
scheme_recur_equal_hash_key
scheme_recur_equal_hash_key2
scheme_eqv_hash_key
scheme_eqv_hash_key2
scheme_set_type_equality
scheme_recur_equal
scheme_build_list
scheme_build_list_offset
scheme_is_list
scheme_list_length
scheme_proper_list_length
scheme_alloc_list
scheme_map_1
scheme_car
scheme_cdr
scheme_cadr
scheme_caddr
scheme_vector_to_list
scheme_list_to_vector
scheme_append
scheme_reverse
scheme_box
scheme_unbox
scheme_set_box
scheme_make_weak_box
scheme_make_ephemeron
scheme_ephemeron_value
scheme_ephemeron_key
scheme_load
scheme_load_extension
scheme_register_extension_global
scheme_get_seconds
scheme_get_milliseconds
scheme_get_inexact_milliseconds
scheme_get_process_milliseconds
scheme_get_thread_milliseconds
scheme_banner
scheme_version
scheme_check_proc_arity
scheme_check_proc_arity2
scheme_make_provided_string
scheme_make_args_string
scheme_system_library_subpath
scheme_signal_received
scheme_signal_received_at
scheme_get_signal_handle
scheme_char_strlen

598
src/mzscheme/include/racket3m.exp Normal file
View File

@ -0,0 +1,598 @@
#!..
scheme_init_jmpup_buf
scheme_setjmpup_relative
scheme_longjmpup
scheme_reset_jmpup_buf
scheme_clear_escape
scheme_new_jmpupbuf_holder
scheme_current_config
scheme_extend_config
scheme_install_config
scheme_get_param
scheme_set_param
scheme_get_thread_param
scheme_set_thread_param
scheme_get_env
scheme_inherit_cells
scheme_current_break_cell
scheme_current_thread
scheme_fuel_counter
scheme_current_thread_ptr
scheme_fuel_counter_ptr
scheme_get_current_thread
scheme_start_atomic
scheme_end_atomic
scheme_end_atomic_no_swap
scheme_start_in_scheduler
scheme_end_in_scheduler
scheme_out_of_fuel
scheme_thread
scheme_thread_w_details
scheme_kill_thread
scheme_break_thread
scheme_break_main_thread
scheme_set_break_main_target
scheme_thread_block
scheme_thread_block_enable_break
scheme_swap_thread
scheme_making_progress
scheme_weak_suspend_thread
scheme_weak_resume_thread
scheme_block_until
scheme_block_until_enable_break
scheme_block_until_unless
scheme_wait_input_allowed
scheme_unless_ready
scheme_in_main_thread
scheme_cancel_sleep
scheme_start_sleeper_thread
scheme_end_sleeper_thread
scheme_notify_sleep_progress
scheme_make_thread_cell
scheme_thread_cell_get
scheme_thread_cell_set
scheme_tls_allocate
scheme_tls_set
scheme_tls_get
scheme_make_custodian
scheme_add_managed
scheme_custodian_check_available
scheme_custodian_is_available
scheme_remove_managed
scheme_close_managed
scheme_schedule_custodian_close
scheme_add_custodian_extractor
scheme_add_atexit_closer
scheme_add_evt
scheme_add_evt_through_sema
scheme_is_evt
scheme_sync
scheme_sync_enable_break
scheme_sync_timeout
scheme_make_evt_set
scheme_add_swap_callback
scheme_add_swap_out_callback
scheme_call_enable_break
scheme_close_should_force_port_closed
scheme_push_kill_action
scheme_pop_kill_action
scheme_set_can_break
scheme_push_break_enable
scheme_pop_break_enable
scheme_with_stack_freeze
scheme_frozen_run_some
scheme_is_in_frozen_stack
scheme_signal_error
scheme_raise_exn
scheme_warning
scheme_raise
scheme_log_level_p
scheme_log
scheme_log_message
scheme_log_abort
scheme_out_of_memory_abort
scheme_wrong_count
scheme_wrong_count_m
scheme_case_lambda_wrong_count
scheme_wrong_type
scheme_wrong_field_type
scheme_arg_mismatch
scheme_wrong_return_arity
scheme_unbound_global
scheme_dynamic_wind
scheme_make_type
scheme_get_type_name
scheme_eof
scheme_make_eof
scheme_null
scheme_make_null
scheme_true
scheme_make_true
scheme_false
scheme_make_false
scheme_void
scheme_make_void
scheme_undefined
scheme_tail_call_waiting
scheme_multiple_values
scheme_uchar_table
scheme_uchar_cases_table
scheme_uchar_cats_table
scheme_uchar_ups
scheme_uchar_downs
scheme_uchar_titles
scheme_uchar_folds
scheme_uchar_combining_classes
scheme_eval
scheme_eval_multi
scheme_eval_with_prompt
scheme_eval_multi_with_prompt
scheme_eval_compiled
scheme_eval_compiled_multi
_scheme_eval_compiled
_scheme_eval_compiled_multi
scheme_apply
scheme_apply_multi
scheme_apply_no_eb
scheme_apply_multi_no_eb
scheme_apply_to_list
scheme_apply_with_prompt
scheme_apply_multi_with_prompt
_scheme_apply_with_prompt
_scheme_apply_multi_with_prompt
scheme_eval_string
scheme_eval_string_multi
scheme_eval_string_all
scheme_eval_string_with_prompt
scheme_eval_string_multi_with_prompt
scheme_eval_string_all_with_prompt
scheme_eval_module_string
_scheme_apply_known_prim_closure
_scheme_apply_known_prim_closure_multi
_scheme_apply_prim_closure
_scheme_apply_prim_closure_multi
scheme_current_argument_stack
scheme_call_with_prompt
scheme_call_with_prompt_multi
_scheme_call_with_prompt
_scheme_call_with_prompt_multi
scheme_values
scheme_check_one_value
scheme_tail_apply
scheme_tail_apply_no_copy
scheme_tail_apply_to_list
scheme_tail_eval_expr
scheme_set_tail_buffer_size
scheme_force_value
scheme_force_one_value
scheme_set_cont_mark
scheme_push_continuation_frame
scheme_pop_continuation_frame
scheme_temp_dec_mark_depth
scheme_temp_inc_mark_depth
scheme_current_continuation_marks
scheme_extract_one_cc_mark
scheme_extract_one_cc_mark_to_tag
scheme_do_eval
scheme_eval_compiled_stx_string
scheme_load_compiled_stx_string
scheme_compiled_stx_symbol
scheme_eval_compiled_sized_string
scheme_eval_compiled_sized_string_with_magic
scheme_detach_multple_array
GC_malloc
GC_malloc_atomic
GC_malloc_one_tagged
GC_malloc_atomic_uncollectable
scheme_malloc_uncollectable
GC_malloc_array_tagged
GC_malloc_allow_interior
GC_malloc_atomic_allow_interior
GC_malloc_tagged_allow_interior
scheme_malloc_code
scheme_free_code
scheme_malloc_gcable_code
scheme_malloc_eternal
scheme_end_stubborn_change
scheme_calloc
scheme_strdup
scheme_strdup_eternal
scheme_malloc_fail_ok
scheme_weak_reference
scheme_weak_reference_indirect
scheme_unweak_reference
scheme_add_finalizer
scheme_add_finalizer_once
scheme_subtract_finalizer
scheme_add_scheme_finalizer
scheme_add_scheme_finalizer_once
scheme_register_finalizer
scheme_remove_all_finalization
scheme_dont_gc_ptr
scheme_gc_ptr_ok
scheme_collect_garbage
GC_variable_stack
GC_register_traversers
GC_resolve
GC_mark
GC_fixup
GC_fixup_self
scheme_malloc_immobile_box
scheme_free_immobile_box
scheme_make_bucket_table
scheme_add_to_table
scheme_change_in_table
scheme_lookup_in_table
scheme_bucket_from_table
scheme_bucket_table_equal
scheme_clone_bucket_table
scheme_make_hash_table
scheme_make_hash_table_equal
scheme_make_hash_table_eqv
scheme_hash_set
scheme_hash_get
scheme_eq_hash_get
scheme_hash_set_atomic
scheme_hash_get_atomic
scheme_hash_table_equal
scheme_is_hash_table_equal
scheme_is_hash_table_eqv
scheme_clone_hash_table
scheme_make_hash_tree
scheme_hash_tree_set
scheme_hash_tree_get
scheme_hash_tree_next
scheme_hash_tree_index
scheme_hash_tree_equal
scheme_is_hash_tree_equal
scheme_is_hash_tree_eqv
scheme_make_prim
scheme_make_noneternal_prim
scheme_make_prim_w_arity
scheme_make_folding_prim
scheme_make_immed_prim
scheme_make_noncm_prim
scheme_make_noneternal_prim_w_arity
scheme_make_prim_w_everything
scheme_make_prim_closure_w_arity
scheme_make_folding_prim_closure
scheme_make_closed_prim
scheme_make_closed_prim_w_arity
scheme_make_folding_closed_prim
scheme_make_closed_prim_w_everything
scheme_prim_is_method
scheme_make_pair
scheme_make_mutable_pair
scheme_make_raw_pair
scheme_make_byte_string
scheme_make_sized_byte_string
scheme_make_sized_offset_byte_string
scheme_make_immutable_sized_byte_string
scheme_make_byte_string_without_copying
scheme_alloc_byte_string
scheme_append_byte_string
scheme_make_utf8_string
scheme_make_sized_utf8_string
scheme_make_sized_offset_utf8_string
scheme_make_immutable_sized_utf8_string
scheme_make_locale_string
scheme_char_string_to_byte_string
scheme_byte_string_to_char_string
scheme_char_string_to_byte_string_locale
scheme_byte_string_to_char_string_locale
scheme_char_string_to_path
scheme_path_to_char_string
scheme_make_char_string
scheme_make_sized_char_string
scheme_make_sized_offset_char_string
scheme_make_immutable_sized_char_string
scheme_make_char_string_without_copying
scheme_alloc_char_string
scheme_append_char_string
scheme_string_recase
scheme_make_vector
scheme_make_integer_value
scheme_make_integer_value_from_unsigned
scheme_make_integer_value_from_long_long
scheme_make_integer_value_from_unsigned_long_long
scheme_make_integer_value_from_long_halves
scheme_make_integer_value_from_unsigned_long_halves
scheme_make_double
scheme_make_char
scheme_make_char_or_nul
scheme_make_sema
scheme_post_sema
scheme_post_sema_all
scheme_wait_sema
scheme_try_plain_sema
scheme_char_constants
scheme_make_channel
scheme_make_channel_put_evt
scheme_get_int_val
scheme_get_unsigned_int_val
scheme_get_long_long_val
scheme_get_unsigned_long_long_val
scheme_real_to_double
scheme_make_cptr
scheme_make_offset_cptr
scheme_make_external_cptr
scheme_make_offset_external_cptr
scheme_get_proc_name
scheme_utf8_decode
scheme_utf8_decode_as_prefix
scheme_utf8_decode_all
scheme_utf8_decode_prefix
scheme_utf8_decode_to_buffer
scheme_utf8_decode_to_buffer_len
scheme_utf8_decode_count
scheme_utf8_encode
scheme_utf8_encode_all
scheme_utf8_encode_to_buffer
scheme_utf8_encode_to_buffer_len
scheme_ucs4_to_utf16
scheme_utf16_to_ucs4
scheme_open_converter
scheme_close_converter
scheme_make_bignum
scheme_make_bignum_from_unsigned
scheme_make_bignum_from_long_long
scheme_make_bignum_from_unsigned_long_long
scheme_bignum_to_double
scheme_bignum_from_double
scheme_bignum_to_string
scheme_bignum_to_allocated_string
scheme_read_bignum
scheme_read_bignum_bytes
scheme_bignum_normalize
scheme_make_rational
scheme_rational_to_double
scheme_rational_from_double
scheme_rational_normalize
scheme_rational_numerator
scheme_rational_denominator
scheme_make_complex
scheme_complex_normalize
scheme_complex_real_part
scheme_complex_imaginary_part
scheme_is_exact
scheme_is_inexact
scheme_expand
scheme_compile
scheme_read
scheme_read_syntax
scheme_write
scheme_print
scheme_display
scheme_write_w_max
scheme_display_w_max
scheme_print_w_max
scheme_write_byte_string
scheme_write_char_string
scheme_put_byte_string
scheme_put_char_string
scheme_write_to_string
scheme_display_to_string
scheme_print_to_string
scheme_write_to_string_w_max
scheme_display_to_string_w_max
scheme_print_to_string_w_max
scheme_debug_print
scheme_flush_output
scheme_format
scheme_printf
scheme_format_utf8
scheme_printf_utf8
scheme_getc
scheme_get_byte
scheme_peekc
scheme_peek_byte
scheme_peekc_skip
scheme_peek_byte_skip
scheme_getc_special_ok
scheme_get_byte_special_ok
scheme_peekc_special_ok
scheme_peek_byte_special_ok_skip
scheme_peekc_special_ok_skip
scheme_ungetc
scheme_byte_ready
scheme_char_ready
scheme_peekc_is_ungetc
scheme_need_wakeup
scheme_get_byte_string
scheme_get_byte_string_unless
scheme_get_byte_string_special_ok_unless
scheme_progress_evt
scheme_peeked_read
scheme_get_char_string
scheme_get_bytes
scheme_get_ready_special
scheme_tell
scheme_output_tell
scheme_tell_line
scheme_tell_column
scheme_tell_all
scheme_count_lines
scheme_close_input_port
scheme_close_output_port
scheme_write_special
scheme_write_special_nonblock
scheme_make_write_evt
scheme_port_record
scheme_input_port_record
scheme_output_port_record
scheme_is_input_port
scheme_is_output_port
scheme_make_port_type
scheme_make_input_port
scheme_make_output_port
scheme_set_next_port_custodian
scheme_set_port_location_fun
scheme_set_port_count_lines_fun
scheme_progress_evt_via_get
scheme_peeked_read_via_get
scheme_write_evt_via_write
scheme_write_special_evt_via_write_special
scheme_open_input_file
scheme_open_output_file
scheme_open_input_output_file
scheme_open_output_file_with_mode
scheme_make_file_input_port
scheme_make_named_file_input_port
scheme_make_file_output_port
scheme_make_fd_input_port
scheme_make_fd_output_port
scheme_make_byte_string_input_port
scheme_make_sized_byte_string_input_port
scheme_make_byte_string_output_port
scheme_get_sized_byte_string_output
scheme_get_reset_sized_byte_string_output
scheme_pipe
scheme_pipe_with_limit
scheme_make_null_output_port
scheme_make_redirect_output_port
scheme_set_file_position
scheme_file_exists
scheme_directory_exists
scheme_expand_filename
scheme_expand_user_filename
scheme_expand_string_filename
scheme_os_getcwd
scheme_os_setcwd
scheme_getdrive
scheme_split_path
scheme_build_path
scheme_path_to_directory_path
scheme_path_to_complete_path
scheme_make_path
scheme_make_sized_path
scheme_make_sized_offset_path
scheme_make_sized_offset_kind_path
scheme_make_path_without_copying
scheme_alloc_fdset_array
scheme_init_fdset_array
scheme_get_fdset
scheme_fdzero
scheme_fdset
scheme_fdclr
scheme_fdisset
scheme_add_fd_handle
scheme_add_fd_eventmask
scheme_collapse_win_fd
scheme_security_check_file
scheme_security_check_file_link
scheme_security_check_network
scheme_get_host_address
scheme_free_host_address
scheme_host_address_strerror
scheme_getnameinfo
scheme_get_port_file_descriptor
scheme_get_port_fd
scheme_get_port_socket
scheme_socket_to_ports
scheme_set_type_printer
scheme_print_bytes
scheme_print_utf8
scheme_print_string
scheme_read_byte_string
scheme_make_namespace
scheme_add_global
scheme_add_global_symbol
scheme_make_envunbox
scheme_lookup_global
scheme_global_bucket
scheme_global_keyword_bucket
scheme_module_bucket
scheme_builtin_value
scheme_set_global_bucket
scheme_install_macro
scheme_save_initial_module_set
scheme_primitive_module
scheme_finish_primitive_module
scheme_protect_primitive_provide
scheme_make_modidx
scheme_apply_for_syntax_in_env
scheme_dynamic_require
scheme_namespace_require
scheme_is_module_path
scheme_datum_to_kernel_stx
scheme_intern_symbol
scheme_intern_exact_symbol
scheme_intern_exact_char_symbol
scheme_make_symbol
scheme_make_exact_symbol
scheme_make_exact_char_symbol
scheme_symbol_name
scheme_symbol_name_and_size
scheme_symbol_val
scheme_intern_exact_keyword
scheme_intern_exact_char_keyword
scheme_make_struct_values
scheme_make_struct_names
scheme_make_struct_type
scheme_make_struct_type2
scheme_make_struct_instance
scheme_is_struct_instance
scheme_struct_ref
scheme_struct_set
scheme_make_struct_type_property
scheme_make_struct_type_property_w_guard
scheme_struct_type_property_ref
scheme_chaperone_struct_type_property_ref
scheme_make_location
scheme_is_location
scheme_make_inspector
scheme_is_subinspector
scheme_eq
scheme_eqv
scheme_equal
scheme_chaperone_of
scheme_hash_key
scheme_equal_hash_key
scheme_equal_hash_key2
scheme_recur_equal_hash_key
scheme_recur_equal_hash_key2
scheme_eqv_hash_key
scheme_eqv_hash_key2
scheme_set_type_equality
scheme_recur_equal
scheme_build_list
scheme_build_list_offset
scheme_is_list
scheme_list_length
scheme_proper_list_length
scheme_alloc_list
scheme_map_1
scheme_car
scheme_cdr
scheme_cadr
scheme_caddr
scheme_vector_to_list
scheme_list_to_vector
scheme_append
scheme_reverse
scheme_box
scheme_unbox
scheme_set_box
scheme_make_weak_box
scheme_make_ephemeron
scheme_ephemeron_value
scheme_ephemeron_key
scheme_load
scheme_load_extension
scheme_register_extension_global
scheme_get_seconds
scheme_get_milliseconds
scheme_get_inexact_milliseconds
scheme_get_process_milliseconds
scheme_get_thread_milliseconds
scheme_banner
scheme_version
scheme_check_proc_arity
scheme_check_proc_arity2
scheme_make_provided_string
scheme_make_args_string
scheme_system_library_subpath
scheme_signal_received
scheme_signal_received_at
scheme_get_signal_handle
scheme_char_strlen

20
src/mzscheme/main.c
View File

@ -1,5 +1,5 @@
/* /*
MzScheme Racket
Copyright (c) 2004-2010 PLT Scheme Inc. Copyright (c) 2004-2010 PLT Scheme Inc.
Copyright (c) 1995-2000 Matthew Flatt Copyright (c) 1995-2000 Matthew Flatt
@ -23,7 +23,7 @@
All rights reserved. All rights reserved.
*/ */
/* This file defines MzScheme's main(), which is a jumble of /* This file defines Racket's main(), which is a jumble of
platform-specific initialization. The included file "cmdline.inc" platform-specific initialization. The included file "cmdline.inc"
implements command-line parsing. (MrEd also uses "cmdline.inc".) implements command-line parsing. (MrEd also uses "cmdline.inc".)
@ -136,22 +136,22 @@ extern Scheme_Object *scheme_initialize(Scheme_Env *env);
#endif #endif
#ifdef EXPAND_FILENAME_TILDE #ifdef EXPAND_FILENAME_TILDE
# define INIT_FILENAME "~/.mzschemerc" # define INIT_FILENAME "~/.racketrc"
#else #else
# ifdef DOS_FILE_SYSTEM # ifdef DOS_FILE_SYSTEM
# define INIT_FILENAME "%%HOMEDRIVE%%\\%%HOMEPATH%%\\mzschemerc.ss" # define INIT_FILENAME "%%HOMEDRIVE%%\\%%HOMEPATH%%\\racketrc.ss"
# else # else
# define INIT_FILENAME "PREFERENCES:mzschemerc.ss" # define INIT_FILENAME "PREFERENCES:racketrc.ss"
# endif # endif
#endif #endif
#define GET_INIT_FILENAME get_init_filename #define GET_INIT_FILENAME get_init_filename
#define PRINTF printf #define PRINTF printf
#define PROGRAM "MzScheme" #define PROGRAM "Racket"
#define PROGRAM_LC "mzscheme" #define PROGRAM_LC "racket"
#define INITIAL_BIN_TYPE "zi" #define INITIAL_BIN_TYPE "zi"
#define BANNER scheme_banner() #define BANNER scheme_banner()
#define MZSCHEME_CMD_LINE #define RACKET_CMD_LINE
#define INITIAL_NAMESPACE_MODULE "scheme/init" #define INITIAL_NAMESPACE_MODULE "racket/init"
/*========================================================================*/ /*========================================================================*/
/* command-line parsing */ /* command-line parsing */
@ -234,7 +234,7 @@ int MAIN(int argc, MAIN_char **MAIN_argv)
# ifndef MZ_PRECISE_GC # ifndef MZ_PRECISE_GC
load_delayed_dll(NULL, "libmzgcxxxxxxx.dll"); load_delayed_dll(NULL, "libmzgcxxxxxxx.dll");
# endif # endif
load_delayed_dll(NULL, "libmzsch" DLL_3M_SUFFIX "xxxxxxx.dll"); load_delayed_dll(NULL, "libracket" DLL_3M_SUFFIX "xxxxxxx.dll");
record_dll_path(); record_dll_path();
# ifdef IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS # ifdef IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS
scheme_register_tls_space(&tls_space, _tls_index); scheme_register_tls_space(&tls_space, _tls_index);

14
src/mzscheme/src/Makefile.in
View File

@ -1,5 +1,5 @@
# #
# Makefile for mzscheme basic sources # Makefile for racket basic sources
# #
srcdir = @srcdir@ srcdir = @srcdir@
@ -106,8 +106,8 @@ all:
$(MAKE) mzobjects $(MAKE) mzobjects
mzheaders: $(srcdir)/schemex.h $(srcdir)/schemexm.h $(srcdir)/schemex.inc $(srcdir)/schexn.h schsys.h \ mzheaders: $(srcdir)/schemex.h $(srcdir)/schemexm.h $(srcdir)/schemex.inc $(srcdir)/schexn.h schsys.h \
$(srcdir)/../include/mzscheme.exp $(srcdir)/../include/mzwin.def $(srcdir)/../include/gmzwin.def \ $(srcdir)/../include/racket.exp $(srcdir)/../include/mzwin.def $(srcdir)/../include/gmzwin.def \
$(srcdir)/../include/mzscheme3m.exp $(srcdir)/../include/mzwin3m.def $(srcdir)/../include/racket3m.exp $(srcdir)/../include/mzwin3m.def
mzobjects: $(OBJS) mzobjects: $(OBJS)
@ -123,11 +123,11 @@ $(srcdir)/schemexm.h : $(srcdir)/schemef.h $(srcdir)/makex
$(srcdir)/schemex.inc : $(srcdir)/schemef.h $(srcdir)/makex $(srcdir)/schemex.inc : $(srcdir)/schemef.h $(srcdir)/makex
if [ "$(PERL)" = '' ] ; then touch $(srcdir)/schemex.inc ; else $(PERL) -s -- $(srcdir)/makex -assign < $(srcdir)/schemef.h > $(srcdir)/schemex.inc ; fi if [ "$(PERL)" = '' ] ; then touch $(srcdir)/schemex.inc ; else $(PERL) -s -- $(srcdir)/makex -assign < $(srcdir)/schemef.h > $(srcdir)/schemex.inc ; fi
$(srcdir)/../include/mzscheme.exp : $(srcdir)/schemef.h $(srcdir)/makex $(srcdir)/../include/racket.exp : $(srcdir)/schemef.h $(srcdir)/makex
if [ "$(PERL)" = '' ] ; then touch $(srcdir)/../include/mzscheme.exp ; else $(PERL) -s -- $(srcdir)/makex -exports < $(srcdir)/schemef.h > $(srcdir)/../include/mzscheme.exp ; fi if [ "$(PERL)" = '' ] ; then touch $(srcdir)/../include/racket.exp ; else $(PERL) -s -- $(srcdir)/makex -exports < $(srcdir)/schemef.h > $(srcdir)/../include/racket.exp ; fi
$(srcdir)/../include/mzscheme3m.exp : $(srcdir)/schemef.h $(srcdir)/makex $(srcdir)/../include/racket3m.exp : $(srcdir)/schemef.h $(srcdir)/makex
if [ "$(PERL)" = '' ] ; then touch $(srcdir)/../include/mzscheme3m.exp ; else $(PERL) -s -- $(srcdir)/makex -exports -precisegc < $(srcdir)/schemef.h > $(srcdir)/../include/mzscheme3m.exp ; fi if [ "$(PERL)" = '' ] ; then touch $(srcdir)/../include/racket3m.exp ; else $(PERL) -s -- $(srcdir)/makex -exports -precisegc < $(srcdir)/schemef.h > $(srcdir)/../include/racket3m.exp ; fi
$(srcdir)/../include/mzwin.def : $(srcdir)/schemef.h $(srcdir)/makex $(srcdir)/../include/mzwin.def : $(srcdir)/schemef.h $(srcdir)/makex
if [ "$(PERL)" = '' ] ; then touch $(srcdir)/../include/mzwin.def ; else $(PERL) -s -- $(srcdir)/makex -winex < $(srcdir)/schemef.h > $(srcdir)/../include/mzwin.def ; fi if [ "$(PERL)" = '' ] ; then touch $(srcdir)/../include/mzwin.def ; else $(PERL) -s -- $(srcdir)/makex -winex < $(srcdir)/schemef.h > $(srcdir)/../include/mzwin.def ; fi

2
src/mzscheme/src/string.c
View File

@ -1945,7 +1945,7 @@ char *scheme_banner(void)
if (embedding_banner) if (embedding_banner)
return embedding_banner; return embedding_banner;
else else
return "Welcome to MzScheme" return "Welcome to Racket"
" v" MZSCHEME_VERSION VERSION_SUFFIX " v" MZSCHEME_VERSION VERSION_SUFFIX
", Copyright (c) 2004-2010 PLT Scheme Inc.\n"; ", Copyright (c) 2004-2010 PLT Scheme Inc.\n";
} }

8
src/worksp/build.bat
View File

@ -5,7 +5,7 @@ devenv mred.sln /Build Release
cd .. cd ..
cd gc2 cd gc2
..\..\..\mzschemecgc -cu make.ss ..\..\..\racketcgc -cu make.ss
cd .. cd ..
cd mzcom cd mzcom
@ -15,11 +15,11 @@ devenv libmysterx.sln /Build Release
cd .. cd ..
cd libmysterx cd libmysterx
..\..\..\mzscheme -cu xform.ss ..\..\..\racket -cu xform.ss
cd .. cd ..
cd mzcom cd mzcom
..\..\..\mzscheme -cu xform.ss ..\..\..\racket -cu xform.ss
cd .. cd ..
cd mzcom cd mzcom
@ -34,4 +34,4 @@ cd ..\mrstart
devenv mrstart.sln /Build Release devenv mrstart.sln /Build Release
cd .. cd ..
..\..\mzscheme -l setup ..\..\racket -l setup -N "rico setup"

22
src/worksp/gc2/make.ss
View File

@ -231,8 +231,8 @@
mz-inc)) mz-inc))
(c-compile "../../mzscheme/src/mzsj86.c" "xsrc/mzsj86.obj" '() mz-inc) (c-compile "../../mzscheme/src/mzsj86.c" "xsrc/mzsj86.obj" '() mz-inc)
(define dll "../../../lib/libmzsch3mxxxxxxx.dll") (define dll "../../../lib/libracket3mxxxxxxx.dll")
(define exe "../../../MzScheme.exe") (define exe "../../../Racket.exe")
(define libs "kernel32.lib user32.lib ws2_32.lib shell32.lib advapi32.lib") (define libs "kernel32.lib user32.lib ws2_32.lib shell32.lib advapi32.lib")
@ -307,9 +307,9 @@
"mzscheme.res" "mzscheme.res"
"xsrc/main.obj" "xsrc/main.obj"
"xsrc/uniplt.obj" "xsrc/uniplt.obj"
"../../../lib/msvc/libmzsch3mxxxxxxx.lib")]) "../../../lib/msvc/libracket3mxxxxxxx.lib")])
(link-dll objs (link-dll objs
'("libmzsch3mxxxxxxx.dll") '("libracket3mxxxxxxx.dll")
'("delayimp.lib") '("delayimp.lib")
exe "" #t)) exe "" #t))
@ -460,7 +460,7 @@
wxs-srcs wxs-srcs
mred-srcs)))] mred-srcs)))]
[libs (list [libs (list
"../../../lib/msvc/libmzsch3mxxxxxxx.lib" "../../../lib/msvc/libracket3mxxxxxxx.lib"
"../wxutils/Release/wxutils.lib" "../wxutils/Release/wxutils.lib"
"../jpeg/Release/jpeg.lib" "../jpeg/Release/jpeg.lib"
"../png/Release/png.lib" "../png/Release/png.lib"
@ -470,7 +470,7 @@
"gdi32.lib" "comdlg32.lib" "advapi32.lib" "gdi32.lib" "comdlg32.lib" "advapi32.lib"
"shell32.lib" "ole32.lib" "oleaut32.lib" "shell32.lib" "ole32.lib" "oleaut32.lib"
"winmm.lib")]) "winmm.lib")])
(link-dll (append objs libs) null win-libs "../../../lib/libmred3mxxxxxxx.dll" "" #f)) (link-dll (append objs libs) null win-libs "../../../lib/libgracket3mxxxxxxx.dll" "" #f))
(wx-try "mred" "mred" "mrmain" #f "cxx" #t) (wx-try "mred" "mred" "mrmain" #f "cxx" #t)
@ -480,14 +480,14 @@
"mred.res" "mred.res"
"xsrc/mrmain.obj" "xsrc/mrmain.obj"
"xsrc/uniplt.obj" "xsrc/uniplt.obj"
"../../../lib/msvc/libmzsch3mxxxxxxx.lib" "../../../lib/msvc/libracket3mxxxxxxx.lib"
"../../../lib/msvc/libmred3mxxxxxxx.lib")]) "../../../lib/msvc/libgracket3mxxxxxxx.lib")])
(link-dll objs (link-dll objs
'("libmzsch3mxxxxxxx.dll" '("libracket3mxxxxxxx.dll"
"libmred3mxxxxxxx.dll") "libgracket3mxxxxxxx.dll")
'("advapi32.lib" '("advapi32.lib"
"delayimp.lib") "delayimp.lib")
"../../../MrEd.exe" " /subsystem:windows" #t)) "../../../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- "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") (system- "lib.exe -def:../../mzscheme/dynsrc/mzdyn.def -out:mzdyn3m.lib")

8
src/worksp/libmred/libmred.vcproj
View File

@ -66,11 +66,11 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386" AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="ComCtl32.lib Glu32.lib OpenGL32.lib Unicows.lib WinMM.lib WS2_32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Advapi32.lib Ole32.lib" AdditionalDependencies="ComCtl32.lib Glu32.lib OpenGL32.lib Unicows.lib WinMM.lib WS2_32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Advapi32.lib Ole32.lib"
OutputFile="..\..\..\lib\$(ProjectName)xxxxxxx.dll" OutputFile="..\..\..\lib\libgracketxxxxxxx.dll"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
BaseAddress="0x11000000" BaseAddress="0x11000000"
ImportLibrary="..\..\..\lib\msvc\$(ProjectName)xxxxxxx.lib" ImportLibrary="..\..\..\lib\msvc\libgracketxxxxxxx.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -153,11 +153,11 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386" AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="ComCtl32.lib Glu32.lib OpenGL32.lib Unicows.lib WinMM.lib WS2_32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Advapi32.lib Ole32.lib" AdditionalDependencies="ComCtl32.lib Glu32.lib OpenGL32.lib Unicows.lib WinMM.lib WS2_32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Advapi32.lib Ole32.lib"
OutputFile="..\..\..\lib\$(ProjectName)xxxxxxx.dll" OutputFile="..\..\..\lib\libgracketxxxxxxx.dll"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
BaseAddress="0x11000000" BaseAddress="0x11000000"
ImportLibrary="..\..\..\lib\msvc\$(ProjectName)xxxxxxx.lib" ImportLibrary="..\..\..\lib\msvc\libgracketxxxxxxx.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

8
src/worksp/libmzsch/libmzsch.vcproj
View File

@ -67,11 +67,11 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386" AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="Unicows.lib WS2_32.lib Shell32.lib User32.lib" AdditionalDependencies="Unicows.lib WS2_32.lib Shell32.lib User32.lib"
OutputFile="..\..\..\lib\$(ProjectName)xxxxxxx.dll" OutputFile="..\..\..\lib\libracketxxxxxxx.dll"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
BaseAddress="0x10400000" BaseAddress="0x10400000"
ImportLibrary="..\..\..\lib\msvc\$(ProjectName)xxxxxxx.lib" ImportLibrary="..\..\..\lib\msvc\libracketxxxxxxx.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -155,11 +155,11 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386" AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="Unicows.lib WS2_32.lib Shell32.lib User32.lib" AdditionalDependencies="Unicows.lib WS2_32.lib Shell32.lib User32.lib"
OutputFile="..\..\..\lib\$(ProjectName)xxxxxxx.dll" OutputFile="..\..\..\lib\libracketxxxxxxx.dll"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
BaseAddress="0x10400000" BaseAddress="0x10400000"
ImportLibrary="..\..\..\lib\msvc\$(ProjectName)xxxxxxx.lib" ImportLibrary="..\..\..\lib\msvc\libracketxxxxxxx.lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"

12
src/worksp/mred/mred.vcproj
View File

@ -68,14 +68,14 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libmzschxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll /DELAYLOAD:libmredxxxxxxx.dll" AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libracketxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll /DELAYLOAD:libgracketxxxxxxx.dll"
AdditionalDependencies="Unicows.lib WS2_32.lib User32.lib Advapi32.lib delayimp.lib" AdditionalDependencies="Unicows.lib WS2_32.lib User32.lib Advapi32.lib delayimp.lib"
OutputFile="..\..\..\$(ProjectName)CGC.exe" OutputFile="..\..\..\GRacketCGC.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libcd.lib" IgnoreDefaultLibraryNames="libcd.lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\..\$(ProjectName)CGC.pdb" ProgramDatabaseFile="..\..\..\GRacketCGC.pdb"
SubSystem="2" SubSystem="2"
/> />
<Tool <Tool
@ -154,13 +154,13 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libmzschxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll /DELAYLOAD:libmredxxxxxxx.dll" AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libracketxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll /DELAYLOAD:libgracketxxxxxxx.dll"
AdditionalDependencies="Unicows.lib WS2_32.lib User32.lib Advapi32.lib delayimp.lib" AdditionalDependencies="Unicows.lib WS2_32.lib User32.lib Advapi32.lib delayimp.lib"
OutputFile="..\..\..\$(ProjectName)CGC.exe" OutputFile="..\..\..\GRacketCGC.exe"
SuppressStartupBanner="true" SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libcd.lib" IgnoreDefaultLibraryNames="libcd.lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\..\$(ProjectName)CGC.pdb" ProgramDatabaseFile="..\..\..\GRacketCGC.pdb"
SubSystem="2" SubSystem="2"
/> />
<Tool <Tool

12
src/worksp/mzscheme/mzscheme.vcproj
View File

@ -64,12 +64,12 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libmzschxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll" AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libracketxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll"
AdditionalDependencies="unicows.lib delayimp.lib user32.lib" AdditionalDependencies="unicows.lib delayimp.lib user32.lib"
OutputFile="..\..\..\$(ProjectName)CGC.exe" OutputFile="..\..\..\RacketCGC.exe"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\..\$(ProjectName)CGC.pdb" ProgramDatabaseFile="..\..\..\RacketCGC.pdb"
SubSystem="1" SubSystem="1"
/> />
<Tool <Tool
@ -152,13 +152,13 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libmzschxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll" AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libracketxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll"
AdditionalDependencies="unicows.lib delayimp.lib user32.lib" AdditionalDependencies="unicows.lib delayimp.lib user32.lib"
OutputFile="..\..\..\$(ProjectName)CGC.exe" OutputFile="..\..\..\RacketCGC.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\..\$(ProjectName)CGC.pdb" ProgramDatabaseFile="..\..\..\RacketCGC.pdb"
SubSystem="1" SubSystem="1"
/> />
<Tool <Tool