summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-08-23 20:39:17 +0000
committerKarl Berry <karl@freefriends.org>2022-08-23 20:39:17 +0000
commita85ddf9ec9fa6da691637667cc8a9dff2cc6b5ae (patch)
tree7ce2025dcd5678de72823b5746f75bc715e5c78c /Master/tlpkg
parent773e4f73523a344ef29afc18e834bdfcaa145201 (diff)
biber-ms (23aug22)
git-svn-id: svn://tug.org/texlive/trunk@64180 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo6
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds39
-rw-r--r--Master/tlpkg/tlpsrc/biber-ms.tlpsrc16
-rw-r--r--Master/tlpkg/tlpsrc/biblatex-ms.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc1
6 files changed, 45 insertions, 24 deletions
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 8014494bedf..79eeae72a9a 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -104,7 +104,7 @@ my @TLP_working = qw(
beebe begingreek begriff beilstein belleek bengali
bera berenisadf besjournals bestpapers betababel beton beuron
bewerbung bez123 bezierplot bfh-ci bgteubner bguq bhcexam
- bib-fr bib2gls bibarts biber bibhtml
+ bib-fr bib2gls bibarts biber biber-ms bibhtml
biblatex biblatex-abnt biblatex-ajc2020unofficial
biblatex-anonymous biblatex-apa biblatex-apa6
biblatex-archaeology biblatex-arthistory-bonn
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index eaf162ab0a0..80929a1c5ee 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -225,10 +225,10 @@ sub find_ctan_dir {
if $me =~ /^hyphen-/ && ! $ctan_dir;
}
- if ($pkgname eq "biber") {
- # For biber, the binaries are in separate packages and directories,
+ if ($pkgname =~ /^biber(|-ms)$/) {
+ # For biber and biber-ms, the binaries are in separate packages and directories,
# so copy the entire directory.
- $ctan_dir = "$CTAN/biblio/biber";
+ $ctan_dir = "$CTAN/biblio/$pkgname";
} elsif ($me eq "cm") {
# For cm, we just want the mf subdir of fonts/cm.
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index f159b276fd2..7da320aef9f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -203,6 +203,14 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'bib2ml', "die 'skipping, no self-locate?, etc.'",
'bib2xhtml', "die 'skipping, requires PDF::API2'",
'biber', "&MAKEflatten",
+ 'biber-cygwin', "die 'skipping, use biber'",
+ 'biber-linux', "die 'skipping, use biber'",
+ 'biber-macos', "die 'skipping, use biber'",
+ 'biber-windows', "die 'skipping, use biber'",
+ 'biber-ms', "&MAKEflatten",
+ 'biber-ms-linux', "die 'skipping, use biber-ms'",
+ 'biber-ms-macos', "die 'skipping, use biber-ms'",
+ 'biber-ms-windows', "die 'skipping, use biber-ms'",
'bibextract', "die 'skipping, hardwires nawk cmd name'",
'bibfilex', "die 'skipping, compiled'",
'biblatex-abnt', "&MAKEflatten",
@@ -1636,8 +1644,9 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'barracuda' => '&POSTbarracuda',
'bib2gls' => '&POSTbib2gls',
'biber' => '&POSTbiber',
+ 'biber-ms' => '&POSTbiber',
'biblatex' => '&POSTbiblatex',
- 'biblatex-ms' => '&POSTbiblatex_ms',
+ 'biblatex-ms' => '&POSTbiblatex',
'biblatex-software' => '&POST_rmsymlink',
'bibtex' => '&POSTbibtex',
'bibtexperllibs' => '&POSTbibtexperllibs',
@@ -2833,6 +2842,7 @@ $standardsource = '(\.(bat|c|drv|[dem]tx|fea|fdd|ins|mk|sfd)'
'bbold', $standardsource . '|fonttabl.sty',
'bib2gls', 'src/',
'biber', '.', # everything, lots done in post
+ 'biber-ms', '.', # same as biber
'bibtexperllibs', '.', # everything
'bigints', 'NULL',
'blacklettert1', '\.dtx|\.ins|\.pl|Makefile',
@@ -6299,13 +6309,14 @@ sub POSTbib2gls {
&SYSTEM ("$MV src $source_dir");
}
+# biber and biber-ms are both handled here.
sub POSTbiber {
print "POST$package - unpack and install binaries\n";
# we've started with everything under source/.
- &xchdir ("$DEST/source/bibtex/biber");
+ &xchdir ("$DEST/source/bibtex/$package");
# move doc pdf.
- &mv_with_mkdir ("biber.pdf", $DOCDIR);
+ &mv_with_mkdir ("$package.pdf", $DOCDIR);
# we don't do 64-bit Windows, etc.
&SYSTEM ("$RM biber-MSWIN64* biber-darwin_arm*");
@@ -6331,7 +6342,7 @@ sub POSTbiber {
);
# handle the prebuilt binaries, which are zipped or tarred.
- for my $archive (sort (<biber-*>)) {
+ for my $archive (sort (<$package-*>)) {
next if $archive =~ /MSWIN64/; # only 32-bit windows
next if $archive =~ /freebsd[^7]\./; # we only want freebsd7
@@ -6344,9 +6355,9 @@ sub POSTbiber {
# $1 = possible version number
# $2 = biber platform name, with trailing -
# $3 = archive extension
- $archive =~ m/^biber-([0-9.-]+-)?([a-zA-Z].*?)\.(zip|tar\..z)/;
+ $archive =~ m/^$package-([0-9.-]+-)?([a-zA-Z].*?)\.(zip|tar\..z)/;
my $biber_platform = $2;
- #(my $biber_platform = $archive) =~ s/biber.*-(.*?)\.(zip|tar\..z)/$1/;
+ #(my $biber_platform = $archive) =~ s/$package.*-(.*?)\.(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";
@@ -6361,7 +6372,7 @@ sub POSTbiber {
# each .tar.gz unpacks into a single file named biber,
# .zip unpacks into biber.exe.
- my $biber_binary = "biber";
+ my $biber_binary = $package;
$biber_binary .= ".exe" if $archive =~ /MSWIN|cygwin/i;
# really need to do svn cp for this (in place, can't do it here).
@@ -6404,19 +6415,7 @@ sub POSTbiblatex {
&SYSTEM ("$MV bibtex/bib $dest_bib/$package");
&SYSTEM ("$MV bibtex/bst $dest_bst/$package");
- &SYSTEM ("$MV bibtex/csf $dest_csf/$package");
- &SYSTEM ("$MV latex $DEST/tex/latex/$package");
- &SYSTEM ("$MV doc/* .");
-}
-
-sub POSTbiblatex_ms {
- print "POST$package - move whole directories around, doc up a level\n";
-
- my $dest_bst = "$DEST/bibtex/bst";
- my $dest_latex = "$DEST/tex/latex";
- &xmkdir ($dest_bst, $dest_latex);
-
- &SYSTEM ("$MV bibtex/bst $dest_bst/$package");
+ &SYSTEM ("test -d bibtex/csf && $MV bibtex/csf $dest_csf/$package");
&SYSTEM ("$MV latex $DEST/tex/latex/$package");
&SYSTEM ("$MV doc/* .");
}
diff --git a/Master/tlpkg/tlpsrc/biber-ms.tlpsrc b/Master/tlpkg/tlpsrc/biber-ms.tlpsrc
new file mode 100644
index 00000000000..86bbd25f4d9
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/biber-ms.tlpsrc
@@ -0,0 +1,16 @@
+docpattern +!d texmf-dist/doc/latex/biblatex-ms
+
+# Not all platforms provide this.
+binpattern f/!\
+aarch64-linux,\
+amd64-freebsd,\
+amd64-netbsd,\
+armhf-linux,\
+i386-cygwin,\
+i386-freebsd,\
+i386-netbsd,\
+i386-solaris,\
+x86_64-cywin,\
+x86_64-linuxmusl,\
+x86_64-solaris,\
+ bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/biblatex-ms.tlpsrc b/Master/tlpkg/tlpsrc/biblatex-ms.tlpsrc
index e69de29bb2d..afb3dc72509 100644
--- a/Master/tlpkg/tlpsrc/biblatex-ms.tlpsrc
+++ b/Master/tlpkg/tlpsrc/biblatex-ms.tlpsrc
@@ -0,0 +1,5 @@
+depend pdftexcmds
+depend etoolbox
+depend kvoptions
+depend logreq
+depend url
diff --git a/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
index 35aafc840eb..dfbc7a8c5c7 100644
--- a/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
@@ -21,6 +21,7 @@ depend bestpapers
depend bib2gls
depend bibarts
depend biber
+depend biber-ms
depend bibexport
depend bibhtml
depend biblatex