From f02d9268ecdcfc176ddf7e0e349096fd186aebf4 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 2 Jun 2014 20:05:23 +0100
Subject: [PATCH] adjust some `collection-file-path` calls to work with binary
 packages

In a few cases, sources should be preserved in binary mode.
---
 pkgs/drracket-pkgs/drracket/drracket/info.rkt        | 3 +++
 pkgs/slideshow-pkgs/slideshow-exe/slideshow/info.rkt | 4 ++++
 pkgs/xrepl-pkgs/xrepl-lib/xrepl/xrepl.rkt            | 4 +---
 racket/collects/compiler/embed.rkt                   | 3 ++-
 racket/collects/racket/runtime-path.rkt              | 1 +
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/drracket-pkgs/drracket/drracket/info.rkt b/pkgs/drracket-pkgs/drracket/drracket/info.rkt
index d74cbd2503..5b12af2cf8 100644
--- a/pkgs/drracket-pkgs/drracket/drracket/info.rkt
+++ b/pkgs/drracket-pkgs/drracket/drracket/info.rkt
@@ -13,6 +13,9 @@
 
 (define copy-man-pages '("drracket.1"))
 
+(define binary-keep-files '("private/launcher-mred-bootstrap.rkt"
+                            "private/launcher-mz-bootstrap.rkt"))
+
 ;; color-blind friendly palette from Paul Tol:
 ;; http://www.sron.nl/~pault/
 ;; using his Scheme for Marking Text colors
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/info.rkt b/pkgs/slideshow-pkgs/slideshow-exe/slideshow/info.rkt
index 58d436769c..896dd47b4d 100644
--- a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/info.rkt
+++ b/pkgs/slideshow-pkgs/slideshow-exe/slideshow/info.rkt
@@ -4,3 +4,7 @@
 (define mred-launcher-names (list "Slideshow"))
 (define compile-omit-paths '("initial-ones.rkt" "examples"))
 (define test-omit-paths '("tutorial-show.rkt"))
+
+(define binary-keep-files '("tutorial-show.rkt"
+                            "initial-ones.rkt"
+                            "examples"))
diff --git a/pkgs/xrepl-pkgs/xrepl-lib/xrepl/xrepl.rkt b/pkgs/xrepl-pkgs/xrepl-lib/xrepl/xrepl.rkt
index 39eb1363f4..c3d1f1573a 100644
--- a/pkgs/xrepl-pkgs/xrepl-lib/xrepl/xrepl.rkt
+++ b/pkgs/xrepl-pkgs/xrepl-lib/xrepl/xrepl.rkt
@@ -1282,9 +1282,7 @@
     (define inp
       (case (object-name (current-input-port))
         [(readline-input)
-         (parameterize ([(dynamic-require
-                          (collection-file-path "pread.rkt" "readline")
-                          'readline-prompt)
+         (parameterize ([(dynamic-require 'readline/pread 'readline-prompt)
                          qtext])
            (read-line))]
         [else (write-bytes qtext) (flush-output) (read-line)]))
diff --git a/racket/collects/compiler/embed.rkt b/racket/collects/compiler/embed.rkt
index 776da76e5e..c646ecc2be 100644
--- a/racket/collects/compiler/embed.rkt
+++ b/racket/collects/compiler/embed.rkt
@@ -1180,7 +1180,8 @@
                                                                                   file
                                                                                   (if (null? (cddr p))
                                                                                       (list "mzlib")
-                                                                                      (cddr p))))))]
+                                                                                      (cddr p))
+                                                                                  #:check-compiled? #f))))]
                                                                      [(and (list? p)
                                                                            (eq? 'module (car p)))
                                                                       sym]
diff --git a/racket/collects/racket/runtime-path.rkt b/racket/collects/racket/runtime-path.rkt
index c0bcfc8af5..a69f330b5e 100644
--- a/racket/collects/racket/runtime-path.rkt
+++ b/racket/collects/racket/runtime-path.rkt
@@ -157,6 +157,7 @@
                               (not (file-exists? p)))
                          ;; Try ".ss":
                          (define p2 (apply collection-file-path
+                                           #:check-compiled? #f
                                            (path-replace-suffix file #".ss")
                                            coll))
                          (if (file-exists? p2)