suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make base: more complete avoidance of user-specific state

Browse Source 
User-scope package installation matching the version of
Racket being built could affect the collections visible
during `raco setup` for `make base`. In particular, the
presence of `setup/scribble` could cause all built docs
to be discarded.

Also, add the `--no-user-path` flag to `racket` (which
has long been documented as an alias for `-U`).
This commit is contained in:
Matthew Flatt 2015-09-08 16:47:24 -06:00
parent 965fa8e34c
commit 707f888c83
5 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
racket/collects/setup/setup-core.rkt
View File

@ -1922,7 +1922,8 @@
(setup-printf "links files" "")
(for ([p (get-links-search-files)])
(setup-printf #f " ~a" p))
(setup-printf #f " ~a" (find-user-links-file))
(when (use-user-specific-search-paths)
(setup-printf #f " ~a" (find-user-links-file)))
(setup-printf "main docs" "~a" (find-doc-dir))
(when (and (not (null? (archives))) no-specific-collections?)

4
racket/src/Makefile.in
View File

@ -80,7 +80,9 @@ both:
# Install (common) ----------------------------------------
INST_CONFIG = -X @DIRCVTPRE@"$(DESTDIR)$(collectsdir)"@DIRCVTPOST@ -G @DIRCVTPRE@"$(DESTDIR)$(configdir)"@DIRCVTPOST@
SETUP_ARGS = $(INST_CONFIG) $(SELF_RACKET_FLAGS) -N "raco" -l- setup @INSTALL_SETUP_FLAGS@ $(PLT_SETUP_OPTIONS) $(PLT_ISO)
SETUP_RACKET_FLAGS = $(INST_CONFIG) $(SELF_RACKET_FLAGS) @INSTALL_SETUP_RACKET_FLAGS@
SETUP_SETUP_FLAGS = @INSTALL_SETUP_FLAGS@ $(PLT_SETUP_OPTIONS) $(PLT_ISO)
SETUP_ARGS = $(SETUP_RACKET_FLAGS) -N "raco" -l- setup $(SETUP_SETUP_FLAGS)
install:
$(MAKE) install-@MAIN_VARIANT@

4
racket/src/configure vendored
View File

@ -629,6 +629,7 @@ RUN_RACKET_MAIN_VARIANT
RUN_RACKET_MMM
RUN_RACKET_CGC
INSTALL_LIBS_ENABLE
INSTALL_SETUP_RACKET_FLAGS
INSTALL_SETUP_FLAGS
MAIN_VARIANT
CGC_CAP_INSTALLED
@ -3164,6 +3165,7 @@ CGC_CAP_INSTALLED=CGC
MAIN_VARIANT=3m
INSTALL_SETUP_FLAGS=
INSTALL_SETUP_RACKET_FLAGS=
INSTALL_LIBS_ENABLE=no-install
@ -6622,6 +6624,7 @@ fi
if test "${enable_usersetup}" != "yes" ; then
INSTALL_SETUP_FLAGS="${INSTALL_SETUP_FLAGS} --no-user"
INSTALL_SETUP_RACKET_FLAGS="${INSTALL_SETUP_RACKET_FLAGS} --no-user-path"
fi
############## docs ################
@ -6846,6 +6849,7 @@ LIBS="$LIBS $EXTRALIBS"
mk_needed_dir()

2
racket/src/racket/cmdline.inc
View File

@ -1132,6 +1132,8 @@ static int run_from_cmd_line(int argc, char *_argv[],
argv[0] = "-c";
else if (!strcmp("--no-lib", argv[0]))
argv[0] = "-n";
else if (!strcmp("--no-user-path", argv[0]))
argv[0] = "-U";
else if (!strcmp("--version", argv[0]))
argv[0] = "-v";
else if (!strcmp("--no-init-file", argv[0]))

3
racket/src/racket/configure.ac
View File

@ -440,6 +440,7 @@ CGC_CAP_INSTALLED=CGC
MAIN_VARIANT=3m
INSTALL_SETUP_FLAGS=
INSTALL_SETUP_RACKET_FLAGS=
INSTALL_LIBS_ENABLE=no-install
@ -1543,6 +1544,7 @@ fi
if test "${enable_usersetup}" != "yes" ; then
INSTALL_SETUP_FLAGS="${INSTALL_SETUP_FLAGS} --no-user"
INSTALL_SETUP_RACKET_FLAGS="${INSTALL_SETUP_RACKET_FLAGS} --no-user-path"
fi
############## docs ################
@ -1759,6 +1761,7 @@ AC_SUBST(CGC_CAP_INSTALLED)
AC_SUBST(MAIN_VARIANT)
AC_SUBST(INSTALL_SETUP_FLAGS)
AC_SUBST(INSTALL_SETUP_RACKET_FLAGS)
AC_SUBST(INSTALL_LIBS_ENABLE)