summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-07 18:58:34 +0000
committerKarl Berry <karl@freefriends.org>2013-04-07 18:58:34 +0000
commit25fe101524f8eb688fb883418111c0a216bfb0c6 (patch)
treeb30c8a5bef846507b1acf07a23a4b9830c2eab21 /Master/tlpkg/TeXLive
parent335c72669537f06bbf2b4b6e2248fae60c4f38a9 (diff)
first updates for TL13 pretest, and for texmf-dist having everything
git-svn-id: svn://tug.org/texlive/trunk@29725 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
-rw-r--r--Master/tlpkg/TeXLive/TLConfFile.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm4
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm4
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm6
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm31
5 files changed, 26 insertions, 21 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfFile.pm b/Master/tlpkg/TeXLive/TLConfFile.pm
index 000d8e7aefb..6281044c4b9 100644
--- a/Master/tlpkg/TeXLive/TLConfFile.pm
+++ b/Master/tlpkg/TeXLive/TLConfFile.pm
@@ -670,7 +670,7 @@ Reparses the configuration file.
For parsing a C<texmf.cnf> file you can use
- $tmfcnf = TeXLive::TLConfFile->new(".../texmf/web2c", "[#%]", "=");
+ $tmfcnf = TeXLive::TLConfFile->new(".../texmf-dist/web2c", "[#%]", "=");
since the allowed comment characters for texmf.cnf files are # and %.
After that you can query keys:
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index 4701bde8284..d6da6a76fa9 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -1,6 +1,6 @@
# $Id$
# 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.
@@ -54,7 +54,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/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 4abb1561977..a7c613ddf88 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -279,7 +279,9 @@ sub from_file {
if ($rootpath =~ m,file://*(.*)$,) {
$rootpath = "/$1";
}
- if (-d "$rootpath/texmf/web2c") {
+ if (-d "$rootpath/texmf-dist/web2c") {
+ $media = 'local_uncompressed';
+ } elsif (-d "$rootpath/texmf/web2c") { # older
$media = 'local_uncompressed';
} elsif (-d "$rootpath/$Archive") {
$media = 'local_compressed';
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index e42f00c2020..3d8d695a82c 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -1355,12 +1355,12 @@ with C<|> characters inserted to show the indentation:
|category TLCore
|revision 4427
|docfiles size=959434
- | texmf/doc/dvips/dvips.html
+ | texmf-dist/doc/dvips/dvips.html
| ...
|runfiles size=1702468
- | texmf/dvips/base/color.pro
+ | texmf-dist/dvips/base/color.pro
| ...
- | texmf/scripts/pkfix/pkfix.pl
+ | texmf-dist/scripts/pkfix/pkfix.pl
|binfiles arch=i386-solaris size=329700
| bin/i386-solaris/afm2tfm
| bin/i386-solaris/dvips
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index d79522b9b17..8dcc0d603a5 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -1978,24 +1978,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");
@@ -2689,7 +2691,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);
}
@@ -2697,7 +2699,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);
}
@@ -2787,8 +2789,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 {
@@ -2800,7 +2802,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 {
@@ -2809,8 +2812,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 {