texlive[63832] Master: biber binaries (6jul22)

[commits+karl at tug.org]

Revision: 63832
          http://tug.org/svn/texlive?view=revision&revision=63832
Author:   karl
Date:     2022-07-07 22:50:48 +0200 (Thu, 07 Jul 2022)
Log Message:
-----------
biber binaries (6jul22)

Modified Paths:
--------------
    trunk/Master/bin/universal-darwin/biber
    trunk/Master/bin/win32/biber.exe
    trunk/Master/bin/x86_64-darwinlegacy/biber
    trunk/Master/tlpkg/bin/tlpkginfo
    trunk/Master/tlpkg/libexec/ctan2tds

Added Paths:
-----------
    trunk/Master/texmf-dist/source/bibtex/biber/README.biber-macos
    trunk/Master/texmf-dist/source/bibtex/biber/README.biber-windows

Modified: trunk/Master/bin/universal-darwin/biber
===================================================================
(Binary files differ)

Modified: trunk/Master/bin/win32/biber.exe
===================================================================
(Binary files differ)

Modified: trunk/Master/bin/x86_64-darwinlegacy/biber
===================================================================
(Binary files differ)

Added: trunk/Master/texmf-dist/source/bibtex/biber/README.biber-macos
===================================================================
--- trunk/Master/texmf-dist/source/bibtex/biber/README.biber-macos	                        (rev 0)
+++ trunk/Master/texmf-dist/source/bibtex/biber/README.biber-macos	2022-07-07 20:50:48 UTC (rev 63832)
@@ -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.


Property changes on: trunk/Master/texmf-dist/source/bibtex/biber/README.biber-macos
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/source/bibtex/biber/README.biber-windows
===================================================================
--- trunk/Master/texmf-dist/source/bibtex/biber/README.biber-windows	                        (rev 0)
+++ trunk/Master/texmf-dist/source/bibtex/biber/README.biber-windows	2022-07-07 20:50:48 UTC (rev 63832)
@@ -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.


Property changes on: trunk/Master/texmf-dist/source/bibtex/biber/README.biber-windows
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/tlpkg/bin/tlpkginfo
===================================================================
--- trunk/Master/tlpkg/bin/tlpkginfo	2022-07-07 19:55:41 UTC (rev 63831)
+++ trunk/Master/tlpkg/bin/tlpkginfo	2022-07-07 20:50:48 UTC (rev 63832)
@@ -225,7 +225,12 @@
       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";
 

Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds	2022-07-07 19:55:41 UTC (rev 63831)
+++ trunk/Master/tlpkg/libexec/ctan2tds	2022-07-07 20:50:48 UTC (rev 63832)
@@ -6314,13 +6314,35 @@
     "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 @@
     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 @@
 
   # 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) = @_;