diff options
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-tlpdb | 2 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc | 24 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/documentation.tlpsrc | 11 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/paper.tlpsrc | 4 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/tools.tlpsrc | 15 |
5 files changed, 23 insertions, 33 deletions
diff --git a/Master/tlpkg/bin/tl-update-tlpdb b/Master/tlpkg/bin/tl-update-tlpdb index f24f24618af..98dc06e519f 100755 --- a/Master/tlpkg/bin/tl-update-tlpdb +++ b/Master/tlpkg/bin/tl-update-tlpdb @@ -405,7 +405,7 @@ sub create_tlpdb { if (!$opt_tlpsrc_from_cmdline || $found_texlive_installation) { # do set the option_archs from the dirs in Master/bin my @archs = $tltree->architectures; - $tldb->setting("available_architectures", @archs); + $tldb->setting("available_architectures", sort @archs); # reset options to what we have by default $tldb->add_default_options(); diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc index 3b89ba251bd..7388ce178b3 100644 --- a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc @@ -17,17 +17,17 @@ longdesc All other options are set from TLConfig::TLPDBOptions to the longdesc default values specified there. longdesc longdesc There are two types here: -longdesc - If the key starts with opt_ this is an option that can be -longdesc set by the user either at installation time or via tlmgr later on -longdesc - If the key starts with setting_ this value cannot be changed -longdesc by the user directly with tlmgr, but only by other actions. -longdesc Currently there are only two settings supported of which one -longdesc is only used in special cases: -longdesc . setting_available_architectures lists all available platforms -longdesc and should be always present -longdesc . setting_platform *overrides* the auto-deteced platform. This -longdesc setting will only be present when you forced a sepcific -longdesc architecture with -force-arch to install-tl +longdesc 1) If the key starts with opt_ this is an option that can be +longdesc set by the user either at installation time or via tlmgr later. +longdesc 2) If the key starts with setting_ this value cannot be changed +longdesc by the user directly with tlmgr, but only by other actions. +longdesc Currently there are only two settings supported, and the second +longdesc is only used in unusual cases: +longdesc 2a) setting_available_architectures lists all available platforms +longdesc and should be always present +longdesc 2b) setting_platform *overrides* the auto-detected platform. +longdesc This value will only be present when you forced a specific +longdesc architecture with -force-arch to install-tl longdesc longdesc The value of __MASTER__ for the location field tells the longdesc installer to use the present directory itself. For example, @@ -44,5 +44,5 @@ depend opt_adjustrepo:1 depend opt_write18_restricted:1 # the day we want to freeze a release forever, set this to 1 and tlmgr -# will henceforth bail out saying that TLNNNN is frozen. +# will then bail out saying that TLNNNN is frozen. depend opt_frozen:0 diff --git a/Master/tlpkg/tlpsrc/documentation.tlpsrc b/Master/tlpkg/tlpsrc/documentation.tlpsrc index ce4a6ba614c..da5d1b97311 100644 --- a/Master/tlpkg/tlpsrc/documentation.tlpsrc +++ b/Master/tlpkg/tlpsrc/documentation.tlpsrc @@ -1,9 +1,2 @@ -docpattern +!d texmf-dist/doc/fonts/amiri/documentation -docpattern +!d texmf-dist/doc/fonts/gentium-tug/GentiumPlus/documentation -docpattern +!d texmf-dist/doc/fonts/punknova/documentation -docpattern +!d texmf-dist/doc/latex/interactiveworkbook/documentation -docpattern +!d texmf-dist/doc/latex/biblatex-bookinarticle/documentation -docpattern +!d texmf-dist/doc/latex/biblatex-manuscripts-philology/documentation -docpattern +!d texmf-dist/doc/latex/biblatex-realauthor/documentation -docpattern +!d texmf-dist/doc/lualatex/lilyglyphs/documentation -docpattern +!d texmf-dist/doc/support/latexindent/documentation +# see tools.tlpsrc. +docpattern d texmf-dist/doc/latex/documentation diff --git a/Master/tlpkg/tlpsrc/paper.tlpsrc b/Master/tlpkg/tlpsrc/paper.tlpsrc index 0c6ecd9961e..da58d05a7ea 100644 --- a/Master/tlpkg/tlpsrc/paper.tlpsrc +++ b/Master/tlpkg/tlpsrc/paper.tlpsrc @@ -1,2 +1,2 @@ -docpattern +!d texmf-dist/doc/latex/aiaa/pre2004/demos/paper -docpattern +!d texmf-dist/doc/latex/stex/example/paper +# see tools.tlpsrc. +docpattern d texmf-dist/doc/latex/paper diff --git a/Master/tlpkg/tlpsrc/tools.tlpsrc b/Master/tlpkg/tlpsrc/tools.tlpsrc index 75339f906e1..3b20d375098 100644 --- a/Master/tlpkg/tlpsrc/tools.tlpsrc +++ b/Master/tlpkg/tlpsrc/tools.tlpsrc @@ -1,9 +1,6 @@ -docpattern +!d texmf-dist/doc/fonts/amiri/tools -docpattern +!d texmf-dist/doc/fonts/gnu-freefont/tools -docpattern +!d texmf-dist/doc/fonts/punknova/tools -docpattern +!d texmf-dist/doc/latex/tcldoc/tools -docpattern +!d texmf-dist/doc/latex/tcldoc/tools -# -runpattern +!d texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/tools -# -srcpattern +!d texmf-dist/source/jfontmaps/tools +# lots of other packages have subdirectories named "tools". +# instead of laboriously listing them explicitly, override the +# autopatterns and look only for our own directories. +docpattern d texmf-dist/doc/latex/tools +runpattern d texmf-dist/tex/latex/tools +srcpattern d texmf-dist/source/latex/tools |