Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge #33277
Browse files Browse the repository at this point in the history
  • Loading branch information
mkoeppe committed Feb 5, 2022
2 parents 439907f + 3164fff commit 5e2cf42
Show file tree
Hide file tree
Showing 16 changed files with 91 additions and 149 deletions.
1 change: 1 addition & 0 deletions build/pkgs/_recommended/dependencies
@@ -0,0 +1 @@
pandoc ffmpeg imagemagick texlive git
12 changes: 1 addition & 11 deletions build/pkgs/_recommended/distros/debian.txt
@@ -1,17 +1,7 @@
# From https://wiki.sagemath.org/prerequisitesUbuntu
# - see also separate script packages texlive, pandoc, ffmpeg

# to generate pdf documentation
texlive-latex-extra
# to convert Jupyter notebooks to pdf
texlive-xetex
# to generate pdf documentation
latexmk
# to convert Jupyter notebooks to pdf
# pandoc -- this is a separate script package
# to render text with LaTeX in Matplotlib
dvipng
# to run the Jmol 3D viewer from the console and generate images for 3D plots in the documentation
default-jdk
# to produce animations
# ffmpeg -- this is a separate script package
libavdevice-dev
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_doc_pdf/dependencies
@@ -1 +1 @@
sagemath_doc_html
sagemath_doc_html texlive
1 change: 1 addition & 0 deletions build/pkgs/texlive/distros/alpine.txt
@@ -0,0 +1 @@
texlive
4 changes: 4 additions & 0 deletions build/pkgs/texlive/distros/arch.txt
@@ -0,0 +1,4 @@
texlive-core
texlive-latexextra
texlive-langjapanese
texlive-langcyrillic
1 change: 1 addition & 0 deletions build/pkgs/texlive/distros/cygwin.txt
@@ -0,0 +1 @@
texlive
23 changes: 23 additions & 0 deletions build/pkgs/texlive/distros/debian.txt
@@ -0,0 +1,23 @@
# to generate pdf documentation
texlive-latex-extra
# to convert Jupyter notebooks to pdf
texlive-xetex
# to generate pdf documentation
latexmk
# to render text with LaTeX in Matplotlib
dvipng
# for tgtermes.sty used in doc-pdf
tex-gyre
# for use of rsfs font in pdf documentation
texlive-fonts-recommended
# language support for the pdf documentation
texlive-lang-cyrillic
texlive-lang-english
texlive-lang-european
texlive-lang-french
texlive-lang-german
texlive-lang-italian
texlive-lang-japanese
texlive-lang-polish
texlive-lang-portuguese
texlive-lang-spanish
13 changes: 13 additions & 0 deletions build/pkgs/texlive/distros/fedora.txt
@@ -0,0 +1,13 @@
latexmk
texlive
texlive-collection-latexextra
# language support for the pdf documentation
texlive-collection-langcyrillic
texlive-collection-langeuropean
texlive-collection-langfrench
texlive-collection-langgerman
texlive-collection-langitalian
texlive-collection-langjapanese
texlive-collection-langpolish
texlive-collection-langportuguese
texlive-collection-langspanish
15 changes: 15 additions & 0 deletions build/pkgs/texlive/distros/gentoo.txt
@@ -0,0 +1,15 @@
dev-tex/latexmk
app-text/texlive
dev-texlive/texlive-langcjk
dev-texlive/texlive-langcyrillic
dev-texlive/texlive-langenglish
dev-texlive/texlive-langeuropean
dev-texlive/texlive-langfrench
dev-texlive/texlive-langgerman
dev-texlive/texlive-langitalian
dev-texlive/texlive-langjapanese
dev-texlive/texlive-langportuguese
dev-texlive/texlive-langspanish
dev-texlive/texlive-latexextra
dev-texlive/texlive-latexrecommended
dev-texlive/texlive-mathscience
1 change: 1 addition & 0 deletions build/pkgs/texlive/distros/opensuse.txt
@@ -0,0 +1 @@
texlive
1 change: 1 addition & 0 deletions build/pkgs/texlive/distros/slackware.txt
@@ -0,0 +1 @@
texlive
1 change: 1 addition & 0 deletions build/pkgs/texlive/distros/void.txt
@@ -0,0 +1 @@
texlive
22 changes: 22 additions & 0 deletions build/pkgs/texlive/spkg-configure.m4
@@ -0,0 +1,22 @@
SAGE_SPKG_CONFIGURE([texlive], [
sage_spkg_install_texlive=no
AC_PATH_PROG([PDFLATEX], [pdflatex])
AS_IF([test -z "$PDFLATEX"], [sage_spkg_install_texlive=yes])
AC_PATH_PROG([LATEXMK], [latexmk])
AS_IF([test -z "$LATEXMK"], [sage_spkg_install_texlive=yes])
AC_PATH_PROG([DVIPNG], [dvipng])
AS_IF([test -z "$DVIPNG"], [sage_spkg_install_texlive=yes])
m4_foreach([latex_package],
[fontspec,xunicode,xltxtra,amssymb,amsfonts,graphicx,mathrsfs,
textcomp,tikz,tikz-qtree,iftex,tkz-berge,tkz-graph,xy,babel,
subfigure,hyperref,hypcap,xr,tgtermes,fncychap],
[
AC_MSG_CHECKING([for latex package ]latex_package)
AS_IF([kpsewhich ]latex_package[.sty >& AS_MESSAGE_LOG_FD 2>&1], [
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
sage_spkg_install_texlive=yes
])
])
])
3 changes: 2 additions & 1 deletion build/pkgs/texlive/spkg-install
@@ -1 +1,2 @@
exec python3 spkg-install.py
#! /usr/bin/env bash
# Nothing to do
134 changes: 0 additions & 134 deletions build/pkgs/texlive/spkg-install.py

This file was deleted.

6 changes: 4 additions & 2 deletions src/doc/bootstrap
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:*)
$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 5e2cf42

Please sign in to comment.