diff options
author | Karl Berry <karl@freefriends.org> | 2010-12-14 01:20:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-12-14 01:20:07 +0000 |
commit | c590486e0d651a309b105ee736a5fad59f0573dc (patch) | |
tree | 267f5ca85f75388b91e78a2a4d9eac47932c6531 /Master/tlpkg | |
parent | 3501983d237deff730c8a0bcf159e21d88d019fe (diff) |
bibtex 8-Dec-10, clarify license
git-svn-id: svn://tug.org/texlive/trunk@20729 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 2 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 65 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/bibtex.tlpsrc | 1 |
3 files changed, 49 insertions, 19 deletions
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index e52bf96edb7..2bf5293d02c 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -52,7 +52,7 @@ my @TLP_working = qw( biblatex biblatex-apa biblatex-chem biblatex-chicago biblatex-dw biblatex-historian biblatex-nature biblatex-philosophy biblatex-science - bibleref biblist bibtopic + bibleref biblist bibtex bibtopic bibtopicprefix bibexport bibunits bidi bigfoot bigints binomexp biocon bizcard blacklettert1 blindtext blkarray block blockdraw_mp blowup diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 07db9169098..80e38268928 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -757,7 +757,7 @@ $Master = "$mydir/../.."; 'xecyr', "&MAKEcopy", 'xelibertine', "die 'skipping, replaced by libertine'", 'xetex-pstricks',"&MAKEcopy", - 'xfrac', "die 'skipping, use mh (I guess)'", + 'xfrac', "die 'skipping, use mh (I think)'", 'xinitials', "die 'skipping, will be in xpackages when ready (Morten says)'", 'xits', "&MAKEflatten", 'xkeyval', "&MAKExkeyval", @@ -793,6 +793,7 @@ $Master = "$mydir/../.."; 'amstex' => '&POSTamstex', 'apalike' => '&POSTapalike', 'babelbib' => '&POSTbabelbib', + 'bibtex' => '&POSTbibtex', 'context-games' => '&POSTcontext_games', 'coordsys' => '&POSTcoordsys', 'ctex' => '&POSTctex', @@ -846,6 +847,7 @@ $standarddest = "texmf-dist"; 'arrayjob', 'generic', 'barr', 'generic', 'bghyphen', 'generic', + 'bibtex', 'generic', 'circ', 'latex', 'cirth', 'generic', 'dehyph-exptl','generic', @@ -931,6 +933,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$'; 'bbold', 'bbold.sty|\.fd', # no fonttabl.sty 'bclogo', 'bc[^l].*\.(tex|pdf|eps)|bclogo\.sty', 'bghyphen', '\.tex', + 'bibtex', 'apalike\..*|' . $standardtex, 'bidi', '^bidi\.tex|' . $standardtex, 'blockdraw_mp','NULL', # skip .sty's 'breqn', '\.sty|\.sym', @@ -1621,6 +1624,7 @@ $standardbib = 'NULL'; # almost all bib files are for the doc %specialbib= ( 'IEEEtran' => '\.bib$', 'amsrefs' => 'ams.*bib', # not jr.bib + 'bibtex' => 'xampl\.bib$', 'computational-complexity' => '\.bib$', ); @@ -1947,7 +1951,11 @@ sub set_dir_defaults my ($ctan_dir) = @_; my $guess = ""; - if ($ctan_dir =~ m!/tex-archive/fonts/!) { + if ($ctan_dir =~ m!/tex-archive/biblio/bibtex!) { + $standarddocfmt = $standardsourcefmt = "bibtex"; + $guess = "$standarddocfmt for docfmt/srcfmt"; + + } elsif ($ctan_dir =~ m!/tex-archive/fonts/!) { $standarddocfmt = $standardsourcefmt = "fonts"; $guess = "$standarddocfmt for docfmt/srcfmt"; @@ -1986,21 +1994,44 @@ sub set_dir_defaults -sub xchdir -{ +sub xchdir { my ($dir) = @_; chdir ($dir) || die "chdir($dir) failed: $!"; chomp (my $pwd = `pwd`); print "\t CHDIR $dir (now $pwd)\n"; } -sub xmkdir -{ +sub xmkdir { my (@dirs) = @_; &SYSTEM ("mkdir -p @dirs"); } +# run a shell command. +# +sub SYSTEM { + my ($job) = @_; + if ($opt_test) { + print "\t SYSTEM $job\n"; + } else { + print "\t SYSTEM $job\n" if $opt_debug; + system ($job); + } +} + + +# copy man pages from runtime to new stage directory, +# so they won't appear to be deleted. +# +sub preserve_man_pages { + my ($pkg) = @_; + + my $mandest = "$TOPDEST/texmf/doc/man/man1"; + &xmkdir ($mandest); + &SYSTEM ("$CP $Master/texmf/doc/man/man1/$pkg.* $mandest/"); +} + + # some packages need to intervene at the beginning. sub run_prehook @@ -2602,18 +2633,6 @@ sub runfonts { } -sub SYSTEM -{ - local ($job) = @_; - if ($opt_test) { - print "\t SYSTEM $job\n"; - } else { - print "\t SYSTEM $job\n" if $opt_debug; - system($job); - } -} - - sub MAKEflatten { @@ -3981,6 +4000,15 @@ sub POSTbabelbib { &SYSTEM ("cd $DEST && $MV texmf/* . && rmdir texmf"); } +sub POSTbibtex { + print "POST$package - switch to base/\n"; + &SYSTEM ("cd $DEST && $MV bibtex/bst/bibtex bibtex/bst/base"); + &SYSTEM ("cd $DEST && $MV bibtex/bib/bibtex bibtex/bib/base"); + &SYSTEM ("cd $DEST && $MV doc/bibtex/bibtex doc/bibtex/base"); + &SYSTEM ("$RM bibtex.web"); # handle separately + &preserve_man_pages ("bibtex"); +} + sub POSTcontext_games { print "POST$package - remove duplicated fonts\n"; &SYSTEM ("$RM -rf fonts"); @@ -4245,6 +4273,7 @@ sub POSTzhspacing { &SYSTEM ("$MV doc/* .; rmdir doc"); } + # Allow overrides. In particular, CTAN can change some hashes to make # packages with licenses that TL doesn't allow. diff --git a/Master/tlpkg/tlpsrc/bibtex.tlpsrc b/Master/tlpkg/tlpsrc/bibtex.tlpsrc index 34d2ca4feef..5619821a49e 100644 --- a/Master/tlpkg/tlpsrc/bibtex.tlpsrc +++ b/Master/tlpkg/tlpsrc/bibtex.tlpsrc @@ -3,5 +3,6 @@ srcpattern f ignore runpattern d texmf-dist/bibtex/bib/base runpattern d texmf-dist/bibtex/bst/base docpattern d texmf-dist/doc/bibtex/base +docpattern d texmf-dist/tex/generic/bibtex docpattern f texmf/doc/man/man1/bibtex.* binpattern f bin/${ARCH}/bibtex |