cs: initial cut at building on Windows

Add a "csbuild.bat" script that can build a "RacketCS.exe" executable.
It's not yet right, because there should be a DLL the same as for
"Racket.exe", but it's a start. Also, the makefiles that work with GNU
`make` and `nmake` at the same time seem fragile, and it will be
better to move the relevant build rules into Racket scripts.

Author: mflatt

racket/src/cs/Makefile

@@ -1,3 +1,6 @@
+# This makefile is used to a limited degree with nmake, but it mostly
+# intended for use as a GNU makefile.
+
 RACKET = ../../bin/racket
 SCHEME = scheme
 
@@ -64,7 +67,7 @@ $(BUILDDIR)main.so: $(MAIN_DEPS) main.sps $(COMPILE_FILE_DEPS)
 	$(COMPILE_FILE) main.sps $(MAIN_DEPS)
 
 strip:
-	${SCHEME} --script strip.ss $(MAIN_DEPS) $(BUILDDIR)racket.so
+	$(SCHEME) --script strip.ss $(MAIN_DEPS) $(BUILDDIR)racket.so
 
 rktl:
 	$(MAKE) thread-rktl

racket/src/cs/absify.rkt

@@ -1,24 +1,39 @@
 #lang racket/base
-(require racket/path)
+(require racket/cmdline
+	 racket/path)
 
