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

maefile: adjust SERVER_COMPILE_MACHINE convention

Browse Source 
The old way wasn't delivering needed information to
`distro-build/drive-clients`.
This commit is contained in:
Matthew Flatt 2018-11-27 10:34:52 -07:00
parent 5f940e462e
commit da62067d8f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL.txt
View File

@ -371,12 +371,12 @@ platform-specific: ".sh" for Unix (including Linux), ".dmg" or ".pkg"
for Mac OS, and ".exe" for Windows. for Mac OS, and ".exe" for Windows.
When building clients with variant 'cs, you can speed up the build When building clients with variant 'cs, you can speed up the build
process by using `SERVER_COMPILE_MACHINE=any` with `make installers`. process by using `SERVER_COMPILE_MACHINE=-M` with `make installers`.
That mode causes the server to send built packages to clients in That mode causes the server to send built packages to clients in
machine-independent form, which will need to be recompiled to the machine-independent form, which will need to be recompiled to the
client's native format for bytecode, but recompiling from client's native format for bytecode, but recompiling from
machine-independent form can be much faster than compiling from machine-independent form can be much faster than compiling from
source. Beware that `SERVER_COMPILE_MACHINE=any`cannot be used in source. Beware that `SERVER_COMPILE_MACHINE=-M`cannot be used in
a respository checkout formerly used without it, unless you first a respository checkout formerly used without it, unless you first
run `raco setup --clean`. run `raco setup --clean`.

14
Makefile
View File

@ -524,8 +524,8 @@ CLEAN_MODE =
# setup operations: # setup operations:
JOB_OPTIONS = JOB_OPTIONS =
# A command to run after the server has started; normally set by # $(USER_RACKET) arguments for a command to run after the server has
# the `installers' target: # started; normally set by the `installers' target:
SERVE_DURING_CMD_qq = SERVE_DURING_CMD_qq =
# ------------------------------------------------------------ # ------------------------------------------------------------
@ -582,12 +582,12 @@ win32-pkgs-catalog:
# These targets require GNU `make', so that we don't have to propagate # These targets require GNU `make', so that we don't have to propagate
# variables through all of the target layers. # variables through all of the target layers.
SERVER_COMPILE_MACHINE = machine-specific SERVER_COMPILE_MACHINE =
ANY_COMPILE_MACHINE_ARGS_qq = SETUP_MACHINE_FLAGS="-MCR `pwd`/build/zo:" \ ANY_COMPILE_MACHINE_ARGS_qq = SETUP_MACHINE_FLAGS="-MCR `pwd`/build/zo:" \
MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS) --enable-crossany" MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS) --enable-crossany"
server: server:
if [ "$(SERVER_COMPILE_MACHINE)" = "any" ] ; \ if [ "$(SERVER_COMPILE_MACHINE)" = "-M" ] ; \
then $(MAKE) plain-server $(ANY_COMPILE_MACHINE_ARGS_qq) ; \ then $(MAKE) plain-server $(ANY_COMPILE_MACHINE_ARGS_qq) ; \
else $(MAKE) plain-server ; fi else $(MAKE) plain-server ; fi
@ -662,7 +662,7 @@ built-catalog:
# as the copy of the server's "collects" tree: # as the copy of the server's "collects" tree:
built-catalog-server: built-catalog-server:
if [ -d ".git" ]; then git update-server-info ; fi if [ -d ".git" ]; then git update-server-info ; fi
$(USER_RACKET) -l distro-build/serve-catalog $(CONFIG_MODE_q) "$(SERVER_HOSTS)" $(SERVER_PORT) $(SERVE_DURING_CMD_qq) $(USER_RACKET) -l distro-build/serve-catalog $(CONFIG_MODE_q) "$(SERVER_HOSTS)" $(SERVER_PORT) $(USER_RACKET) $(SERVE_DURING_CMD_qq)
# Demonstrate how a catalog server for binary packages works, # Demonstrate how a catalog server for binary packages works,
# which involves creating package archives in "binary" mode # which involves creating package archives in "binary" mode
@ -825,10 +825,10 @@ client-from-site:
# Drive installer build across server and clients: # Drive installer build across server and clients:
DRIVE_ARGS_q = $(RELEASE_MODE) $(VERSIONLESS_MODE) $(SOURCE_MODE) \ DRIVE_ARGS_q = $(RELEASE_MODE) $(VERSIONLESS_MODE) $(SOURCE_MODE) \
$(CLEAN_MODE) $(SETUP_MACHINE_FLAGS) "$(CONFIG)" "$(CONFIG_MODE)" \ $(CLEAN_MODE) $(SERVER_COMPILE_MACHINE) "$(CONFIG)" "$(CONFIG_MODE)" \
$(SERVER) $(SERVER_PORT) "$(SERVER_HOSTS)" \ $(SERVER) $(SERVER_PORT) "$(SERVER_HOSTS)" \
"$(PKGS)" "$(DOC_SEARCH)" "$(DIST_NAME)" $(DIST_BASE) $(DIST_DIR) "$(PKGS)" "$(DOC_SEARCH)" "$(DIST_NAME)" $(DIST_BASE) $(DIST_DIR)
DRIVE_CMD_q = $(USER_RACKET) -l- distro-build/drive-clients $(DRIVE_ARGS_q) DRIVE_CMD_q = -l- distro-build/drive-clients $(DRIVE_ARGS_q)
# Full server build and clients drive, based on `CONFIG': # Full server build and clients drive, based on `CONFIG':
installers: installers: