From f7191a3abc2d21dd2a71306921870243953794f3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 Jul 2012 22:06:28 +0000 Subject: sync git-svn-id: svn://tug.org/texlive/trunk@27123 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/biber/TeXLive/TLConfig.pm | 12 ++++--- Build/source/utils/biber/TeXLive/TLUtils.pm | 54 ++++++++++++++++++++++++++-- 2 files changed, 59 insertions(+), 7 deletions(-) (limited to 'Build/source/utils/biber/TeXLive') diff --git a/Build/source/utils/biber/TeXLive/TLConfig.pm b/Build/source/utils/biber/TeXLive/TLConfig.pm index ab9b5405595..bbecba1651e 100644 --- a/Build/source/utils/biber/TeXLive/TLConfig.pm +++ b/Build/source/utils/biber/TeXLive/TLConfig.pm @@ -1,4 +1,3 @@ -# $Id: TLConfig.pm 26329 2012-05-13 17:31:15Z karl $ # TeXLive::TLConfig.pm - module exporting configuration values # Copyright 2007, 2008, 2009, 2010, 2011, 2012 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -6,7 +5,7 @@ package TeXLive::TLConfig; -my $svnrev = '$Revision: 26329 $'; +my $svnrev = '$Revision: 27010 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -58,7 +57,10 @@ $ReleaseYear = 2012; # 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. -$MinRelease = $ReleaseYear - 1; +# $MinRelease = $ReleaseYear - 1; + +# users can NOT upgrade due to internal changes, force a full installation +$MinRelease = $ReleaseYear; # Meta Categories do not ship files, but only call for other packages. our @MetaCategories = qw/Collection Scheme/; @@ -166,10 +168,10 @@ our %TLPDBOptions = ( [ "p", "/usr/local/bin", "sys_bin", "Destination for symlinks for binaries" ], "sys_info" => - [ "p", "/usr/local/info", "sys_info", + [ "p", "/usr/local/share/info", "sys_info", "Destination for symlinks for info docs" ], "sys_man" => - [ "p", "/usr/local/man", "sys_man", + [ "p", "/usr/local/share/man", "sys_man", "Destination for symlinks for man pages" ], "w32_multi_user" => [ "b", 0, "multiuser", diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm index 7d3a7fcf6ec..5b9a6355623 100644 --- a/Build/source/utils/biber/TeXLive/TLUtils.pm +++ b/Build/source/utils/biber/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 26663 $'; +my $svnrev = '$Revision: 27031 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -113,9 +113,11 @@ use vars qw( $::LOGFILENAME @::LOGLINES @::debug_hook @::ddebug_hook @::dddebug_hook @::info_hook @::warn_hook @::install_packages_hook + $::latex_updated $::machinereadable $::no_execute_actions $::regenerate_all_formats + $::tex_updated $TeXLive::TLDownload::net_lib_avail ); @@ -267,7 +269,7 @@ 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/armv7l/armel/; # arm whatever + $CPU =~ s/armv\dl/armel/; # arm whatever $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 @@ -2677,11 +2679,59 @@ sub create_fmtutil { 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, undef, 0, '#', \@tlpdblines); } +sub check_for_old_updmap_cfg { + chomp( my $tmfsysconf = `kpsewhich -var-value=TEXMFSYSCONFIG` ) ; + my $oldupd = "$tmfsysconf/web2c/updmap.cfg"; + return unless -r $oldupd; # if no such file, good. + + open (OLDUPD, "<$oldupd") || die "open($oldupd) failed: $!"; + chomp( my $firstline = ); + close(OLDUPD); + # + if ($firstline =~ m/^# Generated by (install-tl|.*\/tlmgr) on/) { + # assume it was our doing, rename it. + my $nn = "$oldupd.DISABLED"; + if (-r $nn) { + my $fh; + ($fh, $nn) = File::Temp::tempfile( + "updmap.cfg.DISABLED.XXXXXX", DIR => "$tmfsysconf/web2c"); + } + print "Renaming old config file from + $oldupd +to + $nn +"; + if (rename($oldupd, $nn)) { + if (system("mktexlsr", $tmfsysconf) != 0) { + die "mktexlsr $tmfsysconf failed after updmap.cfg rename, fix fix: $!"; + } + print "No further action should be necessary.\n"; + } else { + print STDERR " +Renaming of + $oldupd +did not succeed. This config file should not be used anymore, +so please do what's necessary to eliminate it. +See the documentation for updmap. +"; + } + + } else { # first line did not match + print STDERR "Apparently + $oldupd +was created by hand. This config file should not be used anymore, +so please do what's necessary to eliminate it. +See the documentation for updmap. +"; + } +} + sub check_updmap_config_value { my ($k, $v, $f) = @_; return 0 if !defined($k); -- cgit v1.2.3