makefile: change the default target to imply raco pkg update -a

As a result of this change, `make` will access the network (unless an
alternative catalog is specified). A `make base` is always local,
though.
This commit is contained in:
Matthew Flatt 2015-01-02 21:13:55 -07:00
parent c5d09957ba
commit e2f1ede981
2 changed files with 13 additions and 6 deletions

View File

@ -64,8 +64,9 @@ uses Unix-style tools but generates a Windows-layout Racket build.
In all cases, an in-place build includes (via links) a few packages In all cases, an in-place build includes (via links) a few packages
that are in the "pkgs" directory. To get new versions of those that are in the "pkgs" directory. To get new versions of those
packages, as well as the Racket core, then use `git pull`. To get packages, as well as the Racket core, then use `git pull'. Afterward,
new versions of any other package, use `raco pkg update`. or to get new versions of any other package, use `make in-place'
again, which includes a `raco pkg update' step.
See "More Instructions: Building Racket" below for more information. See "More Instructions: Building Racket" below for more information.
@ -86,7 +87,7 @@ On Windows, Unix-style install is not supported.
A Unix-style install leaves no reference to this source directory. A Unix-style install leaves no reference to this source directory.
To split the build and install steps of a Unix-style installation, To split the build and install steps of a Unix-style installation,
supply `DESTDIR=<dest-dir>` with `make unix-style PREFIX=<dir>`, which supply `DESTDIR=<dest-dir>' with `make unix-style PREFIX=<dir>', which
assembles the installation in "<dest-dir>". Then, copy the content of assembles the installation in "<dest-dir>". Then, copy the content of
"<dest-dir>" to the target root. "<dest-dir>" to the target root.
@ -120,9 +121,10 @@ To install a subset of the packages in "pkgs", supply `PKGS' value to
links only the "gui-lib" and "readline-lib" packages and their links only the "gui-lib" and "readline-lib" packages and their
dependencies. The default value of `PKGS' is "main-distribution dependencies. The default value of `PKGS' is "main-distribution
main-distribution-test". If you run `make` a second time, all main-distribution-test". If you run `make' a second time, all
previously installed packages remain installed, while new packages are previously installed packages remain installed and are updated, while
added. To uninstall previously selected package, use `raco pkg`. new packages are added. To uninstall previously selected package, use
`raco pkg remove'.
Using `make' (or `make in-place') sets the installation's name to Using `make' (or `make in-place') sets the installation's name to
"development", unless the installation has been previously configured "development", unless the installation has been previously configured

View File

@ -49,6 +49,9 @@ cpus-in-place:
# Explicitly propagate variables for non-GNU `make's: # Explicitly propagate variables for non-GNU `make's:
LIBSETUP = -N raco -l- raco setup LIBSETUP = -N raco -l- raco setup
# Update before install to avoid needless work on the initial build,
# and use `--no-setup` plus an explicit `raco setup` for the same reason.
UPDATE_PKGS_ARGS = --all --auto --no-setup --scope installation
INSTALL_PKGS_ARGS = $(JOB_OPTIONS) --no-setup --pkgs \ INSTALL_PKGS_ARGS = $(JOB_OPTIONS) --no-setup --pkgs \
--skip-installed --scope installation --deps search-auto \ --skip-installed --scope installation --deps search-auto \
$(REQUIRED_PKGS) $(PKGS) $(REQUIRED_PKGS) $(PKGS)
@ -57,6 +60,7 @@ ALL_PLT_SETUP_OPTIONS = $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)
plain-in-place: plain-in-place:
$(MAKE) base $(MAKE) base
$(MAKE) pkgs-catalog $(MAKE) pkgs-catalog
$(PLAIN_RACO) pkg update $(UPDATE_PKGS_ARGS)
$(PLAIN_RACO) pkg install $(INSTALL_PKGS_ARGS) $(PLAIN_RACO) pkg install $(INSTALL_PKGS_ARGS)
$(PLAIN_RACO) setup --only-foreign-libs $(ALL_PLT_SETUP_OPTIONS) $(PLAIN_RACO) setup --only-foreign-libs $(ALL_PLT_SETUP_OPTIONS)
$(PLAIN_RACO) setup $(ALL_PLT_SETUP_OPTIONS) $(PLAIN_RACO) setup $(ALL_PLT_SETUP_OPTIONS)
@ -64,6 +68,7 @@ plain-in-place:
win32-in-place: win32-in-place:
$(MAKE) win32-base $(MAKE) win32-base
$(MAKE) win32-pkgs-catalog $(MAKE) win32-pkgs-catalog
$(WIN32_PLAIN_RACO) pkg update $(UPDATE_PKGS_ARGS)
$(WIN32_PLAIN_RACO) pkg install $(INSTALL_PKGS_ARGS) $(WIN32_PLAIN_RACO) pkg install $(INSTALL_PKGS_ARGS)
$(WIN32_PLAIN_RACO) setup --only-foreign-libs $(ALL_PLT_SETUP_OPTIONS) $(WIN32_PLAIN_RACO) setup --only-foreign-libs $(ALL_PLT_SETUP_OPTIONS)
$(WIN32_PLAIN_RACO) setup $(ALL_PLT_SETUP_OPTIONS) $(WIN32_PLAIN_RACO) setup $(ALL_PLT_SETUP_OPTIONS)