bootstrap, bootstrap-conda, src/doc/bootstrap: Use build/bin/sage-pac…

…kage directly

bootstrap

@@ -85,12 +85,12 @@ bootstrap () {
  rm -f m4/sage_spkg_configures.m4
  spkg_configures=""
  # initialize SAGE_ENABLE... options for standard packages
- for pkgname in $(./sage --package list :standard: | sort); do
+ for pkgname in $(sage-package list :standard: | sort); do
  spkg_configures="$spkg_configures
 AS_VAR_SET_IF([SAGE_ENABLE_$pkgname], [], [AS_VAR_SET([SAGE_ENABLE_$pkgname], [yes])])"
  done
  # --enable-SPKG options
- for pkgname in $(./sage --package list :optional: :experimental: | sort); do
+ for pkgname in $(sage-package list :optional: :experimental: | sort); do
  # Trac #29629: Temporary solution for Sage 9.1: Do not provide
  # --enable-SPKG options for installing pip packages
  if [ ! -f build/pkgs/$pkgname/requirements.txt ]; then
@@ -109,12 +109,12 @@ SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(grep -v ^= build/pkgs/$pkgname/SPKG.
  esac
  fi
  done
- for pkgname in $(./sage --package list --has-file spkg-configure.m4 | sort); do
+ for pkgname in $(sage-package list --has-file spkg-configure.m4 | sort); do
  echo "m4_sinclude([build/pkgs/$pkgname/spkg-configure.m4])"
  spkg_configures="$spkg_configures
 SAGE_SPKG_CONFIGURE_$(echo ${pkgname} | tr '[a-z]' '[A-Z]')"
  done >> m4/sage_spkg_configures.m4
- for pkgname in $(./sage --package list | sort); do
+ for pkgname in $(sage-package list | sort); do
  DIR=build/pkgs/$pkgname
  pkgtype="$(cat $DIR/type)"
  if test -f "$DIR/requirements.txt"; then
@@ -143,7 +143,7 @@ SAGE_SPKG_FINALIZE([$pkgname], [$pkgtype], [$SPKG_SOURCE], [$SPKG_TREE_VAR])"
  done
  echo "$spkg_configures" >> m4/sage_spkg_configures.m4
 
- for pkgname in $(./sage --package list --has-file bootstrap); do
+ for pkgname in $(sage-package list --has-file bootstrap); do
  (cd build/pkgs/$pkgname && ./bootstrap) || exit 1
  done
 
@@ -262,10 +262,10 @@ save () {
 
  # Compute checksum
  if [ "${BOOTSTRAP_QUIET}" = "no" ]; then
- ./sage --package fix-checksum configure
+ sage-package fix-checksum configure
  else
  # Hide the "Updating checksum..." message
- ./sage --package fix-checksum configure > /dev/null
+ sage-package fix-checksum configure > /dev/null
  fi
 }
 

bootstrap-conda

@@ -4,6 +4,8 @@
 # Generate auto-generated conda environment files
 #########################################################################
 
+export PATH="$(pwd)/build/bin:$PATH"
+
 STRIP_COMMENTS="sed s/#.*//;"
 RECOMMENDED_SPKG_PATTERN="@(_recommended$(for a in $(head -n 1 build/pkgs/_recommended/dependencies); do echo -n "|"$a; done))"
 
@@ -13,7 +15,7 @@ OPTIONAL_SYSTEM_PACKAGES=
 SAGELIB_SYSTEM_PACKAGES=
 SAGELIB_OPTIONAL_SYSTEM_PACKAGES=
 RECOMMENDED_SYSTEM_PACKAGES=
-for PKG_BASE in $(./sage --package list --has-file distros/conda.txt); do
+for PKG_BASE in $(sage-package list --has-file distros/conda.txt); do
  PKG_SCRIPTS=build/pkgs/$PKG_BASE
  SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/distros/conda.txt
  PKG_TYPE=$(cat $PKG_SCRIPTS/type)

src/doc/bootstrap

@@ -33,7 +33,7 @@ for SYSTEM in arch debian fedora cygwin homebrew; do
  SAGELIB_SYSTEM_PACKAGES=
  SAGELIB_OPTIONAL_SYSTEM_PACKAGES=
  RECOMMENDED_SYSTEM_PACKAGES=
- for PKG_BASE in $(./sage --package list --has-file distros/$SYSTEM.txt); do
+ for PKG_BASE in $(sage-package list --has-file distros/$SYSTEM.txt); do
  PKG_SCRIPTS=build/pkgs/$PKG_BASE
  SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/distros/$SYSTEM.txt
  PKG_TYPE=$(cat $PKG_SCRIPTS/type)
@@ -91,7 +91,7 @@ Sage depends. It installs them automatically if it does not find
 equivalent system packages.
 
 EOF
-for PKG_BASE in $(./sage --package list --has-file SPKG.rst :standard: | sort); do
+for PKG_BASE in $(sage-package list --has-file SPKG.rst :standard: | sort); do
  echo "* :ref:\`spkg_$PKG_BASE\`"
 done >> "$OUTPUT_INDEX"
 cat >> "$OUTPUT_INDEX" <<EOF
@@ -103,7 +103,7 @@ For additional functionality, you can install some of the following
 optional packages.
 
 EOF
-for PKG_BASE in $(./sage --package list --has-file SPKG.rst :optional: | sort); do
+for PKG_BASE in $(sage-package list --has-file SPKG.rst :optional: | sort); do
  echo "* :ref:\`spkg_$PKG_BASE\`"
 done >> "$OUTPUT_INDEX"
 cat >> "$OUTPUT_INDEX" <<EOF
@@ -116,7 +116,7 @@ Some packages that provide additional functionality are marked as
 integration of these packages into the Sage distribution.
 
 EOF
-for PKG_BASE in $(./sage --package list --has-file SPKG.rst :experimental: | sort); do
+for PKG_BASE in $(sage-package list --has-file SPKG.rst :experimental: | sort); do
  echo "* :ref:\`spkg_$PKG_BASE\`"
 done >> "$OUTPUT_INDEX"
 cat >> "$OUTPUT_INDEX" <<EOF
@@ -142,7 +142,7 @@ Packages are in alphabetical order.
  :maxdepth: 1
 
 EOF
-for PKG_BASE in $(./sage --package list --has-file SPKG.rst | sort); do
+for PKG_BASE in $(sage-package list --has-file SPKG.rst | sort); do
  PKG_SCRIPTS=build/pkgs/$PKG_BASE
  # Instead of just copying, we may want to call
  # a version of sage-spkg-info to format extra information.