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

raco {make,decompile}: fix bytecode path calculation

Browse Source 
Use `compiler/compilation-path` to take into account PLTCOMPILEDROOTS, etc.

Closes PR 14525

original commit: 5ad11c85e6
This commit is contained in:
Matthew Flatt 2014-05-27 08:30:24 +01:00
parent 979299850e
commit 7fdf264e1d
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/compiler-pkgs/compiler-lib/compiler/commands/decompile.rkt
View File

@ -3,6 +3,7 @@
raco/command-name raco/command-name
compiler/zo-parse compiler/zo-parse
compiler/decompile compiler/decompile
compiler/compilation-path
racket/pretty racket/pretty
racket/format) racket/format)
@ -75,7 +76,7 @@
(for ([zo-file source-files]) (for ([zo-file source-files])
(let ([zo-file (path->complete-path zo-file)]) (let ([zo-file (path->complete-path zo-file)])
(let-values ([(base name dir?) (split-path zo-file)]) (let-values ([(base name dir?) (split-path zo-file)])
(let ([alt-file (build-path base "compiled" (path-add-suffix name #".zo"))]) (let ([alt-file (get-compilation-bytecode-file zo-file)])
(check-files zo-file alt-file) (check-files zo-file alt-file)
(parameterize ([current-load-relative-directory base] (parameterize ([current-load-relative-directory base]
[print-graph #t]) [print-graph #t])

13
pkgs/compiler-pkgs/compiler-lib/compiler/commands/make.rkt
View File

@ -3,6 +3,7 @@
raco/command-name raco/command-name
compiler/cm compiler/cm
compiler/compiler compiler/compiler
compiler/compilation-path
dynext/file dynext/file
setup/parallel-build setup/parallel-build
setup/path-to-relative setup/path-to-relative
@ -89,14 +90,10 @@
[compile-enforce-module-constants [compile-enforce-module-constants
(not (disable-const))]) (not (disable-const))])
(managed-compile-zo file)) (managed-compile-zo file))
(let ([dest (append-zo-suffix (when (verbose)
(let-values ([(base name dir?) (split-path file)]) (printf " [~a \"~a\"]\n"
(build-path (if (symbol? base) 'same base) (if did-one? "output to" "already up-to-date at")
"compiled" name)))]) (get-compilation-bytecode-file file)))))))]
(when (verbose)
(printf " [~a \"~a\"]\n"
(if did-one? "output to" "already up-to-date at")
dest)))))))]
;; Parallel make: ;; Parallel make:
[else [else
(define path-cache (make-hash)) (define path-cache (make-hash))