From 40540b1196d9c22b71c7452ea1f0a248ced459b0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 25 Jul 2019 22:32:37 +0000 Subject: latex-dev formats: latex-base-dev (including latex-doc-dev), latex-graphics-dev, and corresponding texmf.cnf/fmtutil.cmf updates git-svn-id: svn://tug.org/texlive/trunk@51730 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tlpkg-ctan-check | 4 +-- Master/tlpkg/libexec/ctan2tds | 39 +++++++++++++++++--- .../tlpsrc/collection-latexrecommended.tlpsrc | 5 ++- Master/tlpkg/tlpsrc/latex-base-dev.tlpsrc | 3 ++ Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc | 42 ++++++++++++++++++++++ Master/tlpkg/tlpsrc/latex-graphics-dev.tlpsrc | 5 +++ Master/tlpkg/tlpsrc/xetex.tlpsrc | 5 +++ 7 files changed, 95 insertions(+), 8 deletions(-) create mode 100644 Master/tlpkg/tlpsrc/latex-base-dev.tlpsrc create mode 100644 Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc create mode 100644 Master/tlpkg/tlpsrc/latex-graphics-dev.tlpsrc (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index bd1cf6ab29b..7d08f9ffb1b 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -386,9 +386,9 @@ my @TLP_working = qw( labbook labels labels4easylist labelschanged labyrinth ladder lambda-lists langcode langsci lapdf lastpackage lastpage - latex latex-bib-ex latex-bib2-ex latex-brochure + latex latex-base-dev latex-bib-ex latex-bib2-ex latex-brochure latex-course latex-doc-ptr latex-fonts - latex-git-log latex-graphics-companion + latex-git-log latex-graphics-companion latex-graphics-dev latex-make latex-mr latex-notes-zh-cn latex-papersize latex-referenz latex-refsheet latex-tabellen latex-tds latex-uni8 diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index e07ddeeef34..0e5e28f9c37 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -41,9 +41,10 @@ chdir "../tmp.cooked" || die "chdir(../tmp.cooked) failed: $!"; $COOKED_TOP = getcwd(); # output (cooked) directory paren chdir $RAW_DIR || die "chdir($RAW_DIR) failed: $!"; # back to raw -# the real Master and Build tree. +# the Master, Build, and CTAN trees. chomp ($Master = `cd $mydir/../.. && pwd`); chomp ($Build = `cd $Master/../Build/source && pwd`); +chomp (my $ctan_root = `tlpkginfo --ctan-root`); # @@ -653,6 +654,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'lastbib', "die 'skipping, nonfree'", 'latex-base', "die 'skipping, use latex'", 'latex-doc', "die 'skipping, use latex'", + 'latex-doc-dev', "die 'skipping, use latex-base-dev'", 'latex-essential', "die 'skipping, nonfree'", 'latex-fonts', "&MAKEflatten", 'latex-graphics', "die 'skipping, use graphics'", @@ -1470,6 +1472,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'kotex-oblivoir' => '&POSTkotex_oblivoir', 'kotex-utf' => '&POSTkotex_utf', 'l3build' => '&POST_do_man', + 'latex-base-dev' => '&POSTlatex_base_dev', 'latex2e-help-texinfo' => '&POSTlatex2e_help_texinfo', 'lhcyr' => '&POSTlhcyr', 'lilyglyphs' => '&POSTlilyglyphs', @@ -3465,13 +3468,27 @@ sub rename_with_mkdir { sub SYSTEM { my ($job) = @_; if ($opt_test) { - print "\t SYSTEM $job\n"; + print "\t SYSTEM $job # test\n"; } else { print "\t SYSTEM $job\n" if $opt_debug; system ($job); } } +# system but abort if the command fails. +# +sub xsystem { + my ($cmd) = @_; + + print "\t XSYSTEM $cmd\n"; + + unless ($opt_test) { + my $ret = system ($cmd); + $ret /= 256; + die "`$cmd' failed, status=$ret, goodbye\n" if $ret != 0; + } +} + # Return .exe or empty string, as required by PLATFORM. # sub exeext { @@ -4213,7 +4230,6 @@ sub killfiles { if ($more && @delfiles) { # get package url on CTAN my $ctan_url = '.'; - chomp (my $ctan_root = `tlpkginfo --ctan-root`); chomp (my $ctan_dir = `tlpkginfo --ctan-dir $packagedir`); if (not $?) { $ctan_dir =~ s!$ctan_root/!!; @@ -5454,7 +5470,6 @@ sub PREHOOK_concrete { print "PREHOOK_$package - instantiate symlinks from symlink\n"; # would be better done in tlpkginfo --prepare. &xchdir ("mf"); - chomp (my $ctan_root = `tlpkginfo --ctan-root`); for my $mf (glob ("*.mf")) { &SYSTEM ("$CP $ctan_root/systems/knuth/local/cm/$mf .."); } @@ -6314,8 +6329,22 @@ sub POSTlatex2html { &SYSTEM ("$MV $DEST/scripts/latex2html/styles/$package.perl $dest"); } +sub POSTlatex_base_dev { + my $tds_basename = "latex-doc-dev.tds.zip"; + print "POST$package - also include $tds_basename\n"; + # latex-base-dev and latex-doc-dev both unpack (different files) into + # the same directories. We don't want to explicitly list the + # individual files that belong to each package, so just always do + # latex-doc-dev if we're doing latex-base-dev. Since a .tds.zip is + # provided, this is easy. + my $docdev_tds_zip = "$ctan_root/install/macros/latex-dev/$tds_basename"; + &xsystem ("unzip -q -d $DEST $docdev_tds_zip"); + # + &SYSTEM ("rm -rf $DEST/makeindex"); # won't be uploaded later +} + sub POSTlatex2e_help_texinfo { - print "POST$package - remove translation subdir\n"; + print "POST$package - remove spanish translation subdir\n"; &SYSTEM ("$RM -rf spanish"); } diff --git a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc index fadbf191253..ac5f7f3569a 100644 --- a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc @@ -1,7 +1,7 @@ category Collection shortdesc LaTeX recommended packages longdesc A collection of recommended add-on packages for LaTeX which have -longdesc widespread use. +longdesc widespread use, and the release candidate formats latex-dev, etc. # depend collection-latex # @@ -32,6 +32,9 @@ depend fp depend index depend jknapltx depend koma-script +depend latex-base-dev +depend latex-bin-dev +depend latex-graphics-dev depend latexbug depend l3backend depend l3experimental diff --git a/Master/tlpkg/tlpsrc/latex-base-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-base-dev.tlpsrc new file mode 100644 index 00000000000..05358c47f96 --- /dev/null +++ b/Master/tlpkg/tlpsrc/latex-base-dev.tlpsrc @@ -0,0 +1,3 @@ +runpattern d texmf-dist/tex/latex-dev/base +srcpattern d texmf-dist/source/latex-dev/base +docpattern d texmf-dist/doc/latex-dev/base diff --git a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc new file mode 100644 index 00000000000..b80d1a5297e --- /dev/null +++ b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc @@ -0,0 +1,42 @@ +category TLCore +shortdesc LaTeX pre-release executables and formats +longdesc See the latex-base-dev package for information. + +# ensure files and engines are installed before we are run. +depend luatex +depend pdftex +depend latexconfig +depend latex-fonts +# +depend latex-base-dev +depend latex-graphics-dev +# latex-doc-dev is installed along with latex-base-dev, +# since they unpack into the same directories. + +tlpsetvar fmtcomm babel,cm,hyphen-base,latex-fonts,tex-ini-files +# +binpattern f bin/${ARCH}/latex-dev +execute AddFormat name=latex-dev engine=pdftex \ + patterns=language.dat \ + options="-translate-file=cp227.tcx *latex.ini" \ + fmttriggers=${fmtcomm},dehyph,latexconfig +# +binpattern f bin/${ARCH}/pdflatex-dev +execute AddFormat name=pdflatex-dev engine=pdftex \ + patterns=language.dat \ + options="-translate-file=cp227.tcx *pdflatex.ini" \ + fmttriggers=${fmtcomm},dehyph,latexconfig +# +binpattern f bin/${ARCH}/dvilualatex-dev +execute AddFormat name=dvilualatex-dev engine=luatex \ + patterns=language.dat,language.dat.lua \ + options="dvilualatex.ini" \ + fmttriggers=${fmtcomm},unicode-data +# +binpattern f bin/${ARCH}/lualatex-dev +execute AddFormat name=lualatex-dev engine=luatex \ + patterns=language.dat,language.dat.lua \ + options="lualatex.ini" \ + fmttriggers=${fmtcomm},unicode-data + +docpattern f texmf-dist/doc/man/man1/latex-dev.* diff --git a/Master/tlpkg/tlpsrc/latex-graphics-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-graphics-dev.tlpsrc new file mode 100644 index 00000000000..3fcb2558663 --- /dev/null +++ b/Master/tlpkg/tlpsrc/latex-graphics-dev.tlpsrc @@ -0,0 +1,5 @@ +depend graphics-cfg + +runpattern d texmf-dist/tex/latex-dev/graphics +srcpattern d texmf-dist/source/latex-dev/graphics +docpattern d texmf-dist/doc/latex-dev/graphics diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc index b6b7aaf1d4e..ecf2c9c6b0c 100644 --- a/Master/tlpkg/tlpsrc/xetex.tlpsrc +++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc @@ -9,6 +9,10 @@ execute AddFormat name=xetex engine=xetex patterns=language.def \ execute AddFormat name=xelatex engine=xetex patterns=language.dat \ options="-etex xelatex.ini" \ fmttriggers=${fmtcomm},babel,latex,latex-fonts +# +execute AddFormat name=xelatex-dev engine=xetex patterns=language.dat \ + options="-etex xelatex.ini" \ + fmttriggers=${fmtcomm},babel,latex-dev,latex-fonts # do fontconfig stuff, especially on Windows. postaction script file=tlpkg/tlpostcode/xetex.pl @@ -26,6 +30,7 @@ docpattern f texmf-dist/doc/man/man1/xetex.* runpattern d texmf-dist/fonts/misc/xetex/fontmapping/base # binpattern f bin/${ARCH}/xelatex +binpattern f bin/${ARCH}/xelatex-dev binpattern f bin/${ARCH}/xetex binpattern f bin/${ARCH}/teckit_compile -- cgit v1.2.3