diff options
author | Karl Berry <karl@freefriends.org> | 2019-08-24 20:52:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-08-24 20:52:36 +0000 |
commit | 84f8a525e2b7f097efa0065802286d59857225a4 (patch) | |
tree | 910455eee71b7d22abf01533f0bb079559e6226b /Master/tlpkg | |
parent | fe171dd7fb9ebc1f289d3d2bc3925f332776e65a (diff) |
biber (24aug19)
git-svn-id: svn://tug.org/texlive/trunk@51952 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 24 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/biber.tlpsrc | 3 |
2 files changed, 14 insertions, 13 deletions
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 3eb2575d1ab..5d1fd608ddf 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -5774,11 +5774,13 @@ sub POSTbiber { "cygwin32" => "i386-cygwin", "cygwin64" => "x86_64-cygwin", "darwin_x86_64" => "x86_64-darwin", + "darwinlegacy_x86_64"=> "x86_64-darwinlegacy", "i386-freebsd" => "i386-freebsd", "i386-pc-solaris2" => "i386-solaris", "linux_armel" => "armel-linux", "linux_x86_32" => "i386-linux", "linux_x86_64" => "x86_64-linux", + "linux_x86_64-musl" => "x86_64-linuxmusl", "x86_64-pc-solaris2" => "x86_64-solaris", ); @@ -5787,13 +5789,17 @@ sub POSTbiber { next if $archive =~ /freebsd[^7]\./; # we only want freebsd7 my $unarchiver = &unarchiver ($archive); - &SYSTEM ("$unarchiver $archive"); + &xsystem ("$unarchiver $archive"); # each .tar.gz unpacks into a single file named biber, # .zip unpacks into biber.exe. my $biber_binary = "biber"; $biber_binary .= ".exe" if $archive =~ /MSWIN|cygwin/i; + # musl tarball has wrong name, hopefully just once. + my $musl = "biber-linux_x86_64-musl"; + &xsystem ("$MV $musl $biber_binary") if -r $musl; + # Put the executable in the Master bin directory. (my $biber_platform = $archive) =~ s/biber-(.*?)\..*/$1/; my $tl_platform = $tl_platform{$biber_platform}; @@ -5801,21 +5807,15 @@ sub POSTbiber { # 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/"); - &SYSTEM ("$MV $biber_binary $bindir/") == 0 || die; + &xsystem ("mkdir -p $bindir/"); + &xsystem ("$MV $biber_binary $bindir/"); } - # Mac "legacy" doesn't need its own build. - my $topbin = "$TOPDEST/bin"; - my $legacybin = "$topbin/x86_64-darwinlegacy"; - &xmkdir ($legacybin); - &SYSTEM ("$CP $topbin/x86_64-darwin/biber $legacybin/biber"); - # don't keep binary archives around in Master tree. - &SYSTEM ("$RM biber[-.]*"); - + &xsystem ("$RM biber[-.]*"); + # # not meaningful info in TL. - &SYSTEM ("$RM README.FreeBSD"); + &xsystem ("$RM README.FreeBSD"); } # biber binaries are distributed in a variety of ways. The idea here is diff --git a/Master/tlpkg/tlpsrc/biber.tlpsrc b/Master/tlpkg/tlpsrc/biber.tlpsrc index 656c48ae36a..6e97ad0cb7e 100644 --- a/Master/tlpkg/tlpsrc/biber.tlpsrc +++ b/Master/tlpkg/tlpsrc/biber.tlpsrc @@ -3,8 +3,9 @@ docpattern +!d texmf-dist/doc/latex/biblatex # Not all platforms provide this. binpattern f/!\ aarch64-linux,\ +amd64-freebsd,\ amd64-netbsd,\ armhf-linux,\ +i386-freebsd,\ i386-netbsd,\ -x86_64-linuxmusl,\ bin/${ARCH}/biber |