Trac #31362: make build-local, make build-venv

The new `make` target `build-local` will build all non-Python packages
that `make build` builds.

`make build-venv` will build all Python packages that `make build`
builds.

Preparation for #30896, #30371 and related to #30913.

URL: https://trac.sagemath.org/31362
Reported by: mkoeppe
Ticket author(s): Matthias Koeppe
Reviewer(s): John Palmieri

Author: Release Manager

Makefile

@@ -15,6 +15,12 @@ all: base-toolchain
 build: base-toolchain
 	$(MAKE) all-build
 
+build-local: base-toolchain
+	$(MAKE) all-build-local
+
+build-venv: base-toolchain
+	$(MAKE) all-build-venv
+
 start: base-toolchain
 	$(MAKE) build-start
 

build/make/Makefile.in

@@ -86,19 +86,35 @@ GCC_DEP = @SAGE_GCC_DEP@
 
 @SAGE_PACKAGE_DEPENDENCIES@
 
+# Installation trees for all packages, in the format:
+#
+# - for a non-Python package:
+#
+#   trees_<pkgname1> = SAGE_LOCAL
+#
+# - for a Python package:
+#
+#   trees_<pkgname2> = SAGE_VENV
+
+@SAGE_PACKAGE_TREES@
+
 # All standard packages
 STANDARD_PACKAGES = @SAGE_STANDARD_PACKAGES@
 STANDARD_PACKAGE_INSTS = \
 	$(foreach pkgname,$(STANDARD_PACKAGES),$(inst_$(pkgname)))
 
-# All optional installed packages (triggers the auto-update)
+# Optional/experimental packages to be installed
 OPTIONAL_INSTALLED_PACKAGES = @SAGE_OPTIONAL_INSTALLED_PACKAGES@
-OPTIONAL_INSTALLED_PACKAGE_INSTS = \
-    $(foreach pkgname,$(OPTIONAL_INSTALLED_PACKAGES),$(inst_$(pkgname)))
 
-# All previously installed optional packages that are to be uninstalled
+# All packages to be installed
+INSTALLED_PACKAGES = $(STANDARD_PACKAGES) $(OPTIONAL_INSTALLED_PACKAGES)
+INSTALLED_PACKAGE_INSTS = \
+    $(foreach pkgname,$(INSTALLED_PACKAGES),$(inst_$(pkgname)))
+
+# All previously installed packages that are to be uninstalled
 OPTIONAL_CLEANED_PACKAGES = @SAGE_OPTIONAL_CLEANED_PACKAGES@
-OPTIONAL_CLEANED_PACKAGES_CLEANS = $(OPTIONAL_CLEANED_PACKAGES:%=%-clean)
+CLEANED_PACKAGES = $(OPTIONAL_CLEANED_PACKAGES)
+CLEANED_PACKAGES_CLEANS = $(CLEANED_PACKAGES:%=%-clean)
 
 # All packages which should be downloaded
 SDIST_PACKAGES = @SAGE_SDIST_PACKAGES@
@@ -146,6 +162,18 @@ $(INST)/.dummy:
 	touch $@
 
 
+# Filtered by installation tree
+$(foreach tree,SAGE_LOCAL SAGE_VENV, \
+    $(eval $(tree)_INSTALLED_PACKAGE_INSTS = \
+               $(foreach pkgname,$(INSTALLED_PACKAGES), \
+                         $(if $(findstring $(tree),$(trees_$(pkgname))), \
+                              $(inst_$(pkgname))))) \
+    $(eval $(tree)_CLEANED_PACKAGE_CLEANS = \
+               $(foreach pkgname,$(INSTALLED_PACKAGES), \
+                         $(if $(findstring $(tree),$(trees_$(pkgname))), \
+                              $(inst_$(pkgname))))))
+
+
 ###############################################################################
 
 # Silent rules
@@ -211,9 +239,19 @@ base-toolchain: _clean-broken-gcc base
 # All targets except for the base packages
 all-sage: \
 		sagelib \
-		$(STANDARD_PACKAGE_INSTS) \
-		$(OPTIONAL_INSTALLED_PACKAGE_INSTS) \
-                $(OPTIONAL_CLEANED_PACKAGES_CLEANS)
+		$(INSTALLED_PACKAGE_INSTS) \
+                $(CLEANED_PACKAGES_CLEANS)
+
+# Same but filtered by installation trees:
+all-build-local: toolchain-deps
+	+$(MAKE_REC) all-sage-local
+
+all-sage-local: $(SAGE_LOCAL_INSTALLED_PACKAGE_INSTS) $(SAGE_LOCAL_CLEANED_PACKAGES_CLEANS)
+
+all-build-venv: toolchain-deps
+	+$(MAKE_REC) all-sage-venv
+
+all-sage-venv:  $(SAGE_VENV_INSTALLED_PACKAGE_INSTS)  $(SAGE_VENV_CLEANED_PACKAGES_CLEANS)
 
 # Download all packages which should be inside an sdist tarball (the -B
 # option to make forces all targets to be built unconditionally)

build/pkgs/pynac/install-requires.txt

@@ -0,0 +1 @@
+sagemath-standard

build/pkgs/sagelib/install-requires.txt

@@ -118,9 +118,10 @@ SAGE_STANDARD_PACKAGES=''
 # List of all packages that should be downloaded
 SAGE_SDIST_PACKAGES=''
 
-# Generate package version and dependency lists
+# Generate package version/dependency/tree lists
 SAGE_PACKAGE_VERSIONS=""
 SAGE_PACKAGE_DEPENDENCIES=""
+SAGE_PACKAGE_TREES=""
 # Lists of packages categorized according to their build rules
 SAGE_NORMAL_PACKAGES=''
 SAGE_PIP_PACKAGES=''
@@ -149,6 +150,19 @@ for DIR in $SAGE_ROOT/build/pkgs/*; do
 
     in_sdist=no
 
+    dnl Write out information about the installation tree, using the name of the tree prefix
+    dnl variable (SAGE_LOCAL or SAGE_VENV).  The makefile variable of SPKG is called "trees_SPKG",
+    dnl note plural, for possible future extension in which an SPKG would be installed into several
+    dnl trees.  For example, if we decide to create a separate tree for a venv with the
+    dnl Jupyter notebook, then packages such as jupyter_core would have to be installed into
+    dnl two trees.
+    SPKG_TREE_VAR=SAGE_LOCAL
+    if test -f "$DIR/requirements.txt" -o -f "$DIR/install-requires.txt"; then
+        dnl A Python package
+        SPKG_TREE_VAR=SAGE_VENV
+    fi
+    SAGE_PACKAGE_TREES="${SAGE_PACKAGE_TREES}$(printf '\ntrees_')${SPKG_NAME} = ${SPKG_TREE_VAR}"
+
     uninstall_message=""
     # Check consistency of 'DIR/type' file
     case "$SPKG_TYPE" in
@@ -320,6 +334,7 @@ done
 
 AC_SUBST([SAGE_PACKAGE_VERSIONS])
 AC_SUBST([SAGE_PACKAGE_DEPENDENCIES])
+AC_SUBST([SAGE_PACKAGE_TREES])
 AC_SUBST([SAGE_NORMAL_PACKAGES])
 AC_SUBST([SAGE_PIP_PACKAGES])
 AC_SUBST([SAGE_SCRIPT_PACKAGES])