From 7bbf709741ef5b977ec1bcd88c8e368a6939663f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 3 Mar 2008 19:18:05 +0000 Subject: update a2ping into scripts, symlink in bins git-svn-id: svn://tug.org/texlive/trunk@6834 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/ctan2tds | 35 ++++++++++++++++++++------ Master/tlpkg/bin/ctan2tl | 6 +++++ Master/tlpkg/bin/tlpkg-ctan-check | 2 +- Master/tlpkg/tlpsrc/a2ping.tlpsrc | 2 ++ Master/tlpkg/tlpsrc/collection-binextra.tlpsrc | 3 ++- 5 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 Master/tlpkg/tlpsrc/a2ping.tlpsrc (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds index 29a2c12ab0f..63ed2a91798 100755 --- a/Master/tlpkg/bin/ctan2tds +++ b/Master/tlpkg/bin/ctan2tds @@ -486,6 +486,7 @@ $standardfoundry='public'; %specialdest = ( 'MemoirChapStyles', 'texmf-doc', 'Type1fonts', 'texmf-doc', + 'a2ping', 'texmf', 'amsldoc-it', 'texmf-doc', 'amsldoc-vn', 'texmf-doc', 'amsthdoc-it', 'texmf-doc', @@ -1244,11 +1245,16 @@ $standardocp='\.ocp'; ); $standardxmt='\.xmt'; +%specialscripts = ( + 'a2ping' => '\.pl', +); + # which suffixes to remove after building. Checked after runins and at # the end, in the doc directory. $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot' . '|\.bbl|\.blg|\.idx|\.ind|\.ilg|\.glo|\.gls|\.loa'; %specialclean = ( + 'a2ping' => 'README', # not worth it 'kpfonts' => 'kpfonts.tds.zip', 'mathexam' => 'sample.tex~', 'mh' => "$standardclean|.*\.(drv|ins)", # derived from dtx's @@ -1479,12 +1485,13 @@ sub donormal { &setup; chdir("$DEST/doc/$whichdocformat/$package"); &buildfilelist; -# run the .ins files (if any) supplied + + # run the .ins files (if any) supplied $inspatt = $specialins{$package} || $standardins; $Foundry = $specialfoundry{$package} || $standardfoundry; &runins($inspatt); -# rebuild the list of files in the directory + # rebuild the list of files in the directory &buildfilelist; if ($Foundry eq "metafont") { @@ -1494,7 +1501,7 @@ sub donormal { } &dodvi; -# rebuild again, as we have .dvi files now + # rebuild again, as we have .dvi files now &buildfilelist; &dobst; &domp; @@ -1506,9 +1513,9 @@ sub donormal { &doomega; &dosource; &dotype1; -# -# this is a bit weird, but its an easy way to remove -# empty directories that we never used. + &doscripts; + + # remove empty directories that we never used. &SYSTEM ("rmdir $DEST/*/$whichformat/$package 2>/dev/null"); &killfiles ($specialclean{$package} || $standardclean); @@ -1530,7 +1537,9 @@ sub runins } sub install { - local($destdir,$thispatt) = @_; + my ($destdir,$thispatt) = @_; + return unless $thispatt; + print "\t INSTALL $thispatt to $destdir\n"; &SYSTEM ("mkdir -p $destdir") unless -d $destdir; @@ -1648,6 +1657,18 @@ sub dotype1{ &install("$DEST/fonts/opentype/public/$package", $otfpatt); } +# scripts. Build/source/tex/tetex/Makefile.in installs symlinks +# in the bin directories where appropriate. Just for simplicitly, let's +# try keeping DEST as texmf when symlinks get installed; otherwise +# (if it gets called as a subprogram) texmf-dist is ok. +# +sub doscripts +{ + my $scriptpatt = $specialscripts{$package}; + return unless $scriptpatt; + &install ("$DEST/scripts/$package", $scriptpatt); +} + # xmltex files sub doxmt{ my $xmtpatt = $specialxmt{$package} || $standardxmt; diff --git a/Master/tlpkg/bin/ctan2tl b/Master/tlpkg/bin/ctan2tl index d0765d8ce49..e1360d71564 100755 --- a/Master/tlpkg/bin/ctan2tl +++ b/Master/tlpkg/bin/ctan2tl @@ -59,6 +59,12 @@ fi echo "$0: ctan dir for $pkg" echo "$0: is $ctan_dir1" +if grep " $pkg " $mydir/tlpkg-ctan-check >/dev/null; then :; else + echo + echo "$0: $pkg not in $mydir/tlpkg-ctan-check, add?" +fi + +# if $copy_from_ctan; then # remove whatever dregs in raw that might be lying around. diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 28532210ed6..94455ac4f09 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -20,7 +20,7 @@ my $TL; my @WorkingTLP = qw( 12many - a0poster aastex abbr abc abstract abstyles accfonts achemso + a0poster a2ping aastex abbr abc abstract abstyles accfonts achemso acmtrans acronym active-conf addlines adrconv ae aguplus aichej AkkTeX algorithm2e algorithmicx algorithms diff --git a/Master/tlpkg/tlpsrc/a2ping.tlpsrc b/Master/tlpkg/tlpsrc/a2ping.tlpsrc new file mode 100644 index 00000000000..e62af4c7a55 --- /dev/null +++ b/Master/tlpkg/tlpsrc/a2ping.tlpsrc @@ -0,0 +1,2 @@ +name a2ping +category TLCore diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc index 9987afe1645..9d07ed67d44 100644 --- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc @@ -3,8 +3,9 @@ category Collection shortdesc TeX auxiliary programs longdesc Various useful, but non-essential, support programs. Includes longdesc programs and macros for DVI file manipulation, literate -longdesc programming, PerlTeX, patgen, etc. +longdesc programming, patgen, etc. depend collection-basic +depend a2ping depend bin-bibtex8 depend bin-wordcount depend bin-ctie -- cgit v1.2.3