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

make: clear out "local" installer mode

Browse Source 
The "local" installer mode made sense only with a "pkgs"
directory that had everything to be included in the installer.
This commit is contained in:
Matthew Flatt 2014-12-04 13:59:08 -07:00
parent 038da2b0e9
commit ae1e459a53
2 changed files with 27 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
INSTALL.txt
View File

@ -20,8 +20,7 @@ distributions will work in the
way that you probably expect. way that you probably expect.
>>>> SORRY! Some of the information in this file is out of date, >>>> SORRY! Some of the information in this file is out of date.
>>>> and probably only in-place installation works at the moment.
>>>> Build modes and information here are being updated. >>>> Build modes and information here are being updated.
If you stick with this repository, then you have several options: If you stick with this repository, then you have several options:
@ -419,10 +418,8 @@ In more detail:
search is needed (because other documentation is not installed). search is needed (because other documentation is not installed).
The `SRC_CATALOG' variable determines the catalog that is used to The `SRC_CATALOG' variable determines the catalog that is used to
get package sources and native-library packages, but a value of get package sources and native-library packages. The default is
"local" triggers a bootstrap mode where packages are represented "http://pkgs.racket-lang.org".
by directories in the makefile's directory. For now, "local" is
the default.
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

109
Makefile
View File

@ -142,12 +142,8 @@ racket/src/build/Makefile: racket/src/configure racket/src/Makefile.in
# end in "_q" or "_qq", don't use any quote marks on the right-hand # end in "_q" or "_qq", don't use any quote marks on the right-hand
# side of its definition. # side of its definition.
# Catalog for sources and native packages; use "local" to bootstrap # Catalog for package sources:
# from package directories (in the same directory as this makefile) SRC_CATALOG = http://pkgs.racket-lang.org/
# plus the GitHub repository of raw native libraries. Otherwise, it's
# a catalog URL (spaces allowed), and the catalog is copied to ensure
# consistency across queries:
SRC_CATALOG = local
# A URL embedded in documentation for remote searches, where a Racket # A URL embedded in documentation for remote searches, where a Racket
# version and search key are added as query fields to the URL, and "" # version and search key are added as query fields to the URL, and ""
@ -301,6 +297,14 @@ server:
$(MAKE) base $(MAKE) base
$(MAKE) server-from-base $(MAKE) server-from-base
server-from-base:
$(MAKE) build/site.rkt
$(MAKE) stamp
$(MAKE) build-from-catalog
$(MAKE) origin-collects
$(MAKE) built-catalog
$(MAKE) built-catalog-server
build/site.rkt: build/site.rkt:
mkdir -p build mkdir -p build
echo "#lang distro-build/config" > build/site.rkt echo "#lang distro-build/config" > build/site.rkt
@ -319,86 +323,13 @@ stamp-from-git:
stamp-from-date: stamp-from-date:
date +"%Y%m%d" > build/stamp.txt date +"%Y%m%d" > build/stamp.txt
local-from-base: # Created a copy of `SRC_CATALOG', so that we snapshot checksums, and
$(MAKE) build/site.rkt # start building from it. The packages are installed in user scope,
$(MAKE) stamp # but we set the add-on directory to "build/user", so that we don't
if [ "$(SRC_CATALOG)" = 'local' ] ; \ # affect the actual current user's installation (and to a large degree
then $(MAKE) build-from-local ; \ # we're insulated from it):
else $(MAKE) build-from-catalog ; fi
server-from-base:
$(MAKE) local-from-base
$(MAKE) origin-collects
$(MAKE) built-catalog
$(MAKE) built-catalog-server
# Boostrap mode: make packages from local directories:
build-from-local:
$(MAKE) local-catalog
$(MAKE) local-build
# Set up a local catalog (useful on its own):
local-catalog:
$(MAKE) native-from-git
$(MAKE) native-catalog
$(MAKE) local-source-catalog
# Get pre-built native libraries from the repo:
native-from-git:
if [ ! -d native-pkgs/racket-win32-i386 ]; then $(MAKE) complain-no-submodule ; fi
complain-no-submodule:
: ================================================================
: Native packages are not in the expected subdirectory. Probably,
: you need to use 'git submodule init' and 'git submodule update' to get
: the submodule for native packages.
: ================================================================
exit 1
# Create packages and a catalog for all native libraries:
PACK_NATIVE = --native --pack build/native/pkgs \
++catalog build/native/catalog \
++catalog build/local/catalog
native-catalog:
$(RACKET) racket/src/pack-all.rkt --mods $(PACK_NATIVE) native-pkgs
# Create a catalog for all packages in this directory:
local-source-catalog:
$(RACKET) racket/src/pack-all.rkt --mods ++catalog build/local/catalog pkgs
# Clear out a package build in "build/user", and then install
# packages:
local-build:
$(MAKE) fresh-user
$(MAKE) packages-from-local
fresh-user:
rm -rf build/user
set-server-config:
$(RACKET) -l distro-build/set-server-config build/user/config/config.rktd $(CONFIG_MODE_q) "" "" "$(DOC_SEARCH)" ""
server-cache-config:
$(RACO) pkg config -i --set download-cache-dir build/cache
$(RACO) pkg config -i --set download-cache-max-files 1023
$(RACO) pkg config -i --set download-cache-max-bytes 671088640
# Install packages from the source copies in this directory. The
# packages are installed in user scope, but we set the add-on
# directory to "build/user", so that we don't affect the actual
# current user's installation (and to a large degree we're insulated
# from it):
packages-from-local:
$(RACO) pkg install $(LOCAL_USER_AUTO) $(REQUIRED_PKGS) $(DISTRO_BUILD_PKGS)
$(MAKE) set-server-config
$(RACKET) -l- distro-build/pkg-info -o build/pkgs.rktd build/local/catalog
$(RACKET) -l distro-build/install-pkgs $(CONFIG_MODE_q) "$(PKGS)" $(LOCAL_USER_AUTO)
$(RACO) setup --avoid-main $(JOB_OPTIONS)
# Install packages from a source catalog (as an alternative to
# `build-from-local'), where the source catalog is specified as
# `SRC_CATALOG':
build-from-catalog: build-from-catalog:
$(MAKE) fresh-user rm -rf build/user
rm -rf build/catalog-copy rm -rf build/catalog-copy
$(RACO) pkg catalog-copy "$(SRC_CATALOG)" build/catalog-copy $(RACO) pkg catalog-copy "$(SRC_CATALOG)" build/catalog-copy
$(MAKE) server-cache-config $(MAKE) server-cache-config
@ -409,6 +340,14 @@ build-from-catalog:
$(RACO) setup --avoid-main $(JOB_OPTIONS) $(RACO) setup --avoid-main $(JOB_OPTIONS)
rm -rf build/native rm -rf build/native
server-cache-config:
$(RACO) pkg config -i --set download-cache-dir build/cache
$(RACO) pkg config -i --set download-cache-max-files 1023
$(RACO) pkg config -i --set download-cache-max-bytes 671088640
set-server-config:
$(RACKET) -l distro-build/set-server-config build/user/config/config.rktd $(CONFIG_MODE_q) "" "" "$(DOC_SEARCH)" ""
# Although a client will build its own "collects", pack up the # Although a client will build its own "collects", pack up the
# server's version to be used by each client, so that every client has # server's version to be used by each client, so that every client has
# exactly the same bytecode (which matters for SHA1-based dependency # exactly the same bytecode (which matters for SHA1-based dependency