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

SHA1-based shortcut for compiler/cm

Browse Source
This commit is contained in:
Matthew Flatt 2010-04-30 14:44:16 -06:00
parent 85fad33c4c
commit 3db8dd7c26
10 changed files with 283 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
collects/compiler/cm.rkt
View File

@ -5,7 +5,9 @@
unstable/file unstable/file
scheme/file scheme/file
scheme/list scheme/list
scheme/path) scheme/path
racket/promise
openssl/sha1)
(provide make-compilation-manager-load/use-compiled-handler (provide make-compilation-manager-load/use-compiled-handler
managed-compile-zo managed-compile-zo
@ -13,8 +15,8 @@
trust-existing-zos trust-existing-zos
manager-compile-notify-handler manager-compile-notify-handler
manager-skip-file-handler manager-skip-file-handler
file-date-in-collection file-stamp-in-collection
file-date-in-paths file-stamp-in-paths
(rename-out [trace manager-trace-handler])) (rename-out [trace manager-trace-handler]))
(define manager-compile-notify-handler (make-parameter void)) (define manager-compile-notify-handler (make-parameter void))
@ -23,10 +25,10 @@
(define trust-existing-zos (make-parameter #f)) (define trust-existing-zos (make-parameter #f))
(define manager-skip-file-handler (make-parameter (λ (x) #f))) (define manager-skip-file-handler (make-parameter (λ (x) #f)))
(define (file-date-in-collection p) (define (file-stamp-in-collection p)
(file-date-in-paths p (current-library-collection-paths))) (file-stamp-in-paths p (current-library-collection-paths)))
(define (file-date-in-paths p paths) (define (file-stamp-in-paths p paths)
(let ([p-eles (explode-path (simplify-path p))]) (let ([p-eles (explode-path (simplify-path p))])
(let c-loop ([paths paths]) (let c-loop ([paths paths])
(cond (cond
@ -47,11 +49,16 @@
#f #f
(lambda () #f)))] (lambda () #f)))]
[date (or p-date alt-date)] [date (or p-date alt-date)]
[get-path (lambda ()
(if p-date
p
(rkt->ss p)))]
[mode (car (use-compiled-file-paths))]
[get-zo-date (lambda (name) [get-zo-date (lambda (name)
(file-or-directory-modify-seconds (file-or-directory-modify-seconds
(build-path (build-path
base base
(car (use-compiled-file-paths)) mode
(path-add-suffix name #".zo")) (path-add-suffix name #".zo"))
#f #f
(lambda () #f)))] (lambda () #f)))]
@ -62,12 +69,21 @@
(not alt-date) (not alt-date)
(not main-zo-date))) (not main-zo-date)))
(get-zo-date (rkt->ss name)))] (get-zo-date (rkt->ss name)))]
[zo-date (or main-zo-date alt-zo-date)]) [zo-date (or main-zo-date alt-zo-date)]
(or (and date [get-zo-path (lambda ()
zo-date (if main-zo-date
(max date zo-date)) (path-add-suffix name #".zo")
date (path-add-suffix (rkt->ss name) #".zo")))])
zo-date)))] (cond
[(and zo-date
(or (not date)
(zo-date . > . date)))
(cons zo-date
(delay (get-compiled-sha1 mode (get-zo-path))))]
[date
(cons date
(delay (get-source-sha1 (get-path))))]
[else #f])))]
[(null? p-eles) [(null? p-eles)
;; this case shouldn't happen... I think. ;; this case shouldn't happen... I think.
(c-loop (cdr paths))] (c-loop (cdr paths))]
@ -107,7 +123,11 @@
dir)) dir))
(define (touch path) (define (touch path)
(close-output-port (open-output-file path #:exists 'append))) (file-or-directory-modify-seconds
path
(current-seconds)
(lambda ()
(close-output-port (open-output-file path #:exists 'append)))))
(define (try-file-time path) (define (try-file-time path)
(file-or-directory-modify-seconds path #f (lambda () #f))) (file-or-directory-modify-seconds path #f (lambda () #f)))
@ -148,20 +168,57 @@
(rename-file-or-directory tmp-path path #t) (rename-file-or-directory tmp-path path #t)
(try-delete-file tmp-path)))))) (try-delete-file tmp-path))))))
(define (write-deps code mode path external-deps reader-deps) (define (get-source-sha1 p)
(with-handlers ([exn:fail:filesystem? (lambda (exn) #f)])
(call-with-input-file* p sha1)))
(define (get-dep-sha1s deps up-to-date read-src-syntax mode must-exist?)
(let ([l (for/fold ([l null]) ([dep (in-list deps)])
(and l
;; (cons 'ext rel-path) => a non-module file, check source
;; rel-path => a module file name, check cache
(let* ([ext? (and (pair? dep) (eq? 'ext (car dep)))]
[p (main-collects-relative->path (if ext? (cdr dep) dep))])
(cond
[ext? (let ([v (get-source-sha1 p)])
(cond
[v (cons (cons (delay v) dep) l)]
[must-exist? (error 'cm "cannot find external-dependency file: ~v" p)]
[else #f]))]
[(or (hash-ref up-to-date (simplify-path (cleanse-path p)) #f)
;; Use `compiler-root' with `sha1-only?' as #t:
(compile-root mode p up-to-date read-src-syntax #t))
=> (lambda (sh)
(cons (cons (cdr sh) dep) l))]
[must-exist?
(error 'cm "internal error?; cannot find sha1 for module: ~v" p)]
[else #f]))))])
(and l
(let ([p (open-output-string)]
[l (map (lambda (v) (cons (force (car v)) (cdr v))) l)])
;; sort by sha1s so that order doesn't matter
(write (sort l string<? #:key car) p)
;; compute one hash from all hashes
(sha1 (open-input-bytes (get-output-bytes p)))))))
(define (write-deps code mode path src-sha1 external-deps reader-deps up-to-date read-src-syntax)
(let ([dep-path (path-add-suffix (get-compilation-path mode path) #".dep")] (let ([dep-path (path-add-suffix (get-compilation-path mode path) #".dep")]
[deps (remove-duplicates (append (get-deps code path) [deps (remove-duplicates (append (get-deps code path)
reader-deps))] reader-deps))]
[external-deps (remove-duplicates external-deps)]) [external-deps (remove-duplicates external-deps)])
(with-compile-output dep-path (with-compile-output dep-path
(lambda (op tmp-path) (lambda (op tmp-path)
(write `(,(version) (let ([deps (append
,@(map path->main-collects-relative deps) (map path->main-collects-relative deps)
,@(map (lambda (x) (map (lambda (x)
(cons 'ext (path->main-collects-relative x))) (cons 'ext (path->main-collects-relative x)))
external-deps)) external-deps))])
(write (list* (version)
(cons (or src-sha1 (get-source-sha1 path))
(get-dep-sha1s deps up-to-date read-src-syntax mode #t))
deps)
op) op)
(newline op))))) (newline op))))))
(define (format-time sec) (define (format-time sec)
(let ([d (seconds->date sec)]) (let ([d (seconds->date sec)])
@ -188,7 +245,7 @@
#:property prop:procedure (struct-field-index proc)) #:property prop:procedure (struct-field-index proc))
(define-struct file-dependency (path) #:prefab) (define-struct file-dependency (path) #:prefab)
(define (compile-zo* mode path read-src-syntax zo-name) (define (compile-zo* mode path src-sha1 read-src-syntax zo-name up-to-date)
;; The `path' argument has been converted to .rkt or .ss form, ;; The `path' argument has been converted to .rkt or .ss form,
;; as appropriate. ;; as appropriate.
;; External dependencies registered through reader guard and ;; External dependencies registered through reader guard and
@ -278,7 +335,7 @@
;; Note that we check time and write .deps before returning from ;; Note that we check time and write .deps before returning from
;; with-compile-output... ;; with-compile-output...
(verify-times path tmp-name) (verify-times path tmp-name)
(write-deps code mode path external-deps reader-deps))))) (write-deps code mode path src-sha1 external-deps reader-deps up-to-date read-src-syntax)))))
(define depth (make-parameter 0)) (define depth (make-parameter 0))
@ -290,16 +347,44 @@
alt-path alt-path
path)))) path))))
(define (compile-zo mode path orig-path read-src-syntax) (define (maybe-compile-zo sha1-only? deps mode path orig-path read-src-syntax up-to-date)
(let ([actual-path (actual-source-path orig-path)]) (let ([actual-path (actual-source-path orig-path)])
(unless sha1-only?
((manager-compile-notify-handler) actual-path) ((manager-compile-notify-handler) actual-path)
(trace-printf "compiling: ~a" actual-path) (trace-printf "compiling: ~a" actual-path))
(begin0
(parameterize ([indent (string-append " " (indent))]) (parameterize ([indent (string-append " " (indent))])
(let* ([zo-name (path-add-suffix (get-compilation-path mode path) #".zo")] (let* ([zo-name (path-add-suffix (get-compilation-path mode path) #".zo")]
[zo-exists? (file-exists? zo-name)]) [zo-exists? (file-exists? zo-name)])
(if (and zo-exists? (trust-existing-zos)) (if (and zo-exists? (trust-existing-zos))
(begin
(log-info (format "cm: ~atrusting ~a"
(build-string
(depth)
(λ (x) (if (= 2 (modulo x 3)) #\| #\space)))
zo-name))
(touch zo-name) (touch zo-name)
(begin (when zo-exists? (delete-file zo-name)) #f)
(let ([src-sha1 (and zo-exists?
deps
(cadr deps)
(get-source-sha1 path))])
(if (and zo-exists?
src-sha1
(equal? src-sha1 (caadr deps))
(equal? (get-dep-sha1s (cddr deps) up-to-date read-src-syntax mode #f)
(cdadr deps)))
(begin
(log-info (format "cm: ~ahash-equivalent ~a"
(build-string
(depth)
(λ (x) (if (= 2 (modulo x 3)) #\| #\space)))
zo-name))
(touch zo-name)
#f)
((if sha1-only? values (lambda (build) (build) #f))
(lambda ()
(when zo-exists? (delete-file zo-name))
(log-info (format "cm: ~acompiling ~a" (log-info (format "cm: ~acompiling ~a"
(build-string (build-string
(depth) (depth)
@ -313,8 +398,9 @@
(exn:get-module-code-path ex) (exn:get-module-code-path ex)
(exn-message ex)) (exn-message ex))
(raise ex))]) (raise ex))])
(compile-zo* mode path read-src-syntax zo-name))))))) (compile-zo* mode path src-sha1 read-src-syntax zo-name up-to-date))))))))))
(trace-printf "end compile: ~a" actual-path))) (unless sha1-only?
(trace-printf "end compile: ~a" actual-path)))))
(define (get-compiled-time mode path) (define (get-compiled-time mode path)
(define-values (dir name) (get-compilation-dir+name mode path)) (define-values (dir name) (get-compilation-dir+name mode path))
@ -324,16 +410,33 @@
(try-file-time (build-path dir (path-add-suffix name #".zo"))) (try-file-time (build-path dir (path-add-suffix name #".zo")))
-inf.0)) -inf.0))
(define (try-file-sha1 path dep-path)
(with-handlers ([exn:fail:filesystem? (lambda (exn) #f)])
(string-append
(call-with-input-file* path sha1)
(with-handlers ([exn:fail:filesystem? (lambda (exn) "")])
(call-with-input-file* dep-path (lambda (p) (cdadr (read p))))))))
(define (get-compiled-sha1 mode path)
(define-values (dir name) (get-compilation-dir+name mode path))
(let ([dep-path (build-path dir (path-add-suffix name #".dep"))])
(or (try-file-sha1 (build-path dir "native" (system-library-subpath)
(path-add-suffix name (system-type
'so-suffix)))
dep-path)
(try-file-sha1 (build-path dir (path-add-suffix name #".zo"))
dep-path))))
(define (rkt->ss p) (define (rkt->ss p)
(let ([b (path->bytes p)]) (let ([b (path->bytes p)])
(if (regexp-match? #rx#"[.]rkt$" b) (if (regexp-match? #rx#"[.]rkt$" b)
(path-replace-suffix p #".ss") (path-replace-suffix p #".ss")
p))) p)))
(define (compile-root mode path0 up-to-date read-src-syntax) (define (compile-root mode path0 up-to-date read-src-syntax sha1-only?)
(define orig-path (simplify-path (cleanse-path path0))) (define orig-path (simplify-path (cleanse-path path0)))
(define (read-deps path) (define (read-deps path)
(with-handlers ([exn:fail:filesystem? (lambda (ex) (list (version)))]) (with-handlers ([exn:fail:filesystem? (lambda (ex) (list (version) '#f))])
(call-with-input-file (call-with-input-file
(path-add-suffix (get-compilation-path mode path) #".dep") (path-add-suffix (get-compilation-path mode path) #".dep")
read))) read)))
@ -350,18 +453,25 @@
(cond (cond
[(not path-time) [(not path-time)
(trace-printf "~a does not exist" orig-path) (trace-printf "~a does not exist" orig-path)
path-zo-time] (or (and up-to-date (hash-ref up-to-date orig-path #f))
[else (let ([stamp (cons path-zo-time
(cond (delay (get-compiled-sha1 mode path)))])
[(> path-time path-zo-time) (hash-set! up-to-date main-path stamp)
(trace-printf "newer src...") (unless (eq? main-path alt-path)
(compile-zo mode path orig-path read-src-syntax)] (hash-set! up-to-date alt-path stamp))
stamp))]
[else [else
(let ([deps (read-deps path)]) (let ([deps (read-deps path)])
(define build
(cond (cond
[(not (and (pair? deps) (equal? (version) (car deps)))) [(not (and (pair? deps) (equal? (version) (car deps))))
(lambda ()
(trace-printf "newer version...") (trace-printf "newer version...")
(compile-zo mode path orig-path read-src-syntax)] (maybe-compile-zo #f #f mode path orig-path read-src-syntax up-to-date))]
[(> path-time path-zo-time)
(lambda ()
(trace-printf "newer src...")
(maybe-compile-zo #f deps mode path orig-path read-src-syntax up-to-date))]
[(ormap [(ormap
(lambda (p) (lambda (p)
;; (cons 'ext rel-path) => a non-module file (check date) ;; (cons 'ext rel-path) => a non-module file (check date)
@ -370,21 +480,32 @@
(define d (main-collects-relative->path (if ext? (cdr p) p))) (define d (main-collects-relative->path (if ext? (cdr p) p)))
(define t (define t
(if ext? (if ext?
(try-file-time d) (cons (try-file-time d) #f)
(compile-root mode d up-to-date read-src-syntax))) (compile-root mode d up-to-date read-src-syntax #f)))
(and t (> t path-zo-time) (and (car t)
(> (car t) path-zo-time)
(begin (trace-printf "newer: ~a (~a > ~a)..." (begin (trace-printf "newer: ~a (~a > ~a)..."
d t path-zo-time) d (car t) path-zo-time)
#t))) #t)))
(cdr deps)) (cddr deps))
(compile-zo mode path orig-path read-src-syntax)]))]) ;; If `sha1-only?', then `maybe-compile-zo' returns a #f or thunk:
(let ([stamp (get-compiled-time mode path)]) (maybe-compile-zo sha1-only? deps mode path orig-path read-src-syntax up-to-date)]
[else #f]))
(cond
[(and build sha1-only?) #f]
[else
(when build (build))
(let ([stamp (cons (get-compiled-time mode path)
(delay (get-compiled-sha1 mode path)))])
(hash-set! up-to-date main-path stamp) (hash-set! up-to-date main-path stamp)
(unless (eq? main-path alt-path) (unless (eq? main-path alt-path)
(hash-set! up-to-date alt-path stamp)) (hash-set! up-to-date alt-path stamp))
stamp)]))) stamp)]))])))
(or (and up-to-date (hash-ref up-to-date orig-path #f)) (or (and up-to-date (hash-ref up-to-date orig-path #f))
((manager-skip-file-handler) orig-path) (let ([v ((manager-skip-file-handler) orig-path)])
(and v
(hash-set! up-to-date orig-path v)
v))
(begin (trace-printf "checking: ~a" orig-path) (begin (trace-printf "checking: ~a" orig-path)
(do-check)))) (do-check))))
@ -400,7 +521,8 @@
(compile-root (car (use-compiled-file-paths)) (compile-root (car (use-compiled-file-paths))
(path->complete-path src) (path->complete-path src)
cache cache
read-src-syntax) read-src-syntax
#f)
(void))))) (void)))))
(define (make-compilation-manager-load/use-compiled-handler) (define (make-compilation-manager-load/use-compiled-handler)
@ -444,7 +566,7 @@
(namespace-module-registry (current-namespace)))] (namespace-module-registry (current-namespace)))]
[else [else
(trace-printf "processing: ~a" path) (trace-printf "processing: ~a" path)
(compile-root (car modes) path cache read-syntax) (compile-root (car modes) path cache read-syntax #f)
(trace-printf "done: ~a" path)]) (trace-printf "done: ~a" path)])
(default-handler path mod-name)) (default-handler path mod-name))
(when (null? modes) (when (null? modes)

2
collects/compiler/compiler-unit.rkt
View File

@ -171,7 +171,7 @@
[len (bytes-length skip-path)]) [len (bytes-length skip-path)])
(and ((bytes-length b) . > . len) (and ((bytes-length b) . > . len)
(bytes=? (subbytes b 0 len) skip-path))) (bytes=? (subbytes b 0 len) skip-path)))
-inf.0))]) (list -inf.0 "")))])
(let* ([sses (append (let* ([sses (append
;; Find all .rkt/.ss/.scm files: ;; Find all .rkt/.ss/.scm files:
(filter extract-base-filename/ss (directory-list)) (filter extract-base-filename/ss (directory-list))

2
collects/drscheme/private/module-language.rkt
View File

@ -213,7 +213,7 @@
(current-load/use-compiled (make-compilation-manager-load/use-compiled-handler)) (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
(manager-skip-file-handler (manager-skip-file-handler
(λ (p) (file-date-in-paths (λ (p) (file-stamp-in-paths
p p
(cons (CACHE-DIR) (current-library-collection-paths))))))))) (cons (CACHE-DIR) (current-library-collection-paths)))))))))

2
collects/meta/checker.rkt
View File

@ -463,7 +463,7 @@
[`(ext collects ,(and (? bytes?) s) ...) (pltpath s)] [`(ext collects ,(and (? bytes?) s) ...) (pltpath s)]
[_ (error 'dependencies "bad dependency item in ~s: ~s" [_ (error 'dependencies "bad dependency item in ~s: ~s"
file x)])) file x)]))
(cdr x)))) (cddr x))))
(dprintf "Reading dependencies...") (dprintf "Reading dependencies...")
(let loop ([tree (tree-filter "*.dep" *plt-tree*)]) (let loop ([tree (tree-filter "*.dep" *plt-tree*)])
(if (pair? tree) (if (pair? tree)

55
collects/openssl/sha1.rkt Normal file
View File

@ -0,0 +1,55 @@
#lang racket/base
(require ffi/unsafe
racket/runtime-path
(for-syntax racket/base))
(provide sha1
sha1-bytes
bytes->hex-string)
(define-runtime-path libcrypto-so
(case (system-type)
[(windows) '(so "libeay32")]
[else '(so "libcrypto")]))
(define libcrypto
(ffi-lib libcrypto-so '("" "0.9.8b" "0.9.8" "0.9.7")))
(define _SHA_CTX-pointer _pointer)
(define SHA1_Init
(get-ffi-obj 'SHA1_Init libcrypto (_fun _SHA_CTX-pointer -> _int)))
(define SHA1_Update
(get-ffi-obj 'SHA1_Update libcrypto (_fun _SHA_CTX-pointer _pointer _long -> _int)))
(define SHA1_Final
(get-ffi-obj 'SHA1_Final libcrypto (_fun _pointer _SHA_CTX-pointer -> _int)))
(define (sha1-bytes in)
(let ([ctx (malloc 256)]
[tmp (make-bytes 4096)]
[result (make-bytes 20)])
(SHA1_Init ctx)
(let loop ()
(let ([n (read-bytes-avail! tmp in)])
(unless (eof-object? n)
(SHA1_Update ctx tmp n)
(loop))))
(SHA1_Final result ctx)
result))
(define (sha1 in)
(bytes->hex-string (sha1-bytes in)))
(define (bytes->hex-string bstr)
(let* ([len (bytes-length bstr)]
[bstr2 (make-bytes (* len 2))]
[digit
(lambda (v)
(if (v . < . 10)
(+ v (char->integer #\0))
(+ v (- (char->integer #\a) 10))))])
(for ([i (in-range len)])
(let ([c (bytes-ref bstr i)])
(bytes-set! bstr2 (* 2 i) (digit (arithmetic-shift c -4)))
(bytes-set! bstr2 (+ (* 2 i) 1) (digit (bitwise-and c #xF)))))
(bytes->string/latin-1 bstr2)))

4
collects/racket/private/define-struct.rkt
View File

@ -264,9 +264,9 @@
(eq? '#:extra-constructor-name (syntax-e (car p)))) (eq? '#:extra-constructor-name (syntax-e (car p))))
(check-exprs 1 p "identifier") (check-exprs 1 p "identifier")
(when (lookup config '#:constructor-name) (when (lookup config '#:constructor-name)
(bad "multiple #:constructor-name or #:extra-constructor-name keys" (car p))) (bad "multiple" "#:constructor-name or #:extra-constructor-name keys" (car p)))
(unless (identifier? (cadr p)) (unless (identifier? (cadr p))
(bad "need an identifier after #:constructor-name" (cadr p))) (bad "need an identifier after" (car p) (cadr p)))
(loop (cddr p) (loop (cddr p)
(extend-config (extend-config config '#:constructor-name (cadr p)) (extend-config (extend-config config '#:constructor-name (cadr p))
'#:only-constructor? '#:only-constructor?

26
collects/scribblings/mzc/make.scrbl
View File

@ -241,26 +241,28 @@ A parameter for a procedure of one argument that is called to report
compilation-manager actions, such as checking a file. The argument to compilation-manager actions, such as checking a file. The argument to
the procedure is a string.} the procedure is a string.}
@defparam[manager-skip-file-handler proc (-> path? (or/c number? #f))]{ @defparam[manager-skip-file-handler proc (-> path? (or/c (cons/c number? promise?) #f))]{
A parameter whose value is called for each file that is loaded and A parameter whose value is called for each file that is loaded and
needs recompilation. If the procedure returns a number, then the file needs recompilation. If the procedure returns a pair, then the file
is skipped (i.e., not compiled), and the number is used as the is skipped (i.e., not compiled); the number in the pair is used as
timestamp for the file's bytecode. If the procedure returns the timestamp for the file's bytecode, and the promise may be
@scheme[force]d to obtain a string that is used as hash of the
compiled file plus its dependencies. If the procedure returns
@scheme[#f], then the file is compiled as usual. The default is @scheme[#f], then the file is compiled as usual. The default is
@scheme[(lambda (x) #f)].} @scheme[(lambda (x) #f)].}
@defproc[(file-date-in-collection [p path?]) (or/c number? #f)]{ @defproc[(file-stamp-in-collection [p path?]) (or/c (cons/c number? promise?) #f)]{
Calls @scheme[file-date-in-paths] with @scheme[p] and Calls @scheme[file-stamp-in-paths] with @scheme[p] and
@scheme[(current-library-collection-paths)].} @scheme[(current-library-collection-paths)].}
@defproc[(file-date-in-paths [p path?] [paths (listof path?)]) (or/c number? #f)]{ @defproc[(file-stamp-in-paths [p path?] [paths (listof path?)]) (or/c (cons/c number? promise?) #f)]{
Returns the file-modification date of @scheme[p] or its bytecode form Returns the file-modification date and @scheme[delay]ed hash of
(i.e., @filepath{.zo} file), whichever exists and is newer, if @scheme[p]or its bytecode form (i.e., @filepath{.zo} file), whichever
@scheme[p] is an extension of any path in @scheme[paths] (i.e., exists and is newer, if @scheme[p] is an extension of any path in
exists in the directory, a subdirectory, etc.). Otherwise, the result @scheme[paths] (i.e., exists in the directory, a subdirectory,
is @scheme[#f]. etc.). Otherwise, the result is @scheme[#f].
This function is intended for use with @scheme[manager-skip-file-handler].} This function is intended for use with @scheme[manager-skip-file-handler].}

2
collects/setup/main.rkt
View File

@ -113,7 +113,7 @@
(unless (and (pair? dep) (unless (and (pair? dep)
(eq? (car dep) 'ext)) (eq? (car dep) 'ext))
(dynamic-require (main-collects-relative->path dep) #f))) (dynamic-require (main-collects-relative->path dep) #f)))
(cdr deps)))) (cddr deps))))
;; Not a .zo! Don't use .zo files at all... ;; Not a .zo! Don't use .zo files at all...
(escape (lambda () (escape (lambda ()
;; Try again without .zo ;; Try again without .zo

2
collects/sgl/makefile.rkt
View File

@ -12,6 +12,6 @@
[make-print-reasons #f] [make-print-reasons #f]
[make-print-checking #f]) [make-print-checking #f])
(make/proc (make/proc
`((,(build-path dir "gl-info_ss.zo") `((,(build-path dir "gl-info_rkt.zo")
("make-gl-info.rkt" ,(build-path (find-include-dir) "schvers.h")) ("make-gl-info.rkt" ,(build-path (find-include-dir) "schvers.h"))
,(lambda () (make-gl-info dir))))))) ,(lambda () (make-gl-info dir)))))))

4
src/racket/src/schvers.h
View File

@ -13,12 +13,12 @@
consistently.) consistently.)
*/ */
#define MZSCHEME_VERSION "4.2.5.12" #define MZSCHEME_VERSION "4.2.5.13"
#define MZSCHEME_VERSION_X 4 #define MZSCHEME_VERSION_X 4
#define MZSCHEME_VERSION_Y 2 #define MZSCHEME_VERSION_Y 2
#define MZSCHEME_VERSION_Z 5 #define MZSCHEME_VERSION_Z 5
#define MZSCHEME_VERSION_W 12 #define MZSCHEME_VERSION_W 13
#define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y) #define MZSCHEME_VERSION_MAJOR ((MZSCHEME_VERSION_X * 100) + MZSCHEME_VERSION_Y)
#define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W) #define MZSCHEME_VERSION_MINOR ((MZSCHEME_VERSION_Z * 1000) + MZSCHEME_VERSION_W)