From a3b9b386fe142002db3f6c848dc8a955b9c813a5 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Wed, 9 Feb 2011 21:13:06 -0500 Subject: [PATCH] Use proper raco command name in make and pack. Fixes PR 11719. original commit: 0f14c6aa6739b4cfd51d46ec2a49627769738394 --- collects/compiler/commands/make.rkt | 6 ++++-- collects/compiler/commands/pack.rkt | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/collects/compiler/commands/make.rkt b/collects/compiler/commands/make.rkt index 03dd574409..74f2b85ae7 100644 --- a/collects/compiler/commands/make.rkt +++ b/collects/compiler/commands/make.rkt @@ -16,6 +16,8 @@ (define assume-primitives (make-parameter #t)) (define worker-count (make-parameter 1)) +(define mzc-symbol (string->symbol (short-program+command-name))) + (define source-files (command-line #:program (short-program+command-name) @@ -67,9 +69,9 @@ (printf " making ~s\n" (path->string p))))]) (for ([file source-files]) (unless (file-exists? file) - (error 'mzc "file does not exist: ~a" file)) + (error mzc-symbol "file does not exist: ~a" file)) (set! did-one? #f) - (let ([name (extract-base-filename/ss file 'mzc)]) + (let ([name (extract-base-filename/ss file mzc-symbol)]) (when (verbose) (printf "\"~a\":\n" file)) (parameterize ([compile-context-preservation-enabled diff --git a/collects/compiler/commands/pack.rkt b/collects/compiler/commands/pack.rkt index 8a2fa32a50..db68d62889 100644 --- a/collects/compiler/commands/pack.rkt +++ b/collects/compiler/commands/pack.rkt @@ -19,6 +19,8 @@ (define plt-setup-collections (make-parameter null)) (define plt-include-compiled (make-parameter #f)) +(define mzc-symbol (string->symbol (short-program+command-name))) + (define-values (plt-output source-files) (command-line #:program (short-program+command-name) @@ -53,7 +55,7 @@ (begin (for ([fd source-files]) (unless (relative-path? fd) - (error 'mzc + (error mzc-symbol "file/directory is not relative to the current directory: \"~a\"" fd))) (pack-plt plt-output