From a49534a127d5e9d62c7006dac819093fa231f2e0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 6 May 2014 15:12:46 +0000 Subject: biber no longer in source tree git-svn-id: svn://tug.org/texlive/trunk@33883 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tl-update-bindir | 18 +++++++----------- Master/tlpkg/dev/srclist.txt | 2 +- Master/tlpkg/doc/packages.txt | 3 ++- Master/tlpkg/doc/releng.txt | 25 +++++++++++++++++-------- Master/tlpkg/libexec/ctan2tds | 12 +++--------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir index 3c6161a332c..10183eb8444 100755 --- a/Master/tlpkg/bin/tl-update-bindir +++ b/Master/tlpkg/bin/tl-update-bindir @@ -136,7 +136,7 @@ for tlname in $tlnames; do download_loc=$tmpdir/tl.$tlname.tar.xz default_bin_loc=$download_loc grab="$download -O $download_loc" - $grab ftp://ftp.cea.fr/incoming/y2k01/braslau/i386-unknown-kfreebsd10.0-gnu.tar.xz;; + $grab ftp://ftp.cea.fr/incoming/y2k01/braslau/i386-unknown-kfreebsd9.0-gnu.tar.xz;; i386-linux) default_bin_loc=/home/texlive/karl/Build/source/inst/bin/i686-pc-linux-gnu;; i386-netbsd) @@ -238,10 +238,12 @@ for tlname in $tlnames; do ourdel=$tmpdir/2del ouradd=$tmpdir/2add - # looking for deletions, but don't delete asy or xasy, or cache+conf - # for w32. + # looking for deletions, but don't delete (x)asy, biber, or xindy. comm -23 $tmpdir/now $tmpdir/new \ - | egrep -v '^(x?asy(\.exe)?|freeglut\.dll)$' >$ourdel + | egrep -v '^(x?asy(\.exe)?|freeglut\.dll)$' \ + | egrep -v '^biber$' \ + | egrep -v 'xindy' \ + >$ourdel # intentionally anything matching xindy comm -13 $tmpdir/now $tmpdir/new >$ouradd # looking for additions # get symlink list. @@ -306,7 +308,7 @@ for tlname in $tlnames; do svn propdel svn:executable $badlinks fi - # revert xindy.mem unless xindy.run changes. + # revert xindy.mem (always changes) unless xindy.run changes. if svn status xindy.run | grep '^M' >/dev/null \ || svn status xindy-lisp.exe | grep '^M' >/dev/null; then : @@ -315,12 +317,6 @@ for tlname in $tlnames; do svn revert xindy*.mem fi - # and if xindy was deleted, revert it. - if svn status xindy.run | grep '^D' >/dev/null; then - $msg "reverting all xindy..." - svn revert tex2xindy texindy xindy xindy.mem xindy.run - fi - # check for broken symlinks. for sl in `cat $tmpdir/new.symlink`; do test ! -r "$sl" && echo "$0: broken new symlink $sl" >&2 diff --git a/Master/tlpkg/dev/srclist.txt b/Master/tlpkg/dev/srclist.txt index 843219082fe..d39b57010d6 100644 --- a/Master/tlpkg/dev/srclist.txt +++ b/Master/tlpkg/dev/srclist.txt @@ -17,7 +17,7 @@ # dev changes Master/texmf-dist/web2c/texmf.cnf Build/source/texk/kpathsea/ Master/texmf-dist/web2c/fmtutil.cnf Build/source/texk/texlive/tl_scripts/fmtutil.cnf -# Platform detection for biber and tests: +# Platform detection for tests: Master/tlpkg/TeXLive/TLUtils.pm Build/source/texk/tests/TeXLive/ Master/tlpkg/TeXLive/TLConfig.pm Build/source/texk/tests/TeXLive/ diff --git a/Master/tlpkg/doc/packages.txt b/Master/tlpkg/doc/packages.txt index 4e108ed8d48..5aaef8153e6 100644 --- a/Master/tlpkg/doc/packages.txt +++ b/Master/tlpkg/doc/packages.txt @@ -11,7 +11,8 @@ To add a new platform: in the `platform' routine in TeXLive/TLUtils.pm. - add the abbreviation to the full-name mapping in `platform_desc'. - create directory in Master/bin and add at least one file. -- if windows-ish (.exe extension), update regexps in TLTREE.pm and tlmgr.pl. +- if windows-ish (.exe extension), + update regexps in TLTREE.pm and tlmgr.pl and ctan2tds. - add xz, xzdec, maybe wget binaries in Master/tlpkg/installerl update 00texlive.installer.tlpsrc as needed. - update .tlpsrc files if necessary: most likely asymptote, biber, xindy. diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt index 0412a4e50e7..4102c0312e3 100644 --- a/Master/tlpkg/doc/releng.txt +++ b/Master/tlpkg/doc/releng.txt @@ -8,7 +8,8 @@ Check if pretest mirrors need renewing, talk to mirror admins if so: /home/httpd/html/texlive/mirmon/tlpretest-mirrors.txt Coordinate schedule with: - engine people, LaTeX people, GUST font people + maintainers of: engines, LaTeX, GUST font, asymptote, context, texworks + other parts of collection: protext, ctan, mactex. general lists To stop updating of certain packages before the general freeze: @@ -72,10 +73,10 @@ N. Later, when closer to release: Really test during pretest (really!): .fmt's sharable across endian-different platforms (including luatex). - interactive mf '\drawdot (50,50); showit;' + interactive mf '\drawdot (50,50); showit;' % and from * prompt -When finalizing sources (best before tlnet freeze for pretest) - version numbers and years and copyright years in: +When finalizing sources (any time in the new year, can be early), +- update version numbers and years and copyright years in: top level version.ac dvipdfmx: configure.ac ChangeLog dvips: configure.ac ChangeLog NEWS dvips.c dvips.h afm2tfm.c dvips.texi @@ -85,13 +86,21 @@ When finalizing sources (best before tlnet freeze for pretest) then reautoconf (6min), rebuild. install-tl, tlmgr.pl (copyright only) run ~karl/bin/tlversions to see+compare engine/etc. versions +- if new kpathsea file types (kpsewhich --help), update kpathsea.texi. +- ask tldistro for patches. After tlnet freeze: in Master/tlpkg, update bundled Windows programs as needed: dviout texworks tlgs tlperl tlpsv + update readme-html.dir/readme.en.html + run tlpkg/bin/htmltext to create readme-txt.dir/README.EN. + update texcollection DVD text: + http://tug.org/texcollection/ + http://puszcza.gnu.org.ua/projects/texcollection/ When binary set and docs are stable enough: peb + laurens + khaled: no commits. + Update texlive-en.tex (+ .pdf, .html), tell tldoc to translate. Check for Build-maintained updates to config files, etc. (and might have to merge back if Master was mistakenly updated): diff -r Build/source/inst/texmf-dist Master/texmf-dist @@ -100,14 +109,14 @@ When binary set and docs are stable enough: Texinfo manuals from Build to Master: tl-update-txi Man pages from Build to Master: - tl-update-man # and run make in texmf/doc/man + tl-update-man # then run make in texmf/doc/man # and check /tmp/so.rules against man1/Makefile -Just before final build: - option adjustrepo in tl-update-tlnet, else install-tl-unx won't go to ctan? +Just before the final pretest (i.e., to-be-published) build: + option adjustrepo 1 in tl-update-tlnet, else install-tl-unx won't go to ctan put date into NEWS and ChangeLog files. update Master/source: - w32tex-src texlive*source mactexdoc install-tl-unx.tar.gz + xz w32tex-src texlive*source mactexdoc install-tl-unx.tar.gz After final build, to do total freeze: in cron.tl, set *_frozen=true. diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 8343402fc02..b268e3dda53 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -4970,7 +4970,7 @@ sub POSTbiber { &xchdir ("$DEST/source/bibtex/biber"); # move doc pdf. - &SYSTEM ("$MV biber.pdf $DOCDIR/"); + &mv_with_mkdir ("biber.pdf", $DOCDIR); # biber uses different platform names. my %tl_platform = ( @@ -4999,17 +4999,11 @@ sub POSTbiber { my $biber_binary = "biber"; $biber_binary .= ".exe" if $archive =~ /MSWIN|cygwin/i; - # Put the executable in both the - # (a) Master bin directory and - # (b) Build source directory. + # Put the executable in the # Master bin directory. (my $biber_platform = $archive) =~ s/biber-(.*?)\..*/$1/; my $tl_platform = $tl_platform{$biber_platform}; die "unknown biber platform $biber_platform, goodbye" if ! $tl_platform; - my $builddir = "$BUILDDEST/utils/biber/bin/$tl_platform"; - &SYSTEM ("mkdir -p $builddir/"); - &SYSTEM ("$CP $biber_binary $builddir/$biber_binary"); - # # really need to do svn cp for this (in place, can't do it here). my $bindir = "$TOPDEST/bin/$tl_platform"; &SYSTEM ("mkdir -p $bindir/"); @@ -5092,7 +5086,7 @@ sub POSTcontext { &SYSTEM ("$RM scripts/context/stubs/mswin/mptopdf.exe"); print "still POST$package - user-level executables\n"; - # similar to biber, executables go in both the Master bin dir and the + # executables go in both the Master bin dir and the # Build linked_scripts dir. The executables are cherry-picked from # ConTeXt's stubs directory. my $w32_bindir = "$TOPDEST/bin/win32"; -- cgit v1.2.3