[latex3-commits] [git/LaTeX3-latex3-latex3] master: Shorten install script (b4efcd730)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/b4efcd7304024e8feb8c7c443d3b906a73c4a276

>---------------------------------------------------------------

commit b4efcd7304024e8feb8c7c443d3b906a73c4a276
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Nov 8 08:19:52 2019 +0000

    Shorten install script
    
    Should now have better dep coverage.


>---------------------------------------------------------------

b4efcd7304024e8feb8c7c443d3b906a73c4a276
 support/texlive.sh | 59 ++++++++++++++----------------------------------------
 1 file changed, 15 insertions(+), 44 deletions(-)

diff --git a/support/texlive.sh b/support/texlive.sh
index cb750b51f..53dd77039 100644
--- a/support/texlive.sh
+++ b/support/texlive.sh
@@ -23,71 +23,46 @@ fi
 tlmgr update --self
 
 # The test framework itself
-tlmgr install luatex l3build
+tlmgr install l3build
 
-# Required to build plain and LaTeX formats:
-# TeX90 plain for unpacking, pdfLaTeX, LuaLaTeX and XeTeX for tests
-tlmgr install latex-bin tex xetex
+# Required to build plain and LaTeX formats including (u)pLaTeX
+tlmgr install latex-bin platex uplatex tex xetex
 
-# Install (u)pLaTeX
-tlmgr install platex uplatex
+# Then get the rest of required LaTeX
+tlmgr install amsmath graphics tools 
 
 # Assuming a 'basic' font set up, metafont is required to avoid
 # warnings with some packages and errors with others
 tlmgr install metafont mfware
 
-# Set up graphics
-tlmgr install graphics graphics-def
-
 # Contrib packages for testing
-#
-# The packages themselves are done with --no-depends to avoid
-# picking up l3kernel, etc.
-#
-# fontspec comes first as other packages tested have it as a dep
-tlmgr install fontspec
-tlmgr install luaotfload
-
-# Other contrib packages: done as a block to avoid multiple calls to tlmgr
-# Dependencies other than the core l3build set up, metafont, fontspec and the
-# 'graphics stack' (itself needed by fontspec) are listed below
-tlmgr install --no-depends \
+# The deps here will include l3... but that's not worth worrying about
+tlmgr install \
   chemformula \
   ctex        \
   mhchem      \
   siunitx     \
   unicode-math
-tlmgr install cjk
-tlmgr install   \
+# Dependencies for tests that are not auto-resolved:
+# a lot for CTeX as different engine need different stuff,
+# also fonts as they are not down as deps
+tlmgr install \
   adobemapping  \
   amsfonts      \
-  amsmath       \
-  chemgreek     \
+  cjk           \
   cjkpunct      \
   ctablestack   \
   ec            \
-  environ       \
-  etoolbox      \
   fandol        \
-  filehook      \
-  iftex         \
-  lm-math       \
   lualatex-math \
-  luatexbase    \
-  luatexja      \
-  ms            \
   pgf           \
-  tools         \
   trimspaces    \
   ucharcat      \
-  ulem          \
-  units         \
   xcolor        \
   xecjk         \
+  luatexja      \
   xkeyval       \
-  xunicode      \
-  zhmetrics     \
-  zhnumber
+  zhmetrics
   
 # For the doc target
 tlmgr install \
@@ -101,13 +76,9 @@ tlmgr install \
   listings    \
   makeindex   \
   mathpazo    \
-  palatino    \
   psnfss      \
-  symbol      \
   times       \
-  underscore  \
-  url         \
-  zapfding
+  underscore
 
 # Keep no backups (not required, simply makes cache bigger)
 tlmgr option -- autobackup 0