From 0423ec98413a953151a274e91139e0216fc6c153 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 11 Jun 2019 21:17:34 -0600
Subject: [PATCH] Windows: fix `setup/winstrip` for different variants

For the normal 3m Racket builds in non-cross mode, CGC DLLs have been
incorrectly left behind (e.g., in the Utah snapshot distributions).
---
 racket/collects/setup/winstrip.rkt | 42 +++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/racket/collects/setup/winstrip.rkt b/racket/collects/setup/winstrip.rkt
index a1207c5fd8..26e16f6441 100644
--- a/racket/collects/setup/winstrip.rkt
+++ b/racket/collects/setup/winstrip.rkt
@@ -8,12 +8,18 @@
 ;; Remove debugging and CGC files
 
 (define keep-cgc? #f)
+(define keep-3m? #f)
+(define keep-cs? #f)
 
 (define dir
   (command-line
    #:once-each
-   [("--keep-cgc") "Keep CGC/3m executables and libraries"
+   [("--keep-cgc") "Keep CGC executables and libraries"
     (set! keep-cgc? #t)]
+   [("--keep-3m") "Keep 3m executables and libraries"
+    (set! keep-3m? #t)]
+   [("--keep-cs") "Keep CS executables and libraries"
+    (set! keep-cs? #t)]
    #:args
    (dir)
    dir))
@@ -23,12 +29,27 @@
   (delete-file p))
 
 (when (eq? 'windows (cross-system-type))
+  (define type
+    (call-with-input-file*
+     (build-path dir "Racket.exe")
+     (lambda (i)
+       (define m (regexp-match "bINARy tYPe:..(.)" i))
+       (case (and m (cadr m))
+         [(#"c") 'cgc]
+         [(#"s") 'cs]
+         [else '3m]))))
+  
   (for ([a (directory-list dir)])
     (define f (build-path dir a))
     (define b (path-element->bytes a))
     (when (and (file-exists? f)
                (or (regexp-match? #rx#"[.](?i:pdb|ilk)$" b)
-                   (regexp-match? #rx#"(?i:CGC[.]exe)$" b)))
+                   (and (not keep-cgc?)
+                        (regexp-match? #rx#"(?i:CGC[.]exe)$" b))
+                   (and (not keep-3m?)
+                        (regexp-match? #rx#"(?i:3m[.]exe)$" b))
+                   (and (not keep-cs?)
+                        (regexp-match? #rx#"(?i:CS[.]exe)$" b))))
       (delete-file* f)))
 
   (for ([f (in-directory (build-path dir "lib"))])
@@ -39,8 +60,18 @@
                  (or (regexp-match? #rx#"[.](?i:pdb|ilk|manifest)$" b)
                      (regexp-match? #rx#"(?i:CGC[.](?:dll|exe))$" b)
                      (and (regexp-match? #rx#"(?i:[.](?:dll|exp|obj|lib|def))$" b)
-                          (regexp-match? #rx#"(?i:racket|mzgc)$" b)
-                          (not (regexp-match? #rx#"3m" b))))))
+                          (regexp-match? #rx#"(?i:racket|mzgc)" b)
+                          (let ([dll-type
+                                 (cond
+                                   [(regexp-match? #rx#"(?i:racketcs)" b) 'cs]
+                                   [(regexp-match? #rx#"(?i:racket3m)" b) '3m]
+                                   [else 'cgc])])
+                            (cond
+                              [(eq? dll-type type) #f]
+                              [else (case dll-type
+                                      [(cgc) (not keep-cgc?)]
+                                      [(cs) (not keep-cs?)]
+                                      [else (not keep-3m?)])]))))))
       (delete-file* f)))
   
   ;; Delete any subdirectory that contains ".lib" files.
@@ -51,6 +82,3 @@
                (for/or ([f (in-directory f)])
                  (regexp-match? #rx"[.]lib$" f)))
       (delete-directory/files f))))
-
-
-