summaryrefslogtreecommitdiff
path: root/Build/source/utils/biber
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-08 18:20:13 +0000
committerKarl Berry <karl@freefriends.org>2013-04-08 18:20:13 +0000
commit108d223ba0c9b55b8e5cf8d22eda98cd0eee08de (patch)
treebeb5840d4ddaf33039694eb61d6edec546aff2be /Build/source/utils/biber
parentee55a9d2ec992f8487ee88e0d94587add07cf284 (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@29748 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/biber')
-rw-r--r--Build/source/utils/biber/TeXLive/TLConfig.pm6
-rw-r--r--Build/source/utils/biber/TeXLive/TLUtils.pm73
2 files changed, 48 insertions, 31 deletions
diff --git a/Build/source/utils/biber/TeXLive/TLConfig.pm b/Build/source/utils/biber/TeXLive/TLConfig.pm
index bbecba1651e..6eb7755df44 100644
--- a/Build/source/utils/biber/TeXLive/TLConfig.pm
+++ b/Build/source/utils/biber/TeXLive/TLConfig.pm
@@ -1,11 +1,11 @@
# TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007, 2008, 2009, 2010, 2011, 2012 Norbert Preining
+# Copyright 2007-2013 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 27010 $';
+my $svnrev = '$Revision: 29725 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -53,7 +53,7 @@ BEGIN {
# the year of our release, will be used in the location of the
# network packages, and in menu names, and other places.
-$ReleaseYear = 2012;
+$ReleaseYear = 2013;
# users can upgrade from this year to the current year; maybe a spread
# of more than one year will be useful at some point, but not now.
diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm
index a2f9f7fd536..f4faeef0d56 100644
--- a/Build/source/utils/biber/TeXLive/TLUtils.pm
+++ b/Build/source/utils/biber/TeXLive/TLUtils.pm
@@ -1,11 +1,11 @@
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
-# Copyright 2007-2012 Norbert Preining, Reinhard Kotucha
+# Copyright 2007-2013 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 29199 $';
+my $svnrev = '$Revision: 29725 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -269,10 +269,15 @@ sub platform_name {
my $OS; # O/S type as reported by config.guess.
($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/;
$CPU =~ s/^alpha(.*)/alpha/; # alphaev whatever
- $CPU =~ s/armv\dl/armel/; # arm whatever
+ $CPU =~ s/mips64el/mipsel/; # don't distinguish mips64 and 32 el
$CPU =~ s/powerpc64/powerpc/; # don't distinguish ppc64
$CPU =~ s/sparc64/sparc/; # don't distinguish sparc64
- $CPU =~ s/mips64el/mipsel/; # don't distinguish mips64 and 32 el
+
+ # armv6l-unknown-linux-gnueabihf -> armhf-linux (RPi)
+ # armv7l-unknown-linux-gnueabi -> armel-linux (Android)
+ if ($CPU =~ /^arm/) {
+ $CPU = $guessed_platform =~ /hf$/ ? "armhf" : "armel";
+ }
my @OSs = qw(aix cygwin darwin freebsd hpux irix
kfreebsd linux netbsd openbsd solaris);
@@ -285,10 +290,18 @@ sub platform_name {
}
if ($OS eq "darwin") {
- # We never want to guess x86_64-darwin even if config.guess
- # does, because Leopard can be 64-bit but our x86_64-darwin
- # binaries will only run on Snow Leopard.
- $CPU = "universal";
+ # We want to guess x86_64-darwin on new-enough systems.
+ # Most robust approach is to check sw_vers (os version)
+ # and sysctl (processor hardware).
+ chomp (my $sw_vers = `sw_vers -productVersion`);
+ my ($os_major,$os_minor) = split (/\./, $sw_vers);
+ #
+ chomp (my $sysctl = `sysctl hw.cpu64bit_capable`);
+ my (undef,$hw_64_bit) = split (" ", $sysctl);
+ #
+ $CPU = ($os_major >= 10 && $os_minor >= 6 && $hw_64_bit >= 1)
+ ? "x86_64" : "universal";
+
} elsif ($CPU =~ /^i.86$/) {
$CPU = "i386"; # 586, 686, whatever
}
@@ -312,10 +325,10 @@ sub platform_desc {
my %platform_name = (
'alpha-linux' => 'DEC Alpha with GNU/Linux',
- 'alphaev5-osf' => 'DEC Alphaev5 OSF',
'amd64-freebsd' => 'x86_64 with FreeBSD',
'amd64-kfreebsd' => 'x86_64 with GNU/kFreeBSD',
'armel-linux' => 'ARM with GNU/Linux',
+ 'armhf-linux' => 'ARMhf with GNU/Linux',
'hppa-hpux' => 'HP-UX',
'i386-cygwin' => 'Intel x86 with Cygwin',
'i386-darwin' => 'Intel x86 with MacOSX/Darwin',
@@ -1964,24 +1977,26 @@ sub add_remove_symlinks {
return if win32();
if ($mode eq "add") {
$errors++ unless add_link_dir_dir($plat_bindir, $sys_bin);
- if (-d "$Master/texmf/doc/info") {
- $errors++ unless add_link_dir_dir("$Master/texmf/doc/info", $sys_info);
+ if (-d "$Master/texmf-dist/doc/info") {
+ $errors++
+ unless add_link_dir_dir("$Master/texmf-dist/doc/info", $sys_info);
}
} elsif ($mode eq "remove") {
$errors++ unless remove_link_dir_dir($plat_bindir, $sys_bin);
- if (-d "$Master/texmf/doc/info") {
- $errors++ unless remove_link_dir_dir("$Master/texmf/doc/info", $sys_info);
+ if (-d "$Master/texmf-dist/doc/info") {
+ $errors++
+ unless remove_link_dir_dir("$Master/texmf-dist/doc/info", $sys_info);
}
} else {
die ("should not happen, unknown mode $mode in add_remove_symlinks!");
}
mkdirhier $sys_man if ($mode eq "add");
- if (-w $sys_man && -d "$Master/texmf/doc/man") {
+ if (-w $sys_man && -d "$Master/texmf-dist/doc/man") {
debug("$mode symlinks for man pages in $sys_man\n");
- my $foo = `(cd "$Master/texmf/doc/man" && echo *)`;
+ my $foo = `(cd "$Master/texmf-dist/doc/man" && echo *)`;
chomp (my @mans = split (' ', $foo));
foreach my $m (@mans) {
- my $mandir = "$Master/texmf/doc/man/$m";
+ my $mandir = "$Master/texmf-dist/doc/man/$m";
next unless -d $mandir;
if ($mode eq "add") {
$errors++ unless add_link_dir_dir($mandir, "$sys_man/$m");
@@ -2479,13 +2494,14 @@ sub download_file {
$url = "$TeXLiveURL/$relpath";
}
if (defined($::tldownload_server) && $::tldownload_server->enabled) {
- debug("persistent connection set up, trying to get file.\n");
- if (($ret = $::tldownload_server->get_file($url, $dest))) {
- debug("downloading file via permanent connection succeeded\n");
+ debug("persistent connection set up, trying to get $url (for $dest)\n");
+ $ret = $::tldownload_server->get_file($url, $dest);
+ if ($ret) {
+ debug("downloading file via persistent connection succeeded\n");
return $ret;
} else {
- tlwarn("permanent server connection set up, but downloading did not succeed!");
- tlwarn("Retrying with wget.\n");
+ tlwarn("tlmgr: persistent connection ok, but download failed: $url\n");
+ tlwarn("tlmgr: retrying with wget.\n");
}
} else {
if (!defined($::tldownload_server)) {
@@ -2674,7 +2690,7 @@ sub create_fmtutil {
my ($tlpdb,$dest,$localconf) = @_;
my @lines = $tlpdb->fmtutil_cnf_lines(
get_disabled_local_configs($localconf, '#'));
- _create_config_files($tlpdb, "texmf/web2c/fmtutil-hdr.cnf", $dest,
+ _create_config_files($tlpdb, "texmf-dist/web2c/fmtutil-hdr.cnf", $dest,
$localconf, 0, '#', \@lines);
}
@@ -2682,7 +2698,7 @@ sub create_updmap {
my ($tlpdb,$dest) = @_;
check_for_old_updmap_cfg();
my @tlpdblines = $tlpdb->updmap_cfg_lines();
- _create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest,
+ _create_config_files($tlpdb, "texmf-dist/web2c/updmap-hdr.cfg", $dest,
undef, 0, '#', \@tlpdblines);
}
@@ -2772,8 +2788,8 @@ sub create_language_dat {
# no checking for disabled stuff for language.dat and .def
my @lines = $tlpdb->language_dat_lines(
get_disabled_local_configs($localconf, '%'));
- _create_config_files($tlpdb, "texmf/tex/generic/config/language.us", $dest,
- $localconf, 0, '%', \@lines);
+ _create_config_files($tlpdb, "texmf-dist/tex/generic/config/language.us",
+ $dest, $localconf, 0, '%', \@lines);
}
sub create_language_def {
@@ -2785,7 +2801,8 @@ sub create_language_def {
push @postlines, "%%% No changes may be made beyond this point.\n";
push @postlines, "\n";
push @postlines, "\\uselanguage {USenglish} %%% This MUST be the last line of the file.\n";
- _create_config_files ($tlpdb, "texmf/tex/generic/config/language.us.def", $dest, $localconf, 1, '%', \@lines, @postlines);
+ _create_config_files ($tlpdb,"texmf-dist/tex/generic/config/language.us.def",
+ $dest, $localconf, 1, '%', \@lines, @postlines);
}
sub create_language_lua {
@@ -2794,8 +2811,8 @@ sub create_language_lua {
my @lines = $tlpdb->language_lua_lines(
get_disabled_local_configs($localconf, '--'));
my @postlines = ("}\n");
- _create_config_files ($tlpdb, "texmf/tex/generic/config/language.us.lua",
- $dest, $localconf, 0, '--', \@lines, @postlines);
+ _create_config_files ($tlpdb,"texmf-dist/tex/generic/config/language.us.lua",
+ $dest, $localconf, 0, '--', \@lines, @postlines);
}
sub _create_config_files {