makefile: support server-package install options

This commit is contained in:
Matthew Flatt 2019-03-13 10:55:00 -06:00
parent 5a96e89f95
commit 43f90b4781
2 changed files with 10 additions and 1 deletions

View File

@ -493,6 +493,12 @@ In more detail:
get package sources and native-library packages. The default is get package sources and native-library packages. The default is
"http://pkgs.racket-lang.org". "http://pkgs.racket-lang.org".
The `SERVER_PKG_INSTALL_OPTIONS` variable determines extra flags
that are passed to `raco pkg install` when installing on the
server (to create package builds that are sent to clients). For
example, `SERVER_PKG_INSTALL_OPTIONS=--source` could be useful
to ensure that the server always builds from sources.
The server provides README files from the "build/readmes" The server provides README files from the "build/readmes"
directory. If "README.txt" does not exist when the sever is directory. If "README.txt" does not exist when the sever is
started, a default file is created (and clients download started, a default file is created (and clients download

View File

@ -610,6 +610,9 @@ SVR_PRT = $(SERVER):$(SERVER_PORT)
SVR_CAT = http://$(SVR_PRT)/$(SERVER_CATALOG_PATH) SVR_CAT = http://$(SVR_PRT)/$(SERVER_CATALOG_PATH)
# To configure package installations on the server:
SERVER_PKG_INSTALL_OPTIONS =
# Catch problems due to malformed distribution-build packages # Catch problems due to malformed distribution-build packages
RECOMPILE_OPTIONS = --recompile-only RECOMPILE_OPTIONS = --recompile-only
@ -621,7 +624,7 @@ WIN32_RACKET = $(WIN32_PLAIN_RACKET) $(USER_CONFIG)
WIN32_RACO = $(WIN32_PLAIN_RACKET) $(USER_CONFIG) -N raco -l- raco WIN32_RACO = $(WIN32_PLAIN_RACKET) $(USER_CONFIG) -N raco -l- raco
X_AUTO_OPTIONS = --skip-installed --deps search-auto --pkgs $(JOB_OPTIONS) X_AUTO_OPTIONS = --skip-installed --deps search-auto --pkgs $(JOB_OPTIONS)
USER_AUTO_OPTIONS = --scope user $(X_AUTO_OPTIONS) USER_AUTO_OPTIONS = --scope user $(X_AUTO_OPTIONS)
SOURCE_USER_AUTO_q = --catalog build/catalog-copy $(USER_AUTO_OPTIONS) SOURCE_USER_AUTO_q = --catalog build/catalog-copy $(USER_AUTO_OPTIONS) $(SERVER_PKG_INSTALL_OPTIONS)
REMOTE_USER_AUTO = --catalog $(SVR_CAT) $(USER_AUTO_OPTIONS) REMOTE_USER_AUTO = --catalog $(SVR_CAT) $(USER_AUTO_OPTIONS)
REMOTE_INST_AUTO = --catalog $(SVR_CAT) --scope installation $(X_AUTO_OPTIONS) $(RECOMPILE_OPTIONS) REMOTE_INST_AUTO = --catalog $(SVR_CAT) --scope installation $(X_AUTO_OPTIONS) $(RECOMPILE_OPTIONS)
CONFIG_MODE_q = "$(CONFIG)" "$(CONFIG_MODE)" CONFIG_MODE_q = "$(CONFIG)" "$(CONFIG_MODE)"