build less when using an existing Racket to build

Author: mflatt

pkgs/racket-doc/scribblings/raco/setup.scrbl

@@ -285,6 +285,28 @@ flags:
   install archive into the installation instead of a user-specific
   location.}
 
+]}
+@item{Bootstrapping:
+@itemize[
+
+ @item{@DFlag{boot} @nonterm{module-file} @nonterm{build-dir} --- For
+       use by directly running @racketmodname[setup] instead of
+       through @exec{raco setup}, loads @nonterm{module-file} in the
+       same way that @exec{raco setup} normally loads itself,
+       auto-detecting the need to start from sources and rebuild the
+       compiled files---even for the compilation manager itself. The
+       @nonterm{build-dir} path is installed as the only path in
+       @racket[current-compiled-file-roots], so all compiled files
+       go there.}
+
+ @item{@DFlag{chain} @nonterm{module-file} @nonterm{build-dir} ---
+       Like @DFlag{boot}, but adds @nonterm{build-dir} to the start of
+       @racket[current-compiled-file-roots] instead of replacing the
+       current value, which means that libraries already built in the
+       normal location (including the compilation manager itself) will
+       be used instead of rebuilt. This mode makes sense for
+       cross-compilation.}
+
 ]}
 
 ]
@@ -1174,6 +1196,19 @@ form.}
 
 }
 
