rename "core" makefile targets to "base"
Using "base" is more consistent.
This commit is contained in:
Matthew Flatt
parent
2e067ab28c
commit
b0984df456
28
INSTALL.txt
28
INSTALL.txt
|
|
@ -67,18 +67,18 @@ Building Racket Pieces
|
|||
Instead of just using `make in-place', you can take more control over
|
||||
the build.
|
||||
|
||||
Building Core Racket
|
||||
Building Base Racket
|
||||
--------------------
|
||||
|
||||
Instead of using the top-level makefile, you can go into "racket/src"
|
||||
and follow the "README" there, which gives you more configuration
|
||||
options.
|
||||
|
||||
If you don't want any special configuration and you just want the core
|
||||
build, you can use `make core' (or `nmake win32-core') with the
|
||||
If you don't want any special configuration and you just want the base
|
||||
build, you can use `make base' (or `nmake win32-base') with the
|
||||
top-level makefile.
|
||||
|
||||
(The Racket core does not require additional native libraries to run,
|
||||
(The Racket base does not require additional native libraries to run,
|
||||
but under Windows, encoding-conversion, extflonum, and SSL
|
||||
functionality is hobbled until native libraries from the
|
||||
`racket-win32-i386' or `racket-win32-x86_64' package are installed.)
|
||||
|
|
@ -90,12 +90,12 @@ single- and double-quote marks are allowed in the value.)
|
|||
|
||||
On all platforms, `JOB_OPTIONS' as a makefile variable and
|
||||
`PLT_SETUP_OPTIONS' as an environment variable are passed on to the
|
||||
`raco setup' that is used to build core libraries.
|
||||
`raco setup' that is used to build base libraries.
|
||||
|
||||
Installing Packages
|
||||
-------------------
|
||||
|
||||
In the near future, after you've built the core, you can install
|
||||
In the near future, after you've built the base, you can install
|
||||
packages via a package-catalog server (ignoring the content of
|
||||
"pkgs"). That catalog server is not ready, yet.
|
||||
|
||||
|
|
@ -151,7 +151,7 @@ only if no configuration file "racket/etc/config.rktd" exists already.
|
|||
Trying Packages Locally
|
||||
-----------------------
|
||||
|
||||
Suppose that you've built core "racket" and you want to see what it
|
||||
Suppose that you've built base "racket" and you want to see what it
|
||||
looks like to install individual packages as if provided by a server
|
||||
(i.e., not through development-mode links).
|
||||
|
||||
|
|
@ -348,16 +348,16 @@ In more detail:
|
|||
|
||||
1a. Build "racket" on a server.
|
||||
|
||||
The `core' target of the makefile will do that, if you haven't
|
||||
done it already. On Windows, use `nmake win32-core'.
|
||||
The `base' target of the makefile will do that, if you haven't
|
||||
done it already. On Windows, use `nmake win32-base'.
|
||||
|
||||
1b. On the server, build packages and start a catalog server.
|
||||
|
||||
The `server-from-core' target of the makefile will do that. (The
|
||||
The `server-from-base' target of the makefile will do that. (The
|
||||
server only works on non-Windows platforms, currently.)
|
||||
|
||||
Alternatively, use the `server' target, which combines `core' and
|
||||
`server-from-core' (i.e., steps 1a and 1b).
|
||||
Alternatively, use the `server' target, which combines `base' and
|
||||
`server-from-base' (i.e., steps 1a and 1b).
|
||||
|
||||
The `PKGS' variable of the makefile determines which packages are
|
||||
built for potential inclusion in a distribution.
|
||||
|
|
@ -396,8 +396,8 @@ In more detail:
|
|||
client, it affects future documentation builds in the
|
||||
installation.
|
||||
|
||||
Alternatively, use the `client' target, which combines `core' and
|
||||
`client-from-core' (i.e., steps 2a and 2b).
|
||||
Alternatively, use the `client' target, which combines `base' and
|
||||
`client-from-base' (i.e., steps 2a and 2b).
|
||||
|
||||
On Windows, you need NSIS installed, either in the usual location
|
||||
or with `makensis' in your command-line path.
|
||||
|
|
|
|||
28
Makefile
28
Makefile
|
|
@ -9,12 +9,12 @@
|
|||
#
|
||||
# in-place = build in "racket" with all packages in development mode
|
||||
#
|
||||
# core = build in "racket" only (i.e., first step of `in-place')
|
||||
# base = build in "racket" only (i.e., first step of `in-place')
|
||||
#
|
||||
# server = build core, build packages listed in $(PKGS) or specified
|
||||
# server = build base, build packages listed in $(PKGS) or specified
|
||||
# via $(CONFIG), start server at port 9440
|
||||
#
|
||||
# client = build core, create an installer with $(PKGS) with the help
|
||||
# client = build base, create an installer with $(PKGS) with the help
|
||||
# of $(SERVER); result is recorded in "bundle/installer.txt"
|
||||
#
|
||||
# installers = `server' plus `client' via $(CONFIG)
|
||||
|
|
@ -42,13 +42,13 @@ cpus-in-place:
|
|||
$(MAKE) -j $(CPUS) plain-in-place JOB_OPTIONS="-j $(CPUS)"
|
||||
|
||||
plain-in-place:
|
||||
$(MAKE) core
|
||||
$(MAKE) base
|
||||
if $(MACOSX_CHECK) ; then $(MAKE) native-from-git ; fi
|
||||
$(MAKE) pkg-links LINK_MODE="$(LINK_MODE)"
|
||||
$(PLAIN_RACKET) -N raco -l- raco setup $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)
|
||||
|
||||
win32-in-place:
|
||||
$(MAKE) win32-core
|
||||
$(MAKE) win32-base
|
||||
$(MAKE) win32-pkg-links PKGS="$(PKGS)" LINK_MODE="$(LINK_MODE)"
|
||||
$(WIN32_PLAIN_RACKET) -N raco -l- raco setup $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)
|
||||
|
||||
|
|
@ -61,17 +61,17 @@ win32-again:
|
|||
$(MAKE) LINK_MODE="--restore" $(IN_PLACE_COPY_ARGS)
|
||||
|
||||
# ------------------------------------------------------------
|
||||
# Core build
|
||||
# Base build
|
||||
|
||||
# During this step, we use a configuration file that indicates
|
||||
# an empty set of link files, so that any installation-wide
|
||||
# links or packages are ignored during the core build.
|
||||
# links or packages are ignored during the base build.
|
||||
|
||||
CONFIGURE_ARGS_qq =
|
||||
|
||||
SELF_FLAGS_qq = SELF_RACKET_FLAGS="-G `cd ../../../build/config; pwd`"
|
||||
|
||||
core:
|
||||
base:
|
||||
mkdir -p build/config
|
||||
echo '#hash((links-search-files . ()))' > build/config/config.rktd
|
||||
mkdir -p racket/src/build
|
||||
|
|
@ -80,7 +80,7 @@ core:
|
|||
cd racket/src/build; $(MAKE) $(SELF_FLAGS_qq)
|
||||
cd racket/src/build; $(MAKE) install $(SELF_FLAGS_qq) PLT_SETUP_OPTIONS="$(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)"
|
||||
|
||||
win32-core:
|
||||
win32-base:
|
||||
IF NOT EXIST build\config cmd /c mkdir -p build\config
|
||||
cmd /c echo #hash((links-search-files . ())) > build\config\config.rktd
|
||||
cmd /c racket\src\worksp\build-at racket\src\worksp ..\..\..\build\config $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)
|
||||
|
|
@ -220,9 +220,9 @@ win32-pkg-links:
|
|||
|
||||
server:
|
||||
$(MAKE) build/site.rkt
|
||||
$(MAKE) core
|
||||
$(MAKE) base
|
||||
$(MAKE) stamp
|
||||
$(MAKE) server-from-core
|
||||
$(MAKE) server-from-base
|
||||
|
||||
build/site.rkt:
|
||||
mkdir -p build
|
||||
|
|
@ -240,7 +240,7 @@ stamp-from-git:
|
|||
stamp-from-date:
|
||||
date +"%Y%m%d" > build/stamp.txt
|
||||
|
||||
server-from-core:
|
||||
server-from-base:
|
||||
if [ "$(EEAPP)" = '' ] ; then $(MAKE) build-from-local ; else $(MAKE) build-from-catalog ; fi
|
||||
$(MAKE) origin-collects
|
||||
$(MAKE) built-catalog
|
||||
|
|
@ -346,7 +346,7 @@ binary-catalog-server:
|
|||
|
||||
client:
|
||||
if [ ! -d build/log ] ; then rm -rf build/user ; fi
|
||||
$(MAKE) core
|
||||
$(MAKE) base
|
||||
$(MAKE) distro-build-from-server
|
||||
$(MAKE) bundle-from-server
|
||||
$(MAKE) bundle-config
|
||||
|
|
@ -364,7 +364,7 @@ SET_BUNDLE_CONFIG_q = $(BUNDLE_CONFIG) "" "" "$(INSTALL_NAME)" "$(BUILD_STAMP)"
|
|||
|
||||
win32-client:
|
||||
IF EXIST build\user cmd /c rmdir /S /Q build\user
|
||||
$(MAKE) win32-core $(COPY_ARGS)
|
||||
$(MAKE) win32-base $(COPY_ARGS)
|
||||
$(MAKE) win32-distro-build-from-server $(COPY_ARGS)
|
||||
$(MAKE) win32-bundle-from-server $(COPY_ARGS)
|
||||
$(WIN32_RACKET) -l distro-build/set-config $(SET_BUNDLE_CONFIG_q)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user