-(define arg0 (vector-ref (current-command-line-arguments) 0))
-(define exec? (equal? arg0 "--exec"))
+(define same-up? #f)
+(define exec? #f)
 
-(define p-arg-k (if exec? 1 0))
-
-(define p
-  (if exec?
-      (let ([p (vector-ref (current-command-line-arguments) 1)])
-        (if (path-element? (string->path p))
-            (or (find-executable-path p)
-                p)
-            p))
-      arg0))
-
-(display (simplify-path (path->complete-path p)))
+(define-values (orig-p extras)
+  (command-line
+   #:once-each
+   [("--same-up") "Leave path alone if it starts \"..\""
+    (set! same-up? #t)]
+   [("--exec") "Find executable path"
+    (set! exec? #t)]
+   #:args
+   (path . extra)
+   (values path extra)))
 
+(cond
+ [(and same-up?
+       (eq? (car (explode-path orig-p)) 'up))
+  (display orig-p)]
+ [else
+  (define p
+    (if exec?
+	(let ([p orig-p])
+	  (if (path-element? (string->path p))
+	      (or (find-executable-path p)
+		  p)
+	      p))
+	orig-p))
+  
+  (display (simplify-path (path->complete-path p)))])
+  
 ;; In case there are extra arguments to an executable, preserve them
-(for ([e (in-vector (current-command-line-arguments) (add1 p-arg-k))])
+(for ([e (in-list extras)])
   (display " ")
   (display e))
 

racket/src/cs/c/boot.c

@@ -1,4 +1,6 @@
-#include <unistd.h>
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
 #include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
@@ -78,7 +80,7 @@ void racket_boot(int argc, char **argv, char *self, long segment_offset,
   Sregister_boot_file(path_append(fw_path, "petite.boot"));
   Sregister_boot_file(path_append(fw_path, "scheme.boot"));
 #else
-  fd = open(self, O_RDONLY);
+  fd = open(self, O_RDONLY | O_BINARY);
 
   {
     int fd1, fd2;
@@ -87,7 +89,7 @@ void racket_boot(int argc, char **argv, char *self, long segment_offset,
     lseek(fd1, pos1, SEEK_SET);    
     Sregister_boot_file_fd("petite", fd1);
 
-    fd2 = open(self, O_RDONLY);
+    fd2 = open(self, O_RDONLY | O_BINARY);
     lseek(fd2, pos2, SEEK_SET);
     Sregister_boot_file_fd("scheme", fd2);
   }

racket/src/cs/c/main.c

@@ -1,7 +1,15 @@
-#include <unistd.h>
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef _MSC_VER
+# include <Windows.h>
+# define DOS_FILE_SYSTEM
+static int scheme_utf8_encode(unsigned int *path, int zero_offset, int len,
+			      char *dest, int dest_len, int get_utf16);
+#endif
 #include "boot.h"
 
 #define MZ_CHEZ_SCHEME
@@ -63,6 +71,27 @@ static char *get_self_path()
 }
 #endif
 
+#ifdef _MSC_VER
+static char *get_self_path()
+{
+  wchar_t *p = get_self_executable_path();
+  char *r;
+  int len;
+
+  len = WideCharToMultiByte(CP_UTF8, 0, p, -1, NULL, 0, NULL, NULL);
+  r = malloc(len);
+  len = WideCharToMultiByte(CP_UTF8, 0, p, -1, r, len, NULL, NULL);
+
+  return r;
+}
+
+static int scheme_utf8_encode(unsigned int *path, int zero_offset, int len,
+			      char *dest, int dest_len, int get_utf16)
+{
+  return WideCharToMultiByte(CP_UTF8, 0, (wchar_t *)path, len, dest, dest_len, NULL, NULL);
+}
+#endif
+
 #ifdef NO_GET_SEGMENT_OFFSET
 static long get_segment_offset()
 {

racket/src/cs/io.sls

@@ -161,7 +161,7 @@
 
     (define loaded-librktio
       (or (foreign-entry? "rktio_init")
-          (load-shared-object (string-append "../../lib/librktio"
+          (load-shared-object (string-append (string-append (current-directory) "/../../lib/librktio")
                                              (utf8->string (system-type 'so-suffix))))))
 
     (define (rktio-lookup name)

racket/src/expander/Makefile

@@ -3,6 +3,8 @@
 # redirect to a different build dierctory by setting `BUILDDIR` and
 # other variables.
 
+# Beware that this makefile is used both for GNU make and for nmake!
+
 RACKET = ../../bin/racket
 RACO = $(RACKET) -N raco -l- raco
 
@@ -43,12 +45,23 @@ DIRECT_DEP = compiled/main_rkt.zo
 $(GENERATED_RKTL): $(DIRECT_DEP)
 	$(RACKET) bootstrap-run.rkt -c $(BUILDDIR)compiled/cache-src $(KNOT) $(DIRECT) $(PURE) -k $(TREE) -s -x -o $(BUILDDIR)compiled/expander.rktl
 
+# The next two lines make both GNU make and nmake happy, and they
+# cause nmake to not see the `-include`. The trick is that nmake
+# doesn't recognize backslash as a comment continuation.
+# \
+!if 0
+
 # Dependencies in "expander.d" are created via the "cs" makefile, which
 # sets `RACKET` to be a bootstrapping load; the result doubles as
 # dependencies both for bootstrapping "bootstrap-run.rkt" and for the
 # generated flattened expander
 -include $(BUILDDIR)expander.d
 
+# \
+!endif
+# \
+!include ..\build\expander.d
+
 demo:
 	$(RACO) make demo.rkt
 	$(RACKET) demo.rkt

racket/src/expander/run.rkt

@@ -93,9 +93,9 @@
     (hash-update! instance-knot-ties
                   (string->symbol (format "#%~a" sym))
                   (lambda (l) (cons (if (equal? path "-")
-                                   'ignore
-                                   (path->complete-path path))
-                               l))
+					'ignore
+					(path->complete-path (normal-case-path path)))
+				    l))
                   null)]
    [("++direct") primitive-table "Redirect imports from #%<primitive-table> to direct references"
     (hash-set! primitive-table-directs
@@ -273,11 +273,12 @@
   (load load-file))
 
 (when dependencies-file
+  (define (quote-if-space s) (if (regexp-match? #rx" " s) (format "\"~a\"" s) s))
   (call-with-output-file*
    dependencies-file
    #:exists 'truncate/replace
    (lambda (o)
-     (fprintf o "~a:" dependencies-target)
+     (fprintf o "~a:" (quote-if-space dependencies-target))
      (for ([dep (in-hash-keys dependencies)])
-       (fprintf o " \\\n  ~a" dep))
+       (fprintf o " \\\n  ~a" (quote-if-space dep)))
      (newline o))))

racket/src/io/Makefile

@@ -12,7 +12,9 @@ IGNORE = ++knot read - ++pure ../../collects/racket/private/collect.rkt
 # `$(GENERATED_RKTL)` appears as a dependency target in "$(BUILDDIR)expander.d"
 GENERATED_RKTL = $(BUILDDIR)compiled/io.rktl
 
-io-src: ../build/so-rktio/Makefile
+RKTIO_DEP=../build/so-rktio/Makefile
+
+io-src: $(RKTIO_DEP)
 	$(RACO) make ../expander/bootstrap-run.rkt
 	$(MAKE) $(GENERATED_RKTL)
 
@@ -22,10 +24,20 @@ SAVE_DEPS = --depends $(GENERATED_RKTL) $(BUILDDIR)compiled/io.d
 $(GENERATED_RKTL): $(DIRECT_DEP)
 	$(RACKET) ../expander/bootstrap-run.rkt -t main.rkt --submod main -c $(BUILDDIR)compiled/cache-src -k ../.. $(IGNORE) -s -x $(SAVE_DEPS) -o $(GENERATED_RKTL)
 
+# \
+!if 0
+
 # Dependencies in "expander.d" are created via the "cs" makefile
 -include $(BUILDDIR)expander.d
 -include $(BUILDDIR)compiled/io.d
 
+# \
+!endif
+# \
+!include ..\build\expander_io.d
+# \
+!include ..\build\compiled\io.d
+
 demo: compiled/rktio.rktl
 	$(RACO) make demo.rkt
 	$(RACKET) demo.rkt

racket/src/io/file/main.rkt

@@ -344,7 +344,7 @@
     [(rktio-error? r)
      ;; Errors are not reported, but are treated like non-links
      (define new-path (host-> host-path))
-     ;; If cleansing didn't change p, then return an `eq?`path
+     ;; If cleansing didn't change p, then return an `eq?` path
      (cond
        [(equal? new-path p) p]
        [else new-path])]

racket/src/io/path/cleanse.rkt

@@ -12,12 +12,13 @@
 (define/who (cleanse-path p-in)
   (check-path-argument who p-in)
   (define p (->path p-in))
+  (define convention (path-convention p))
   (define (return bstr)
     (if (eq? bstr (path-bytes p))
         p
-        (path bstr 'unix)))
+        (path bstr convention)))
   (define bstr (path-bytes p))
-  (case (path-convention p)
+  (case convention
     [(unix)
      (return (clean-double-slashes bstr 'unix 0))]
     [(windows)
@@ -49,8 +50,8 @@
              (return (clean-double-slashes bstr 'windows drive-len)))]
        [(letter-drive-start? bstr (bytes-length bstr))
         (cond
-          [(and ((bytes-length bstr) . > . 3)
-                (is-sep? (bytes-ref bstr 3) 'windows))
+          [(and ((bytes-length bstr) . > . 2)
+                (is-sep? (bytes-ref bstr 2) 'windows))
            (return (clean-double-slashes bstr 'windows 2))]
           [else
            (return (bytes-append (subbytes bstr 0 2)

racket/src/io/path/parameter.rkt

@@ -11,7 +11,9 @@
 ;; wrapped to include security-guard checks.
 
 (define/who current-directory
-  (make-parameter (path #"/" (system-path-convention-type))
+  (make-parameter (case (system-path-convention-type)
+		    [(unix) (path #"/" 'unix)]
+		    [(windows) (path #"C:\\" 'windows)])
                   (lambda (v)
                     (check-directory-path who v))))
 

racket/src/io/path/split.rkt

@@ -76,7 +76,7 @@
                                        3]
                                       [else 2])
                          #:explode? explode?)]
-     [(split-after-drive p #:explode? explode?)])]))
+     [else (split-after-drive p #:explode? explode?)])]))
 
 ;; ----------------------------------------
 

racket/src/io/port/string-input.rkt

@@ -318,7 +318,8 @@
     (cond
       [(and b
             (or (eof-object? b)
-                (b . < . 128)))
+	    	(and (byte? b)
+                     (b . < . 128))))
        ;; Shortcut worked
        (if (eof-object? b) b (integer->char b))]
       [else

racket/src/regexp/Makefile

@@ -22,10 +22,20 @@ SAVE_DEPS = --depends $(GENERATED_RKTL) $(BUILDDIR)compiled/regexp.d
 $(GENERATED_RKTL): $(DIRECT_DEP)
 	$(RACKET) ../expander/bootstrap-run.rkt -t main.rkt -c $(BUILDDIR)compiled/cache-src -k ../.. $(IGNORE) -s -x $(SAVE_DEPS) -o $(GENERATED_RKTL)
 
+# \
+!if 0
+
 # Dependencies in "expander.d" are created via the "cs" makefile
 -include $(BUILDDIR)expander.d
 -include $(BUILDDIR)compiled/regexp.d
 
+# \
+!endif
+# \
+!include ..\build\expander_regexp.d
+# \
+!include ..\build\compiled\regexp.d
+
 demo:
 	$(RACO) make demo.rkt
 	$(RACKET) demo.rkt

racket/src/rktio/Makefile.in

@@ -138,16 +138,20 @@ clean:
 
 # To rebuild the S-expression form of "rktio.h"
 
-rktio-rktl rktio-inc:
+rktio-rktl rktio-inc rktio-def:
 	$(MAKE) $(srcdir)/rktio.rktl
 	$(MAKE) $(srcdir)/rktio.inc
+	$(MAKE) $(srcdir)/rktio.def
 
 $(srcdir)/rktio.rktl: $(srcdir)/rktio.h $(srcdir)/parse.rkt
 	$(RACKET) $(srcdir)/parse.rkt -o $(srcdir)/rktio.rktl $(srcdir)/rktio.h
 
 $(srcdir)/rktio.inc: $(srcdir)/rktio.h $(srcdir)/parse.rkt
 	$(RACKET) $(srcdir)/parse.rkt -c -o $(srcdir)/rktio.inc $(srcdir)/rktio.h
 
+$(srcdir)/rktio.def: $(srcdir)/rktio.h $(srcdir)/parse.rkt
+	$(RACKET) $(srcdir)/parse.rkt -d -o $(srcdir)/rktio.def $(srcdir)/rktio.h
+
 # ----------------------------------------
 
 @HIDE_NOT_STANDALONE@librktio: