expander & io: reduce dependencies

Author: mflatt

racket/src/cs/Makefile

@@ -140,7 +140,7 @@ regexp-rktl:
 io-demo: $(BUILDDIR)io.so
 	$(SCHEME) $(IO_DEPS) $(BUILDDIR)io.so demo/io.ss
 
-$(BUILDDIR)io.so: $(BUILDDIR)compiled/io.scm io.sls $(IO_DEPS) $(BUILDDIR)compiled/rktio.rktl $(COMPILE_FILE_DEPS)
+$(BUILDDIR)io.so: $(BUILDDIR)compiled/io.scm io.sls $(IO_DEPS) ../rktio/rktio.rktl $(COMPILE_FILE_DEPS)
 	$(COMPILE_FILE) io.sls $(IO_DEPS)
 
 $(BUILDDIR)compiled/io.scm: $(BUILDDIR)compiled/io.rktl $(CONVERT_DEPS)

racket/src/cs/README.txt

@@ -26,10 +26,13 @@ Requirements
 
    By default, `make` will use the enclosing Racket build. Go back to
    the root of this repository/distribution and build so that at least
-   the "compiler-lib" and "parser-tools-lib" packages are installed,
-   either with just `make` (for a full build) or with
+   the "compiler-lib" package is installed, either with just `make`
+   (for a full build) or with
 
-      make PKGS="compiler-lib parser-tools-lib"
+      make PKGS="compiler-lib"
+
+   Note that if you build as described in "./c/README.txt", then you
+   don't need the "compiler-lib" package.
 
    If you'd like to use an existing installation of Racket, instead,
    you can use `make RACKET=...` to set the command for `racket`.

racket/src/cs/c/Makefile.in

@@ -58,14 +58,13 @@ RKTIO_RACKET = $(RACKET) $(SETUP_BOOT) '(GENERATED_RKTIO_RKTL)' $(builddir)/rkti
 CONVERT_RACKET = $(RACKET) $(SETUP_BOOT) convert $(builddir)/convert.d
 
 racket-so:
-	$(MAKE) bounce TARGET=build-racket-so RKTIO_LIBRARY_TARGET=skip
+	$(MAKE) bounce TARGET=build-racket-so
 
 RACKET_SO_ENV = @CONFIGURE_RACKET_SO_COMPILE@ env COMPILED_SCM_DIR="$(builddir)/compiled/"
 
 build-racket-so:
 	$(MAKE) expander
 	$(MAKE) thread
-	$(MAKE) io-rktio
 	$(MAKE) io
 	$(MAKE) regexp
 	$(MAKE) schemify
@@ -85,12 +84,8 @@ expander:
 thread:
 	cd $(srcdir)/../../thread && $(MAKE) $(builddir)/compiled/thread.rktl RACKET="$(BOOTSTRAP_RACKET)" BUILDDIR="$(builddir)/" DIRECT_DEP=""
 
-io-rktio:
-	cd $(srcdir)/../../io && $(MAKE) $(builddir)/compiled/rktio.rktl RACKET="$(BOOTSTRAP_RACKET)" BUILDDIR="$(builddir)/" DIRECT_DEP="" RKTIO_LIBRARY_TARGET=skip
-
-RKTIO_ENV = env RKTIO_RKTL_DIR="$(builddir)/compiled/"
 io:
-	cd $(srcdir)/../../io && $(RKTIO_ENV) $(MAKE) $(builddir)/compiled/io.rktl RACKET="$(BOOTSTRAP_RACKET)" BUILDDIR="$(builddir)/" DIRECT_DEP=""
+	cd $(srcdir)/../../io && $(MAKE) $(builddir)/compiled/io.rktl RACKET="$(BOOTSTRAP_RACKET)" BUILDDIR="$(builddir)/" DIRECT_DEP=""
 
 regexp:
 	cd $(srcdir)/../../regexp && $(MAKE) $(builddir)/compiled/regexp.rktl RACKET="$(BOOTSTRAP_RACKET)" BUILDDIR="$(builddir)/" DIRECT_DEP=""