+@; ----------------------------------------
+
+@subsection{Setup Start Module}
+
+@defmodule[setup]{The @racketmodname[setup] library implements
+@exec{raco setup}, including the part that bootstraps @exec{raco setup}
+if its own implementation needs to be compiled.}
+
+When running @racketmodname[setup] via @exec{racket}, supply the
+@exec{@Flag{N} raco} to ensure that command-line arguments are parsed
+the same way as for @exec{raco setup}, as opposed to a legacy
+command-line mode.
+
 @; ------------------------------------------------------------------------
 
 @section[#:tag ".plt-archives"]{API for Installing @filepath{.plt} Archives}

racket/collects/setup/main.rkt

@@ -143,15 +143,19 @@
                     (if (pair? (cdr flags))
                         (filter-flags queued-flags (cddr flags))
                         queued-flags)
-                    (if (equal? "--boot" (car flags))
-                        ;; Record an alternate boot module and compiled-file root
+                    (if (or (equal? "--boot" (car flags))
+                            (equal? "--chain" (car flags)))
+                        ;; Record an alternate boot module and [additional] compiled-file root
                         (if (and (pair? (cdr flags))
                                  (pair? (cddr flags)))
                             (begin
                               (set! go-module (list 'file (cadr flags)))
                               (set! print-loading-sources? #t)
                               (let ([root (path->complete-path (caddr flags))])
-                                (current-compiled-file-roots (list root)))
+                                (current-compiled-file-roots
+                                 (if (equal? "--boot" (car flags))
+                                     (list root)
+                                     (cons root (current-compiled-file-roots)))))
                               (cons (car flags)
                                     (filter-flags queued-flags (cddr flags))))
                             queued-flags)

racket/collects/setup/setup-cmdline.rkt

@@ -108,7 +108,10 @@
      [("--unused-pkg-deps") "Check for unused package-dependency declarations"
       (add-flags '((check-dependencies #t)
                    (check-unused-dependencies #t)))]
-     [("--boot") path dir "Select a continuation other than `setup/setup-go`"
+     [("--chain") path dir "Select a continuation other than `setup/setup-go`"
+      ;; This flag is handled by `setup/main`
+      (void)]
+     [("--boot") path dir "Like `--chain`, but use compiled only from <dir>"
       ;; This flag is handled by `setup/main`
       (void)]
      #:help-labels

racket/src/configure

@@ -628,6 +628,7 @@ MAKE_LOCAL_RACKET
 STARTUP_AS_AUTO
 STARTUP_AS_C
 STARTUP_AS_BYTECODE
+BOOT_MODE
 CGC_IF_NEEDED_FOR_MMM
 RUN_RACKET_MAIN_VARIANT
 RUN_RACKET_MMM
@@ -6637,11 +6638,13 @@ if test "${enable_racket}" = "" ; then
   RUN_RACKET_MMM='$(RUN_THIS_RACKET_MMM)'
   RUN_RACKET_MAIN_VARIANT='$(RUN_THIS_RACKET_MAIN_VARIANT)'
   CGC_IF_NEEDED_FOR_MMM="cgc"
+  BOOT_MODE="--boot"
 else
   RUN_RACKET_CGC="${enable_racket}"
   RUN_RACKET_MMM="${enable_racket}"
   RUN_RACKET_MAIN_VARIANT="${enable_racket}"
   CGC_IF_NEEDED_FOR_MMM="no-cgc-needed"
+  BOOT_MODE="--chain"
 fi
 
 ############## libtool ################
@@ -6853,6 +6856,7 @@ LIBS="$LIBS $EXTRALIBS"
 
 
 
+
 
 
 mk_needed_dir()

racket/src/cs/c/Makefile.in

@@ -47,7 +47,7 @@ ABS_SCHEME_SRC = "`$(RACKET) $(srcdir)/../absify.rkt $(SCHEME_SRC)`"
 ABS_SRCDIR = "`$(RACKET) $(srcdir)/../absify.rkt $(srcdir)`"
 ABS_BUILDDIR = "`$(RACKET) $(srcdir)/../absify.rkt $(builddir)`"
 
-SETUP_BOOT = -W 'info@compiler/cm error' -l- setup --boot $(srcdir)/../../setup-go.rkt $(builddir)/compiled
+SETUP_BOOT = -W 'info@compiler/cm error' -l- setup --chain $(srcdir)/../../setup-go.rkt $(builddir)/compiled
 
 # The "expander", "thread", "io", "regexp", and "schemify" makefiles
 # all use "expander.d", but they set `GENERATED_RKTL` so it refers to

racket/src/cs/c/configure

@@ -1337,7 +1337,7 @@ Optional Features:
   --enable-iconv          use iconv (usually auto-enabled)
   --enable-xonx           use Unix style (e.g., use Gtk) for Mac OS
   --enable-racket=<path>  use <path> as Racket to build; or "auto" to create
-  --enable-scheme=<path>  Chez Scheme build dierctory at <path>
+  --enable-scheme=<path>  Chez Scheme build directory at <path>
   --enable-mach=<mac>     Use Chez Scheme machine type <mach>
 
 Some influential environment variables:
@@ -3291,6 +3291,10 @@ if test "${enable_scheme}" != "" ; then
   SCHEME_SRC="${enable_scheme}"
 fi
 
+if test "${enable_racket}" != "" ; then
+  RACKET="${enable_racket}"
+fi
+
 if test "${enable_mach}" != "" ; then
   MACH="${enable_mach}"
 fi

racket/src/cs/c/configure.ac

@@ -186,6 +186,10 @@ if test "${enable_scheme}" != "" ; then
   SCHEME_SRC="${enable_scheme}"
 fi
 
+if test "${enable_racket}" != "" ; then
+  RACKET="${enable_racket}"
+fi
+
 if test "${enable_mach}" != "" ; then
   MACH="${enable_mach}"
 fi

racket/src/gracket/Makefile.in

@@ -89,7 +89,7 @@ LINKRESULT_wx_xt = gracket@CGC@
 LINKRESULT_wx_mac = GRacket@CGC@.app/Contents/MacOS/GRacket@CGC@
 LINKRESULT = $(LINKRESULT_@WXVARIANT@)
 
-BOOT_SETUP = --boot $(srcdir)/../setup-go.rkt ../compiled
+BOOT_SETUP = @BOOT_MODE@ $(srcdir)/../setup-go.rkt ../compiled
 
 # Incremented each time the binaries change:
 DOWNLOAD_BIN_VERSION = 1

racket/src/gracket/gc2/Makefile.in

@@ -56,7 +56,7 @@ MZMMM_wx_xt = @RUN_RACKET_MMM@
 MZMMM_wx_mac = @RUN_RACKET_MMM@
 MZMMM = $(MZMMM_@WXVARIANT@)
 
-SETUP_BOOT = -l- setup --boot $(srcdir)/../../setup-go.rkt ../../compiled
+SETUP_BOOT = -l- setup @BOOT_MODE@ $(srcdir)/../../setup-go.rkt ../../compiled
 
 XFORM_CMD = $(MZMMM) $(SELF_RACKET_FLAGS) $(SETUP_BOOT) --tag ++out $(srcdir)/../../racket/gc2/xform-mod.rkt
 XFORM_CPP_ARGS = -I$(srcdir)/../../racket/gc2 $(NOGCINC) $(OPTIONS) @PREFLAGS@ $(XFORM_INC_@WXVARIANT@)

racket/src/racket/Makefile.in

@@ -49,7 +49,7 @@ RACKET = racket
 RUN_THIS_RACKET_CGC = ./racket@CGC@
 RUN_THIS_RACKET_MMM = ./racket@MMM@
 
-SETUP_BOOT = -W "info@compiler/cm error" -l- setup --boot $(srcdir)/../setup-go.rkt ../compiled
+SETUP_BOOT = -W "info@compiler/cm error" -l- setup @BOOT_MODE@ $(srcdir)/../setup-go.rkt ../compiled
 
 MZSRC = $(srcdir)/src
 

racket/src/racket/configure.ac

@@ -1592,11 +1592,13 @@ if test "${enable_racket}" = "" ; then
   RUN_RACKET_MMM='$(RUN_THIS_RACKET_MMM)'
   RUN_RACKET_MAIN_VARIANT='$(RUN_THIS_RACKET_MAIN_VARIANT)'
   CGC_IF_NEEDED_FOR_MMM="cgc"
+  BOOT_MODE="--boot"
 else
   RUN_RACKET_CGC="${enable_racket}"
   RUN_RACKET_MMM="${enable_racket}"
   RUN_RACKET_MAIN_VARIANT="${enable_racket}"
   CGC_IF_NEEDED_FOR_MMM="no-cgc-needed"
+  BOOT_MODE="--chain"
 fi
 
 ############## libtool ################
@@ -1803,6 +1805,7 @@ AC_SUBST(RUN_RACKET_CGC)
 AC_SUBST(RUN_RACKET_MMM)
 AC_SUBST(RUN_RACKET_MAIN_VARIANT)
 AC_SUBST(CGC_IF_NEEDED_FOR_MMM)
+AC_SUBST(BOOT_MODE)
 
 AC_SUBST(STARTUP_AS_BYTECODE)
 AC_SUBST(STARTUP_AS_C)

racket/src/racket/gc2/Makefile.in

@@ -43,7 +43,7 @@ DEF_C_DIRS = $(DEF_COLLECTS_DIR) $(DEF_CONFIG_DIR)
 # typically redirects to RUN_THIS_RACKET_CGC:
 RUN_THIS_RACKET_CGC = ../racket@CGC@
 
-SETUP_BOOT = -W "info@compiler/cm error" -l- setup --boot $(srcdir)/../../setup-go.rkt ../../compiled
+SETUP_BOOT = -W "info@compiler/cm error" -l- setup @BOOT_MODE@ $(srcdir)/../../setup-go.rkt ../../compiled
 XFORM_SETUP = @RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) $(SETUP_BOOT) --tag ++out $(srcdir)/xform-mod.rkt --depends
 XFORM_NOPRECOMP = $(XFORM_SETUP) --cpp "$(CPP) $(ALL_CPPFLAGS)" @XFORMFLAGS@ -o ++out
 XSRCDIR = xsrc

racket/src/setup-go.rkt

@@ -83,11 +83,9 @@
          (dynamic-require mod-file (void)))
        (lambda ()
          (port-file-unlock lock-port)))
-      
-      ;; Now that the lock is released, instantiate:
-      (dynamic-require mod-file #f)
 
-      ;; Record dependencies:
+      ;; Record dependencies (before running `mod-file`, in case
+      ;; it mangles parameters)
       (define deps (cons mod-file
                          (module-recorded-dependencies mod-file)))
       (call-with-output-file make-dep-file
@@ -98,4 +96,7 @@
                                 target-file))
           (for ([dep (in-list deps)])
             (fprintf o " \\\n ~a" dep))
-          (newline o))))))
+          (newline o)))
+
+      ;; Now that the lock is released, instantiate:
+      (dynamic-require mod-file #f))))