diff options
author | Karl Berry <karl@freefriends.org> | 2013-04-07 18:58:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-04-07 18:58:34 +0000 |
commit | 25fe101524f8eb688fb883418111c0a216bfb0c6 (patch) | |
tree | b30c8a5bef846507b1acf07a23a4b9830c2eab21 /Master/tlpkg/libexec | |
parent | 335c72669537f06bbf2b4b6e2248fae60c4f38a9 (diff) |
first updates for TL13 pretest, and for texmf-dist having everything
git-svn-id: svn://tug.org/texlive/trunk@29725 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/libexec')
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 38 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/place | 5 |
2 files changed, 21 insertions, 22 deletions
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index fdbc43df1cb..d103a7d1113 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2654,9 +2654,9 @@ sub exeext { sub preserve_man_pages { my ($pkg) = @_; - my $mandest = "$TOPDEST/texmf/doc/man/man1"; + my $mandest = "$TOPDEST/texmf-dist/doc/man/man1"; &xmkdir ($mandest); - &SYSTEM ("$CP $Master/texmf/doc/man/man1/$pkg.* $mandest/"); + &SYSTEM ("$CP $Master/texmf-dist/doc/man/man1/$pkg.* $mandest/"); } @@ -3093,7 +3093,7 @@ sub doscripts { } -# info files. We put these in texmf/doc/info, which is where we keep +# info files. We put these in texmf-dist/doc/info, which is where we keep # the info files for the programs, too. Having an info dir in # texmf-dist also would imply lots of changes in the installer, and # there seems to be no gain. @@ -3101,7 +3101,7 @@ sub doscripts { sub doinfos { my $infopatt = $specialinfos{$package}; return unless $infopatt; - &install ("$TOPDEST/texmf/doc/info/", $infopatt); + &install ("$TOPDEST/texmf-dist/doc/info/", $infopatt); } @@ -3125,16 +3125,16 @@ sub dotexinfos { # install() uses the @filenames global, ugh. local @filenames = <*.info>; - &install ("$TOPDEST/texmf/doc/info/", '.info'); + &install ("$TOPDEST/texmf-dist/doc/info/", '.info'); } -# man pages. We put these in texmf/doc/man/man1, a la info (see above). +# man pages. We put these in texmf-dist/doc/man/man1, a la info (see above). # sub domans { my $manpatt = $specialmans{$package}; return unless $manpatt; - &install ("$TOPDEST/texmf/doc/man/man1/", $manpatt); + &install ("$TOPDEST/texmf-dist/doc/man/man1/", $manpatt); &tl_man_to_pdf (); # make pdfs for them } @@ -3144,8 +3144,8 @@ sub domans { # remove them. # sub tl_man_to_pdf { - my $Master_man = "$Master/texmf/doc/man"; - my $pkg_man = "$TOPDEST/texmf/doc/man"; + my $Master_man = "$Master/texmf-dist/doc/man"; + my $pkg_man = "$TOPDEST/texmf-dist/doc/man"; print "tl_man_to_pdf for: " . join (" ", <$pkg_man/man1/*>) . "\n"; &SYSTEM ("cd $Master_man && $CP --parents Makefile man1/Makefile $pkg_man/"); @@ -3462,9 +3462,9 @@ sub MAKEnosymlinks { # # create: tlpkg/tlpsrc/hyphen-language.tlpsrc # (must be done by hand) -# create: texmf/tex/generic/config/language.ll.dat +# create: texmf-dist/tex/generic/config/language.ll.dat # (done here, unless it already exists) -# install pattern file from ctan: texmf/tex/generic/hyphen/langhyph.tex +# install pattern file from ctan: texmf-dist/tex/generic/hyphen/langhyph.tex # (done here) # add in: tlpkg/tlpsrc/collection-langwhatever.tlpsrc # (must be done by hand) @@ -3475,11 +3475,11 @@ sub GENMAKEhyphenation { &buildfilelist; &donormal; print "\t SPECIAL $package: install $hyphfile\n"; - my $generichyphdir = "$TOPDEST/texmf/tex/generic/hyphen"; + my $generichyphdir = "$TOPDEST/texmf-dist/tex/generic/hyphen"; &SYSTEM("mkdir -p $generichyphdir"); &SYSTEM("$MV $hyphfile $generichyphdir"); - my $genericconfigdir = "$TOPDEST/texmf/tex/generic/config"; + my $genericconfigdir = "$TOPDEST/texmf-dist/tex/generic/config"; my $configfile = "$genericconfigdir/language.$langabbrev.dat"; if (! -r $configfile) { print "\t SPECIAL $package: create $configfile\n"; @@ -4044,7 +4044,7 @@ sub MAKEelhyphen { &SYSTEM('for f in GR*hyph*.tex; do mv $f `echo $f | tr A-Z a-z`; done'); print "\t SPECIAL $package: install gr*hyph.tex files\n"; - my $generichyphdir = "$TOPDEST/texmf/tex/generic/hyphen"; + my $generichyphdir = "$TOPDEST/texmf-dist/tex/generic/hyphen"; &SYSTEM("mkdir -p $generichyphdir"); &SYSTEM("$MV gr*hyph*.tex $generichyphdir"); @@ -4234,7 +4234,7 @@ sub MAKEwadalab { foreach my $tarfile (@tarfiles) { &SYSTEM ("tar xzf $tarfile && rm $tarfile"); $tarfile =~ s/\.tar\.gz$//; - &SYSTEM ("cp -r $tarfile/texmf/* $DEST"); + &SYSTEM ("cp -r $tarfile/texmf-dist/* $DEST"); &SYSTEM ("rm -r $tarfile/texmf && rmdir $tarfile"); } # @@ -4953,7 +4953,7 @@ sub POSTcontext { print "still POST$package - man pages\n"; &xchdir ("$DEST/doc/$package/scripts"); - my $mandest = "$TOPDEST/texmf/doc/man/man1"; + my $mandest = "$TOPDEST/texmf-dist/doc/man/man1"; &xmkdir ($mandest); for my $exec (@exec) { # man pages might be under mkii or mkiv, just check both. @@ -5116,7 +5116,7 @@ sub POSTdehyph_exptl { sub POSTeplain { print "POST$package - eplain.info, man\n"; - my $infodir = "$TOPDEST/texmf/doc/info/"; + my $infodir = "$TOPDEST/texmf-dist/doc/info/"; &xmkdir ($infodir); &SYSTEM ("$MV doc/eplain/doc/eplain.info $infodir/"); @@ -5149,7 +5149,7 @@ sub POSTfontools { &SYSTEM ("chmod a+x $scriptdir/*"); &SYSTEM ("rmdir bin"); # - my $mandir = "$TOPDEST/texmf/doc/man/man1"; + my $mandir = "$TOPDEST/texmf-dist/doc/man/man1"; &xmkdir ($mandir); &SYSTEM ("$MV doc/*.1 $mandir/"); &SYSTEM ("rm -rf doc"); # skip pdfs, we'll make our own @@ -5410,7 +5410,7 @@ sub POST_do_man { } # print "POST$package - mv *.1 man pages from $src_mandir\n"; - my $mydest = "$TOPDEST/texmf/doc/man/man1/"; + my $mydest = "$TOPDEST/texmf-dist/doc/man/man1/"; &xmkdir ($mydest); &xchdir ($DEST); &SYSTEM ("$MV $src_mandir/*.1 $mydest"); diff --git a/Master/tlpkg/libexec/place b/Master/tlpkg/libexec/place index d6bd479fd36..49a17a69bd0 100755 --- a/Master/tlpkg/libexec/place +++ b/Master/tlpkg/libexec/place @@ -59,7 +59,7 @@ my $M = $DEST = getcwd (); # svn Master, ordinarily where we write # &xchdir (".."); -# top-level. for historical reasons, is usually just relative to +# top-level. For historical reasons, is usually just relative to # Master, e.g., has texmf-dist. But when a package has to write to both # Master and Build (e.g., biber), it will have Master and Build subdirs. my $TOP = getcwd (); @@ -74,8 +74,7 @@ if (-d "Master") { # maybe have both Build and Master my $cooked_master = getcwd (); if (-d "texmf-dist") { $Type = "Package"; } -elsif (-d "texmf") { $Type = "TLCore"; } -else { die "$cooked_master: no top level texmf or texmf-dist"; } +else { die "$cooked_master: no top level texmf-dist"; } die "top-level README under $TOP, that can't be right" if <*/README>; |