@@ -176,12 +171,9 @@ main.o: $(MAIN_DEPS)
 grmain.o: $(srcdir)/grmain.c $(MAIN_DEPS) $(srcdir)/../../start/gui_filter.inc
 	$(CC) $(CFLAGS) $(DEF_C_DIRS) -c -o grmain.o $(srcdir)/grmain.c
 
-boot.o: $(srcdir)/boot.c rktio.inc $(srcdir)/boot.h
+boot.o: $(srcdir)/boot.c $(srcdir)/../../rktio/rktio.inc $(srcdir)/boot.h
 	$(CC) $(CFLAGS) -c -o boot.o $(srcdir)/boot.c
 
-rktio.inc: $(srcdir)/../../rktio/parse.rkt $(srcdir)/../../rktio/rktio.h
-	$(RACKET) $(srcdir)/../../rktio/parse.rkt -c -o rktio.inc $(srcdir)/../../rktio/rktio.h
-
 starter: $(srcdir)/../../start/ustart.c
 	$(CC) $(CFLAGS) -o starter $(srcdir)/../../start/ustart.c
 

racket/src/cs/io.sls

@@ -28,10 +28,6 @@
 
   ;; ----------------------------------------
 
-  (include "include.ss")
-
-  ;; ----------------------------------------
-
   (module (|#%rktio-instance| ptr->address)
     (meta define (convert-type t)
           (syntax-case t (ref *ref rktio_bool_t rktio_const_string_t)
@@ -171,7 +167,7 @@
     (define (rktio-lookup name)
       (foreign-entry (symbol->string name)))
 
-    (include-generated "rktio.rktl")
+    (include "../rktio/rktio.rktl")
 
     (define (rktio_filesize_ref fs)
       (ftype-ref rktio_filesize_t () (make-ftype-pointer rktio_filesize_t (ptr->address fs))))
@@ -331,7 +327,7 @@
                                  'rktio_do_install_os_signal_handler rktio_do_install_os_signal_handler
                                  'rktio_get_ctl_c_handler rktio_get_ctl_c_handler]
                                 form ...)]))
-        (include-generated "rktio.rktl"))))
+        (include "../rktio/rktio.rktl"))))
 
   ;; ----------------------------------------
 
@@ -385,6 +381,7 @@
       [(|#%rktio|) |#%rktio-instance|]
       [else #f]))
 
+  (include "include.ss")
   (include-generated "io.scm")
 
   ;; Initialize:

racket/src/expander/extract/decompile.rkt

@@ -1,8 +1,6 @@
 #lang racket/base
 (require '#%linklet
          racket/pretty
-         compiler/zo-parse
-         compiler/decompile
          "../run/status.rkt")
 
 (provide compile-and-decompile)
@@ -19,8 +17,11 @@
   (write (hash->linklet-bundle (hasheq 0 linklet)) o)
 
   (define i (open-input-bytes (get-output-bytes o)))
-  (define zo (zo-parse i))
-  (define decompiled-expr (decompile zo))
+
+  ;; Dynamically load decompiler, so that it's not otherwise a
+  ;; dependency for running the expander-flattener
+  (define zo ((dynamic-require 'compiler/zo-parse 'zo-parse) i))
+  (define decompiled-expr ((dynamic-require 'compiler/decompile 'decompile) zo))
 
   (call-with-output-file*
    print-extracted-to

racket/src/io/Makefile

@@ -4,10 +4,6 @@
 RACKET = ../../bin/racket
 RACO = $(RACKET) -N raco -l- raco
 
-# Set to `skip` if the stand-alone rktio
-# library is not needed
-RKTIO_LIBRARY_TARGET = rktio-library
-
 # Ignoring functions from `#%read` works beause they won't appear in
 # the simplified expansion, and declaring "collect.rkt" pure works
 # around a limitation of the flattener:
@@ -16,11 +12,11 @@ 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: $(BUILDDIR)compiled/rktio.rktl
+io-src: ../build/so-rktio/Makefile
 	$(RACO) make ../expander/bootstrap-run.rkt
 	$(MAKE) $(GENERATED_RKTL)
 
-DIRECT_DEP = ../expander/compiled/bootstrap-run_rkt.zo compiled/rktio.rktl
+DIRECT_DEP = ../expander/compiled/bootstrap-run_rkt.zo ../rktio/rktio.rktl
 SAVE_DEPS = --depends $(GENERATED_RKTL) $(BUILDDIR)compiled/io.d
 
 $(GENERATED_RKTL): $(DIRECT_DEP)
@@ -38,28 +34,14 @@ demo-thread: compiled/rktio.rktl
 	$(RACO) make demo-thread.rkt
 	$(RACKET) demo-thread.rkt
 
-GENERATED_RKTIO_RKTL = $(BUILDDIR)compiled/rktio.rktl
-
-$(GENERATED_RKTIO_RKTL): ../rktio/parse.rkt ../rktio/rktio.h
-	$(MAKE) $(RKTIO_LIBRARY_TARGET)
-	mkdir -p $(BUILDDIR)compiled
-	$(RACKET) ../rktio/parse.rkt -o $(GENERATED_RKTIO_RKTL) ../rktio/rktio.h
-
--include $(BUILDDIR)compiled/rktio.d
 
-skip:
-	echo Not building stand-along rktio
-
-rktio-library:
+../build/so-rktio/Makefile: ../rktio/configure ../rktio/Makefile.in ../rktio/rktio_config.h.in
+	mkdir -p ../build/so-rktio
 	$(MAKE) build-rktio RACKET="`$(RACKET) ../cs/absify.rkt --exec $(RACKET)`" PREFIX="`$(RACKET) ../cs/absify.rkt ../..`"
 
 build-rktio:
-	$(MAKE) ../build/so-rktio/Makefile
-	cd ../build/so-rktio; make install-shared-object
-
-../build/so-rktio/Makefile: ../rktio/configure ../rktio/Makefile.in ../rktio/rktio_config.h.in
-	mkdir -p ../build/so-rktio
 	cd ../build/so-rktio; ../../rktio/configure --enable-standalone --prefix=$(PREFIX)
+	cd ../build/so-rktio; make install-shared-object
 
 
 .PHONY: io-src demo rktio build-rktio

racket/src/io/host/rktio.rkt

@@ -38,17 +38,7 @@
 (define-syntax-rule (define-function/errno+step _ _ _ name . _)
   (define-function () #f name))
 
-;; Read "rktio.rktl" from a directory that can be
-;; configured through an environment variable(!)
-(define-syntax (include-rktio stx)
-  (define dir (getenv "RKTIO_RKTL_DIR"))
-  (with-syntax ([path (if dir
-                          (datum->syntax
-                           #'here
-                           `(file ,(string-append dir "rktio.rktl")))
-                          #'"../compiled/rktio.rktl")])
-    #`(include-at/relative-to #,stx #,stx path)))
-(include-rktio)
+(include "../../rktio/rktio.rktl")
 
 (define-function () #f rktio_filesize_ref)
 (define-function () #f rktio_timestamp_ref)

racket/src/rktio/Makefile.in

@@ -136,6 +136,20 @@ clean:
 
 # ----------------------------------------
 
+# To rebuild the S-expression form of "rktio.h"
+
+rktio-rktl rktio-inc:
+	$(MAKE) $(srcdir)/rktio.rktl
+	$(MAKE) $(srcdir)/rktio.inc
+
+$(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
+
+# ----------------------------------------
+
 @HIDE_NOT_STANDALONE@librktio:
 	$(MAKE) librktio.@LIBSFX@
 
@@ -148,7 +162,3 @@ install-shared-object:
 	$(MAKE) librktio.@LIBSFX@
 	mkdir -p "$(DESTDIR)$(libdir)/"
 	$(ICP_LIB) librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@"
-
-# Builds an S-expression form of "rktio.h"
-rktio.rktl: $(srcdir)/rktio.h $(srcdir)/parse.rkt
-	$(RACKET) $(srcdir)/parse.rkt -o rktio.rktl $(srcdir)/rktio.h

racket/src/rktio/parse.rkt

@@ -313,6 +313,12 @@
 (if output-file
     (with-output-to-file output-file
       #:exists 'truncate
-      (lambda () (show-content)))
+      (lambda ()
+        (cond
+          [c-mode?
+           (printf "/* Extracted from rktio.h by rktio/parse.rkt */\n")]
+          [else
+           (printf ";; Extracted from rktio.h by rktio/parse.rkt\n")])
+        (show-content)))
     (show-content))