Clean up src/bin/sage-env-config.in: Move logic to src/bin/sage-env, move non-environment configuration variables to sage_conf.py

Author: Matthias Koeppe

build/pkgs/sage_conf/src/sage_conf.py.in

@@ -6,6 +6,8 @@ MAXIMA = "@prefix@/bin/maxima"
 
 ARB_LIBRARY = "@SAGE_ARB_LIBRARY@"
 
+SAGE_NAUTY_BINS_PREFIX = "@SAGE_NAUTY_BINS_PREFIX@"
+
 # The following must not be used during build to determine source or installation
 # location of sagelib.  See comments in SAGE_ROOT/src/Makefile.in
 SAGE_LOCAL = "@prefix@"

src/bin/sage-env

@@ -227,6 +227,10 @@ if [ "$UNAME" = "Darwin" ]; then
     export OBJC OBJCXX
 fi
 
+if [ "$SAGE_PYTHON_VERSION" = 3 ]; then
+    export SAGE_PYTHON3=yes
+fi
+
 # Set other Fortran-related compiler variables
 export F77="$FC"
 export F90="$FC"   # Needed for SciPy
@@ -291,6 +295,12 @@ export SAGE_SRC="$SAGE_ROOT/src"
 export SAGE_DOC_SRC="$SAGE_SRC/doc"
 export SAGE_DOC="$SAGE_SHARE/doc/sage"
 
+if [ -n "$SAGE_PKG_CONFIG_PATH" ]; then
+    # set up external pkg-config to look into SAGE_LOCAL/lib/pkgconfig/
+    # (Sage's pkgconf spkg takes care of this, if installed)
+    export PKG_CONFIG_PATH="$SAGE_PKG_CONFIG_PATH${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
+fi
+
 if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
     SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH
     SAGE_ORIG_PATH_SET=True && export SAGE_ORIG_PATH_SET

src/bin/sage-env-config.in

@@ -1,9 +1,9 @@
-# -*- shell-script -*-
+# -*- shell-script -*- @configure_input@
 
 ###########################################################################
 #
-#  Set some environment variables for Sage.
-#  This file is generated from sage-env-config.in by configure.
+#  Set some environment variables that are needed at the runtime of Sage
+#  and by its child processes.
 #
 #  NOTES:
 #  - You must *source* this script instead of executing.
@@ -12,6 +12,15 @@
 #    which is probably not intended.
 #  - All environment variables set here should be *exported*, otherwise
 #    they won't be available in child programs.
+#  - This file is only for setting immediate values.  Any kind of conditionals
+#    or computed values are to be set by src/bin/sage-env after sourcing this
+#    file.
+#  - Environment variables that are only needed at the time of building
+#    SPKGs or sagelib should be set in build/bin/sage-build-env-config
+#    instead.
+#  - Configuration variables that are only needed by the Sage runtime,
+#    but not as environment variables, should instead be set in
+#    build/pkgs/sage_conf/src/sage_conf.py
 #
 ##########################################################################
 
@@ -32,17 +41,5 @@ export CONFIGURED_OBJCXX="@OBJCXX@"
 # Other configuration
 #######################################
 export SAGE_PYTHON_VERSION=@SAGE_PYTHON_VERSION@
-if [ "$SAGE_PYTHON_VERSION" = 3 ]; then
-    export SAGE_PYTHON3=yes
-fi
-
 export PYTHON_FOR_VENV="@PYTHON_FOR_VENV@"
-
 export SAGE_PKG_CONFIG_PATH="@SAGE_PKG_CONFIG_PATH@"
-if [ -n "$SAGE_PKG_CONFIG_PATH" ]; then
-    # set up external pkg-config to look into SAGE_LOCAL/lib/pkgconfig/
-    # (Sage's pkgconf spkg takes care of this, if installed)
-    export PKG_CONFIG_PATH="$SAGE_PKG_CONFIG_PATH${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
-fi
-
-export SAGE_NAUTY_BINS_PREFIX="@SAGE_NAUTY_BINS_PREFIX@"