summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/bin/universal-darwin/biberbin100463520 -> 100463696 bytes
-rwxr-xr-xMaster/bin/win32/biber.exebin29852324 -> 29852325 bytes
-rwxr-xr-xMaster/bin/x86_64-darwinlegacy/biberbin41844657 -> 41850451 bytes
-rw-r--r--Master/texmf-dist/source/bibtex/biber/README.biber-macos2
-rw-r--r--Master/texmf-dist/source/bibtex/biber/README.biber-windows2
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo7
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds37
7 files changed, 36 insertions, 12 deletions
diff --git a/Master/bin/universal-darwin/biber b/Master/bin/universal-darwin/biber
index ecb9a3cbd13..6f7271241d1 100755
--- a/Master/bin/universal-darwin/biber
+++ b/Master/bin/universal-darwin/biber
Binary files differ
diff --git a/Master/bin/win32/biber.exe b/Master/bin/win32/biber.exe
index d523d038f32..e937528704d 100755
--- a/Master/bin/win32/biber.exe
+++ b/Master/bin/win32/biber.exe
Binary files differ
diff --git a/Master/bin/x86_64-darwinlegacy/biber b/Master/bin/x86_64-darwinlegacy/biber
index 89c584dad86..e1cd93c62ed 100755
--- a/Master/bin/x86_64-darwinlegacy/biber
+++ b/Master/bin/x86_64-darwinlegacy/biber
Binary files differ
diff --git a/Master/texmf-dist/source/bibtex/biber/README.biber-macos b/Master/texmf-dist/source/bibtex/biber/README.biber-macos
new file mode 100644
index 00000000000..1defffa14ce
--- /dev/null
+++ b/Master/texmf-dist/source/bibtex/biber/README.biber-macos
@@ -0,0 +1,2 @@
+These are biber binaries for the darwin_universal platform(s).
+See https://ctan.org/pkg/biber for documentation, sources, and all else.
diff --git a/Master/texmf-dist/source/bibtex/biber/README.biber-windows b/Master/texmf-dist/source/bibtex/biber/README.biber-windows
new file mode 100644
index 00000000000..e3352d68af9
--- /dev/null
+++ b/Master/texmf-dist/source/bibtex/biber/README.biber-windows
@@ -0,0 +1,2 @@
+These are biber binaries for the MSWIN32 platform(s).
+See https://ctan.org/pkg/biber for documentation, sources, and all else.
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 438c69033da..eaf162ab0a0 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -225,7 +225,12 @@ sub find_ctan_dir {
if $me =~ /^hyphen-/ && ! $ctan_dir;
}
- if ($me eq "cm") {
+ if ($pkgname eq "biber") {
+ # For biber, the binaries are in separate packages and directories,
+ # so copy the entire directory.
+ $ctan_dir = "$CTAN/biblio/biber";
+
+ } elsif ($me eq "cm") {
# For cm, we just want the mf subdir of fonts/cm.
$ctan_dir .= "/mf";
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index ba0afb3c0fe..944f8ea4548 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -6314,13 +6314,35 @@ sub POSTbiber {
"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",
+ "x86_64-pc-solaris2.11" => "x86_64-solaris",
);
# handle the prebuilt binaries, which are zipped or tarred.
for my $archive (sort (<biber-*>)) {
+ next if $archive =~ /MSWIN64/; # only 32-bit windows
next if $archive =~ /freebsd[^7]\./; # we only want freebsd7
+ # Put the executable in the Master bin directory.
+ # biber-2.18-1-MSWIN64.zip -> MSWIN64
+ # biber-linux_x86_32.tar.gz -> linux_x86_32
+ # biber-linux_x86_64-musl.tar.gz -> linux_x86_64-musl
+ # etc.
+ # hopefully biber won't have any platform names starting with a numeral.
+ # $1 = possible version number
+ # $2 = biber platform name, with trailing -
+ # $3 = archive extension
+ $archive =~ m/^biber-([0-9.-]+-)?([a-zA-Z].*?)\.(zip|tar\..z)/;
+ my $biber_platform = $2;
+ #(my $biber_platform = $archive) =~ s/biber.*-(.*?)\.(zip|tar\..z)/$1/;
+ die "failed to get biber platform name from $archive, goodbye"
+ if ! $biber_platform;
+ print "\t got biber_platform=$biber_platform from archive=$archive\n";
+ #
+ my $tl_platform = $tl_platform{$biber_platform};
+ die "unknown biber platform $biber_platform (from $archive), goodbye"
+ if ! $tl_platform;
+ print "\t got tl_platform=$tl_platform\n";
+
my $unarchiver = &unarchiver ($archive);
&xsystem ("$unarchiver $archive");
@@ -6329,11 +6351,6 @@ sub POSTbiber {
my $biber_binary = "biber";
$biber_binary .= ".exe" if $archive =~ /MSWIN|cygwin/i;
- # 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;
-
# really need to do svn cp for this (in place, can't do it here).
my $bindir = "$TOPDEST/bin/$tl_platform";
&xsystem ("mkdir -p $bindir/");
@@ -6342,14 +6359,12 @@ sub POSTbiber {
# don't keep binary archives around in Master tree.
&xsystem ("$RM biber[-.]*");
- #
- # not meaningful info in TL.
- &xsystem ("$RM README.FreeBSD");
}
# biber binaries are distributed in a variety of ways. The idea here is
-# to specify the commands that will get from the distribution on CTAN to
-# a binary named "biber".
+# to specify the commands that will get from the archive file on CTAN to
+# a binary named "biber". Although this function is generic, and merely
+# returns the command based on the extension of ARCHIVE.
#
sub unarchiver {
my ($archive) = @_;