Skip to content

Commit

Permalink
Trac #33277: build/pkgs/_recommended/dependencies
Browse files Browse the repository at this point in the history
From https://trac.sagemath.org/ticket/32956#comment:7

`src/doc/bootstrap` currently hardcodes the "recommended" packages.

We replace this by using the new file
`build/pkgs/_recommended/dependencies`

The new file can then also be used for provisioning system packages for
the new `recommended` factor (added in #33222).

We also add `git` as a recommended package.

URL: https://trac.sagemath.org/33277
Reported by: mkoeppe
Ticket author(s): Matthias Koeppe
Reviewer(s): Dima Pasechnik
  • Loading branch information
Release Manager committed Feb 12, 2022
2 parents 5d2a381 + 3164fff commit db7554f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions build/pkgs/_recommended/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pandoc ffmpeg imagemagick texlive git
6 changes: 4 additions & 2 deletions src/doc/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ mkdir -p "$OUTPUT_DIR"

shopt -s extglob

RECOMMENDED_SPKG_PATTERN="@(_recommended$(for a in $(head -n 1 build/pkgs/_recommended/dependencies); do echo -n "|"$a; done))"

for SYSTEM in arch debian fedora cygwin homebrew conda; do
SYSTEM_PACKAGES=
OPTIONAL_SYSTEM_PACKAGES=
Expand All @@ -42,7 +44,7 @@ for SYSTEM in arch debian fedora cygwin homebrew conda; do
*:standard)
SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES"
;;
_recommended:*|pandoc:*|ffmpeg:*|imagemagick:*|texlive:*)
$RECOMMENDED_SPKG_PATTERN:*)
RECOMMENDED_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES"
;;
*)
Expand Down Expand Up @@ -89,7 +91,7 @@ for SYSTEM in arch debian fedora cygwin homebrew conda; do
done
else
if [ "${BOOTSTRAP_QUIET}" = "no" ]; then
echo >&2 $0:$LINENO: installing "$OUTPUT_DIR"/$SYSTEM.txt and "$OUTPUT_DIR"/$SYSTEM-optional.txt
echo >&2 $0:$LINENO: installing "$OUTPUT_DIR"/$SYSTEM"*.txt"
fi
echo "$(sage-print-system-package-command $SYSTEM --prompt --sudo install $(echo $(echo $SYSTEM_PACKAGES | xargs -n 1 echo | sort)))" > "$OUTPUT_DIR"/$SYSTEM.txt
echo "$(sage-print-system-package-command $SYSTEM --prompt --sudo install $(echo $(echo $OPTIONAL_SYSTEM_PACKAGES | xargs -n 1 echo | sort)))" > "$OUTPUT_DIR"/$SYSTEM-optional.txt
Expand Down

0 comments on commit db7554f

Please sign in to comment.