From c12874661f723eb81dd41018ed5b4098a5543125 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Sat, 15 May 2010 18:37:13 -0400 Subject: [PATCH] make the winvers tweaker use and modify files with the new names --- collects/setup/winvers-change.rkt | 6 +++--- collects/setup/winvers.rkt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/collects/setup/winvers-change.rkt b/collects/setup/winvers-change.rkt index 3dc0bb1eec..e04531cded 100644 --- a/collects/setup/winvers-change.rkt +++ b/collects/setup/winvers-change.rkt @@ -5,8 +5,8 @@ ;; "xxxxxxx" in their name by a "NNN_NNN" version number, and will also do this ;; rewrite in all files. (Actually looking for a few known string templates, ;; to be safe.) Note that this is done *in-place*, so it will not work from a -;; running MzScheme.exe on Windows -- "winvers.ss" uses a trick of making a -;; copy of the binary and restarting that copy for the actual change. +;; running Racket.exe on Windows -- "winvers.ss" uses a trick of making a copy +;; of the binary and restarting that copy for the actual change. #lang scheme/base @@ -14,7 +14,7 @@ (define binary-extensions '("exe" "dll" "lib" "so" "def" "exp" #|"obj" "o"|#)) (define xxxs #"xxxxxxx") (define xxxs-re - (bytes-append #"(?:lib(?:mzsch|mzgc|mred)(?:|3m))(" xxxs #")")) + (bytes-append #"(?:lib(?:g?racket|mzgc)(?:|3m))(" xxxs #")")) (define renaming (regexp (format "^~a[.](?:dll|lib|exp)$" xxxs-re))) (define substitutions (map (lambda (s) (byte-regexp (regexp-replace #rx#"~a" s xxxs-re))) diff --git a/collects/setup/winvers.rkt b/collects/setup/winvers.rkt index a673cc4861..e8632359ee 100644 --- a/collects/setup/winvers.rkt +++ b/collects/setup/winvers.rkt @@ -9,14 +9,14 @@ (let* ([tmpdir (find-system-path 'temp-dir)] [vers (build-path tmpdir "setvers")]) (unless (directory-exists? vers) (make-directory vers)) - (for ([p (in-list '("mzscheme.exe" "lib"))]) + (for ([p (in-list '("racket.exe" "lib"))]) (let ([dest (build-path vers p)]) ((cond [(file-exists? dest) delete-file] [(directory-exists? dest) delete-directory/files] [else void]) dest) (copy-directory/files (build-path (find-console-bin-dir) p) dest))) - (build-path vers "mzscheme.exe"))) + (build-path vers "racket.exe"))) (define (patch-files) (parameterize ([current-command-line-arguments @@ -40,7 +40,7 @@ (printf "re-launching last time...~n") (subprocess (current-output-port) (current-input-port) (current-error-port) - (build-path (find-console-bin-dir) "mzscheme.exe") + (build-path (find-console-bin-dir) "racket.exe") "-l" "setup/winvers" "finish")] [(equal? argv #("finish")) (sleep 1) ; time for other process to end