bootstrap: Write m4/sage_spkg_versions_toml.m4 and use it in pkgs/*/p…

…yproject.toml.m4

.gitignore

@@ -22,7 +22,7 @@
 /confdefs.h
 
 /m4/sage_spkg_configures.m4
-/m4/sage_spkg_versions.m4
+/m4/sage_spkg_versions*.m4
 
 # no longer generated, but may still be in user worktrees
 /src/lib/pkgconfig

bootstrap

@@ -39,8 +39,13 @@ bootstrap () {
         echo "bootstrap:$LINENO: installing 'm4/sage_spkg_configures.m4'"
         echo "bootstrap:$LINENO: installing 'm4/sage_spkg_versions.m4'"
     fi
-    rm -f m4/sage_spkg_configures.m4 m4/sage_spkg_versions.m4
-    echo "# Generated by SAGE_ROOT/bootstrap; do not edit" > m4/sage_spkg_versions.m4
+    for a in m4/sage_spkg_configures.m4 m4/sage_spkg_versions.m4 m4/sage_spkg_versions_toml.m4; do
+        rm -f $a
+        echo "# Generated by SAGE_ROOT/bootstrap; do not edit" > $a
+    done
+    for a in m4/sage_spkg_versions.m4 m4/sage_spkg_versions_toml.m4; do
+        echo 'changequote(`>>>'"'"', `<<<'"')dnl" >> $a
+    done
     spkg_configures=""
     # initialize SAGE_ENABLE... options for standard packages
     for pkgname in $(sage-package list :standard: | sort); do
@@ -94,13 +99,17 @@ SAGE_SPKG_CONFIGURE_$(echo ${pkgname} | tr '[a-z]' '[A-Z]')"
             if test -f "$DIR/requirements.txt" -o -f "$DIR/install-requires.txt"; then
                 # A Python package
                 SPKG_TREE_VAR=SAGE_VENV
-                echo 'define(`SPKG_INSTALL_REQUIRES_'${pkgname}"'"', `'$(echo $(sage-get-system-packages install-requires ${pkgname}))"')dnl" >> m4/sage_spkg_versions.m4
+                echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(sage-get-system-packages install-requires ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions.m4
+                echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(sage-get-system-packages install-requires-toml ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions_toml.m4
             fi
         fi
         spkg_configures="$spkg_configures
 SAGE_SPKG_FINALIZE([$pkgname], [$pkgtype], [$SPKG_SOURCE], [$SPKG_TREE_VAR])"
     done
     echo "$spkg_configures" >> m4/sage_spkg_configures.m4
+    for a in m4/sage_spkg_versions.m4 m4/sage_spkg_versions_toml.m4; do
+        echo 'changequote(>>>`<<<, >>>'"'"'<<<)dnl' >> $a
+    done
 
     for pkgname in $(sage-package list --has-file bootstrap); do
         (cd build/pkgs/$pkgname && ./bootstrap) || exit 1

pkgs/sagemath-categories/pyproject.toml.m4

@@ -1,14 +1,13 @@
-[build-system]
+include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 # Minimum requirements for the build system to execute.
 requires = [
-    esyscmd(`sage-get-system-packages install-requires-toml \
-        setuptools     \
-        wheel          \
-        sage_setup     \
-        sagemath_environment \
-        sagemath_objects \
-        cython         \
-        gmpy2          \
-        cysignals      \
-                    ')]
+    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_wheel
+    SPKG_INSTALL_REQUIRES_sage_setup
+    SPKG_INSTALL_REQUIRES_sagemath_environment
+    SPKG_INSTALL_REQUIRES_sagemath_objects
+    SPKG_INSTALL_REQUIRES_cython
+    SPKG_INSTALL_REQUIRES_gmpy2
+    SPKG_INSTALL_REQUIRES_cysignals
+]
 build-backend = "setuptools.build_meta"

pkgs/sagemath-environment/pyproject.toml.m4

@@ -1,8 +1,8 @@
+include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    esyscmd(`sage-get-system-packages install-requires-toml \
-        setuptools     \
-        wheel          \
-                    ')]
+    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_wheel
+]
 build-backend = "setuptools.build_meta"

pkgs/sagemath-objects/pyproject.toml.m4

@@ -1,13 +1,13 @@
+include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    esyscmd(`sage-get-system-packages install-requires-toml \
-        setuptools     \
-        wheel          \
-        sage_setup     \
-        sagemath_environment \
-        cython         \
-        gmpy2          \
-        cysignals      \
-                    ')]
+    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_wheel
+    SPKG_INSTALL_REQUIRES_sage_setup
+    SPKG_INSTALL_REQUIRES_sagemath_environment
+    SPKG_INSTALL_REQUIRES_cython
+    SPKG_INSTALL_REQUIRES_gmpy2
+    SPKG_INSTALL_REQUIRES_cysignals
+]
 build-backend = "setuptools.build_meta"

pkgs/sagemath-repl/pyproject.toml.m4

@@ -1,8 +1,8 @@
+include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    esyscmd(`sage-get-system-packages install-requires-toml \
-        setuptools     \
-        wheel          \
-                    ')]
+    SPKG_INSTALL_REQUIRES_setuptools
+    SPKG_INSTALL_REQUIRES_wheel
+]
 build-backend = "setuptools.build_meta"