From 7062d8632ec7d062d8f94ed590771e4ece15bb04 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 21 Jan 2020 18:33:23 +0000 Subject: texmf-dist/scripts/texlive-extra: new directory, for miscellanous scripts maintained as part of TeX Live, but not important for infrastructure or installation. allcm.sh, allneeded.sh: move there (from scripts/texlive). texlive-extra.tlpsrc: new package. tetex.tlpsrc: remove all*.sh and man pages from here. collection-binextra.tlpsrc: add texlive-extra here. bin/*/all*: adjust symlinks. Build/.../texlive/linked_scripts/texlive-extra: new slave directory. Adjust Makefile.am, including creating allec symlink here. Build/.../texlive/tl_scripts: remove allcm.sh, allneeded.sh here. Adjust Makefile.am. Many more to move ... git-svn-id: svn://tug.org/texlive/trunk@53480 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/texk/texlive/linked_scripts/Makefile.am | 3 + .../source/texk/texlive/linked_scripts/Makefile.in | 3 + .../source/texk/texlive/linked_scripts/scripts.lst | 2 + .../texlive/linked_scripts/texlive-extra/allcm.sh | 118 +++++++++++++++++++++ .../linked_scripts/texlive-extra/allneeded.sh | 46 ++++++++ Build/source/texk/texlive/tl_scripts/Makefile.am | 2 - Build/source/texk/texlive/tl_scripts/Makefile.in | 2 - Build/source/texk/texlive/tl_scripts/allcm.sh | 118 --------------------- Build/source/texk/texlive/tl_scripts/allneeded.sh | 46 -------- Build/source/texk/texlive/tl_scripts/scripts.lst | 2 - 10 files changed, 172 insertions(+), 170 deletions(-) create mode 100755 Build/source/texk/texlive/linked_scripts/texlive-extra/allcm.sh create mode 100755 Build/source/texk/texlive/linked_scripts/texlive-extra/allneeded.sh delete mode 100755 Build/source/texk/texlive/tl_scripts/allcm.sh delete mode 100755 Build/source/texk/texlive/tl_scripts/allneeded.sh (limited to 'Build') diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index 20cc60e497d..722796f2108 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -204,6 +204,8 @@ texmf_other_scripts = \ texlive/updmap-sys.sh \ texlive/updmap-user.sh \ texlive/updmap.pl \ + texlive-extra/allcm.sh \ + texlive-extra/allneeded.sh \ texliveonfly/texliveonfly.py \ texloganalyser/texloganalyser \ texplate/texplate.sh \ @@ -236,6 +238,7 @@ nobase_dist_texmf_scripts_SCRIPTS = \ ## Symlinks within $(bindir): FILE:LINK here means "ln -s FILE LINK" is done. bin_links = \ + allcm:allec \ cluttex:clxelatex \ cluttex:cllualatex \ epstopdf:repstopdf \ diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index 2638631a1c7..4e1ffd9efc5 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -417,6 +417,8 @@ texmf_other_scripts = \ texlive/updmap-sys.sh \ texlive/updmap-user.sh \ texlive/updmap.pl \ + texlive-extra/allcm.sh \ + texlive-extra/allneeded.sh \ texliveonfly/texliveonfly.py \ texloganalyser/texloganalyser \ texplate/texplate.sh \ @@ -445,6 +447,7 @@ nobase_dist_texmf_scripts_SCRIPTS = \ $(texmf_context_scripts) bin_links = \ + allcm:allec \ cluttex:clxelatex \ cluttex:cllualatex \ epstopdf:repstopdf \ diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst index b7861c5f665..9620e283975 100644 --- a/Build/source/texk/texlive/linked_scripts/scripts.lst +++ b/Build/source/texk/texlive/linked_scripts/scripts.lst @@ -147,6 +147,8 @@ texlive/tlmgr.pl texlive/updmap-sys.sh texlive/updmap-user.sh texlive/updmap.pl +texlive-extra/allcm.sh +texlive-extra/allneeded.sh texliveonfly/texliveonfly.py texloganalyser/texloganalyser texplate/texplate.sh diff --git a/Build/source/texk/texlive/linked_scripts/texlive-extra/allcm.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/allcm.sh new file mode 100755 index 00000000000..945c7c88457 --- /dev/null +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/allcm.sh @@ -0,0 +1,118 @@ +#!/bin/sh + +test -f /bin/sh5 && test -z "$RUNNING_SH5" \ + && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ + && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; } +unset RUNNING_SH5 + +test -f /bin/bsh && test -z "$RUNNING_BSH" \ + && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \ + && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } +unset RUNNING_BSH + +# hack around a bug in zsh: +test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' + +progname=`basename $0` +tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ + +case "$progname" in + allec) + encoding=T1;; + *) + encoding=OT1;; +esac + +case "$1" in + -r) + DVIPS=dvired + shift + ;; + *) + DVIPS=dvips + ;; +esac + +body() +{ + cat <<-'eof' + \pagestyle{empty} + \parindent0in + \hfuzz=\maxdimen + \hbadness=10000 + \textheight9.5in + \textwidth6.5in + \newcommand{\myformula}{\sum a_{b_{c_d}} = c} + \newcommand{\mytext}{text $\mathcal{\myformula}\mathrm{\myformula} + \mathbf{\myformula}\mathsf{\myformula}\mathtt{\myformula} + \mathnormal{\myformula}\mathit{\myformula}$} + + \newcommand{\TestSizes}{{% + \tiny \mytext\scriptsize \mytext\footnotesize \mytext\small \mytext + \normalsize \mytext + \large \mytext\Large \mytext\LARGE \mytext\huge \mytext\Huge \mytext}} + \newcommand{\TestRM}{rm-family: {\rmfamily\TestSizes}\newline} + \newcommand{\TestSF}{sf-family: {\sffamily\TestSizes}\newline} + \newcommand{\TestTT}{tt-family: {\ttfamily\TestSizes}\newline} + \newcommand{\TestFamilies}{\TestRM\TestSF\TestTT\newline} + \newcommand{\TestMD}{md-series: {\mdseries\TestFamilies}} + \newcommand{\TestBF}{bf-series: {\bfseries\TestFamilies}} + \newcommand{\TestSeries}{\TestBF\TestMD\par} + \newcommand{\TestUP}{up-shape: {\upshape\TestSeries}\par} + \newcommand{\TestIT}{it-shape: {\itshape\TestSeries}\par} + \newcommand{\TestSL}{sl-shape: {\slshape\TestSeries}\par} + \newcommand{\TestSC}{sc-shape: {\scshape\TestSeries}\par} + \newcommand{\TestShapes}{\TestUP\TestIT\TestSL\TestSC} + \begin{document} + \TestShapes + \end{document} +eof +} + +head() +{ + echo '\documentclass['$1'pt]{article}' + echo '\usepackage['$encoding']{fontenc}' +} + +# before we create the tmpdir, set trap for cleanup +trap ' + rm -rf $tmpdir + exit 1 +' 1 2 3 7 13 15 + +(umask 077; mkdir "$tmpdir") || { + echo "$progname: failed to create temp directory." >&2 + exit 1 +} + +cd $tmpdir || exit 1 +echo >&2 +echo "---------------------------------------------------------------------" >&2 +echo ">>>>>>>>>>> Generating testfiles for 10pt, 11pt and 12pt. <<<<<<<<<<" >&2 +echo "---------------------------------------------------------------------" >&2 +head 10 > allcm10.tex +head 11 > allcm11.tex +head 12 > allcm12.tex +body >> allcm10.tex +body >> allcm11.tex +body >> allcm12.tex + +echo >&2 +echo "---------------------------------------------------------------------" >&2 +echo ">>>>>>>>>>> Calling latex... <<<<<<<<<<" >&2 +echo "---------------------------------------------------------------------" >&2 +latex allcm10 >/dev/null +latex allcm11 >/dev/null +latex allcm12 >/dev/null + +echo >&2 +echo "---------------------------------------------------------------------" >&2 +echo ">>>>>>>>>>> Now, calling $DVIPS to make missing fonts... <<<<<<<<<<" >&2 +echo "---------------------------------------------------------------------" >&2 +$DVIPS ${1+"$@"} -V -f allcm10 > /dev/null +$DVIPS ${1+"$@"} -V -f allcm11 > /dev/null +$DVIPS ${1+"$@"} -V -f allcm12 > /dev/null + +cd / +rm -rf $tmpdir diff --git a/Build/source/texk/texlive/linked_scripts/texlive-extra/allneeded.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/allneeded.sh new file mode 100755 index 00000000000..15c62c84adb --- /dev/null +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/allneeded.sh @@ -0,0 +1,46 @@ +#!/bin/sh + +test -f /bin/sh5 && test -z "$RUNNING_SH5" \ + && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ + && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; } +unset RUNNING_SH5 + +test -f /bin/bsh && test -z "$RUNNING_BSH" \ + && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \ + && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } +unset RUNNING_BSH + +progname=`basename $0` +dvired=false + +case $1 in +-r) DVIPS="dvips -x707" + shift;; +*) DVIPS=dvips;; +esac + +case $# in +0) echo "Usage: $progname [-r] files ..." >&2 + exit ;; +esac + +findopt= +dvipsopt= + +for i +do + if [ -f $i ] || [ -d $i ]; then + findopt="$findopt $i" + else + dvipsopt="$dvipsopt $i" + fi +done + +find $findopt -name \*.dvi -type f -print | + while true; do + read i + test -z "$i" && exit + echo "processing file '$i' ..." + $DVIPS $dvipsopt -f "$i" >/dev/null + echo + done diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am index f10160f4cd2..4581b105c17 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.am +++ b/Build/source/texk/texlive/tl_scripts/Makefile.am @@ -26,8 +26,6 @@ EXTRA_DIST = scripts.lst # These first variable definitions are what scripts_links.am requires. perl_scripts = e2pall sh_scripts = \ - allcm \ - allneeded \ dvi2fax \ dvired \ fontinst \ diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in index 89a25b7ddf2..73356bca87d 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.in +++ b/Build/source/texk/texlive/tl_scripts/Makefile.in @@ -258,8 +258,6 @@ EXTRA_DIST = scripts.lst $(top_builddir)/../../build-aux/relpath \ # These first variable definitions are what scripts_links.am requires. perl_scripts = e2pall sh_scripts = \ - allcm \ - allneeded \ dvi2fax \ dvired \ fontinst \ diff --git a/Build/source/texk/texlive/tl_scripts/allcm.sh b/Build/source/texk/texlive/tl_scripts/allcm.sh deleted file mode 100755 index 945c7c88457..00000000000 --- a/Build/source/texk/texlive/tl_scripts/allcm.sh +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh - -test -f /bin/sh5 && test -z "$RUNNING_SH5" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ - && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; } -unset RUNNING_SH5 - -test -f /bin/bsh && test -z "$RUNNING_BSH" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \ - && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } -unset RUNNING_BSH - -# hack around a bug in zsh: -test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' - -progname=`basename $0` -tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ - -case "$progname" in - allec) - encoding=T1;; - *) - encoding=OT1;; -esac - -case "$1" in - -r) - DVIPS=dvired - shift - ;; - *) - DVIPS=dvips - ;; -esac - -body() -{ - cat <<-'eof' - \pagestyle{empty} - \parindent0in - \hfuzz=\maxdimen - \hbadness=10000 - \textheight9.5in - \textwidth6.5in - \newcommand{\myformula}{\sum a_{b_{c_d}} = c} - \newcommand{\mytext}{text $\mathcal{\myformula}\mathrm{\myformula} - \mathbf{\myformula}\mathsf{\myformula}\mathtt{\myformula} - \mathnormal{\myformula}\mathit{\myformula}$} - - \newcommand{\TestSizes}{{% - \tiny \mytext\scriptsize \mytext\footnotesize \mytext\small \mytext - \normalsize \mytext - \large \mytext\Large \mytext\LARGE \mytext\huge \mytext\Huge \mytext}} - \newcommand{\TestRM}{rm-family: {\rmfamily\TestSizes}\newline} - \newcommand{\TestSF}{sf-family: {\sffamily\TestSizes}\newline} - \newcommand{\TestTT}{tt-family: {\ttfamily\TestSizes}\newline} - \newcommand{\TestFamilies}{\TestRM\TestSF\TestTT\newline} - \newcommand{\TestMD}{md-series: {\mdseries\TestFamilies}} - \newcommand{\TestBF}{bf-series: {\bfseries\TestFamilies}} - \newcommand{\TestSeries}{\TestBF\TestMD\par} - \newcommand{\TestUP}{up-shape: {\upshape\TestSeries}\par} - \newcommand{\TestIT}{it-shape: {\itshape\TestSeries}\par} - \newcommand{\TestSL}{sl-shape: {\slshape\TestSeries}\par} - \newcommand{\TestSC}{sc-shape: {\scshape\TestSeries}\par} - \newcommand{\TestShapes}{\TestUP\TestIT\TestSL\TestSC} - \begin{document} - \TestShapes - \end{document} -eof -} - -head() -{ - echo '\documentclass['$1'pt]{article}' - echo '\usepackage['$encoding']{fontenc}' -} - -# before we create the tmpdir, set trap for cleanup -trap ' - rm -rf $tmpdir - exit 1 -' 1 2 3 7 13 15 - -(umask 077; mkdir "$tmpdir") || { - echo "$progname: failed to create temp directory." >&2 - exit 1 -} - -cd $tmpdir || exit 1 -echo >&2 -echo "---------------------------------------------------------------------" >&2 -echo ">>>>>>>>>>> Generating testfiles for 10pt, 11pt and 12pt. <<<<<<<<<<" >&2 -echo "---------------------------------------------------------------------" >&2 -head 10 > allcm10.tex -head 11 > allcm11.tex -head 12 > allcm12.tex -body >> allcm10.tex -body >> allcm11.tex -body >> allcm12.tex - -echo >&2 -echo "---------------------------------------------------------------------" >&2 -echo ">>>>>>>>>>> Calling latex... <<<<<<<<<<" >&2 -echo "---------------------------------------------------------------------" >&2 -latex allcm10 >/dev/null -latex allcm11 >/dev/null -latex allcm12 >/dev/null - -echo >&2 -echo "---------------------------------------------------------------------" >&2 -echo ">>>>>>>>>>> Now, calling $DVIPS to make missing fonts... <<<<<<<<<<" >&2 -echo "---------------------------------------------------------------------" >&2 -$DVIPS ${1+"$@"} -V -f allcm10 > /dev/null -$DVIPS ${1+"$@"} -V -f allcm11 > /dev/null -$DVIPS ${1+"$@"} -V -f allcm12 > /dev/null - -cd / -rm -rf $tmpdir diff --git a/Build/source/texk/texlive/tl_scripts/allneeded.sh b/Build/source/texk/texlive/tl_scripts/allneeded.sh deleted file mode 100755 index 15c62c84adb..00000000000 --- a/Build/source/texk/texlive/tl_scripts/allneeded.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -test -f /bin/sh5 && test -z "$RUNNING_SH5" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ - && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; } -unset RUNNING_SH5 - -test -f /bin/bsh && test -z "$RUNNING_BSH" \ - && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \ - && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } -unset RUNNING_BSH - -progname=`basename $0` -dvired=false - -case $1 in --r) DVIPS="dvips -x707" - shift;; -*) DVIPS=dvips;; -esac - -case $# in -0) echo "Usage: $progname [-r] files ..." >&2 - exit ;; -esac - -findopt= -dvipsopt= - -for i -do - if [ -f $i ] || [ -d $i ]; then - findopt="$findopt $i" - else - dvipsopt="$dvipsopt $i" - fi -done - -find $findopt -name \*.dvi -type f -print | - while true; do - read i - test -z "$i" && exit - echo "processing file '$i' ..." - $DVIPS $dvipsopt -f "$i" >/dev/null - echo - done diff --git a/Build/source/texk/texlive/tl_scripts/scripts.lst b/Build/source/texk/texlive/tl_scripts/scripts.lst index 190f0fd3e88..da82d9da8dc 100644 --- a/Build/source/texk/texlive/tl_scripts/scripts.lst +++ b/Build/source/texk/texlive/tl_scripts/scripts.lst @@ -1,7 +1,5 @@ tl_scripts=' e2pall.pl -allcm.sh -allneeded.sh dvi2fax.sh dvired.sh fontinst.sh -- cgit v1.2.3