From 0edd78192891ecf7a8b565d52b966a73c5e85a27 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 28 Oct 2015 17:41:14 -0400 Subject: [PATCH] use "_LOCK" prefix for Windows cross-build Use "_LOCK" instead of ".LOCK" when the cross platform is Windows, not just when the current platform is Windows. Merge to v6.3 --- pkgs/racket-doc/scribblings/reference/filesystem.scrbl | 6 ++++-- racket/collects/racket/file.rkt | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/racket-doc/scribblings/reference/filesystem.scrbl b/pkgs/racket-doc/scribblings/reference/filesystem.scrbl index 8c08380f8a..06b107fa24 100644 --- a/pkgs/racket-doc/scribblings/reference/filesystem.scrbl +++ b/pkgs/racket-doc/scribblings/reference/filesystem.scrbl @@ -3,7 +3,8 @@ (for-label framework/preferences racket/runtime-path launcher/launcher - setup/dirs)) + setup/dirs + setup/cross-system)) @(define file-eval (make-base-eval)) @(interaction-eval #:eval file-eval (begin (require racket/file) (define filename (make-temporary-file)))) @@ -1402,7 +1403,8 @@ in the sense of @racket[port-try-file-lock?]. [name path-element?]) path?])]{ -Creates a lock filename by prepending @racket["_LOCK"] on Windows or +Creates a lock filename by prepending @racket["_LOCK"] on Windows +(i.e., when @racket[cross-system-type] reports @racket['windows]) or @racket[".LOCK"] on other platforms to the file portion of the path. @examples[ diff --git a/racket/collects/racket/file.rkt b/racket/collects/racket/file.rkt index 47938ed822..206c85fdc4 100644 --- a/racket/collects/racket/file.rkt +++ b/racket/collects/racket/file.rkt @@ -1,6 +1,7 @@ #lang racket/base (require "path.rkt" setup/dirs + setup/cross-system (for-syntax racket/base setup/path-to-relative)) @@ -278,7 +279,7 @@ (define (make-pathless-lock-file-name name) (bytes->path-element (bytes-append - (if (eq? 'windows (system-type)) + (if (eq? 'windows (cross-system-type)) #"_" #".") #"LOCK"