summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-08-22 19:00:57 +0000
committerKarl Berry <karl@freefriends.org>2009-08-22 19:00:57 +0000
commite56a6e26ff1501aaa0a0dc817840dea9383a3ce6 (patch)
tree9254b6bf36c9155c3d8b718b01965d855dbcdb49
parent074235e57ed8f8af714212d031a9014ac79e252e (diff)
doc tweaks
git-svn-id: svn://tug.org/texlive/trunk@14818 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm83
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm2
2 files changed, 34 insertions, 51 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index 37e9e7bb505..796b71175d3 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -51,7 +51,7 @@ BEGIN {
}
# the year of our release, will be used in the location of the
-# network packges, and in menu names, and probably many other places
+# network packages, and in menu names, and probably many other places
$ReleaseYear = 2009;
# Meta Categories do not ship files, but call only for other packages
@@ -76,10 +76,6 @@ our $DatabaseName = "texlive.tlpdb";
our $BlockSize = 4096;
-# the way we package things on the web
-our $DefaultContainerFormat = "xz";
-our $DefaultContainerExtension = "tar.$DefaultContainerFormat";
-
our $Archive = "archive";
our $TeXLiveServerURL = "http://mirror.ctan.org";
# from 2009 on we try to put them all into tlnet directly without any
@@ -87,26 +83,30 @@ our $TeXLiveServerURL = "http://mirror.ctan.org";
# our $TeXLiveServerPath = "systems/texlive/tlnet/$ReleaseYear";
our $TeXLiveServerPath = "systems/texlive/tlnet";
our $TeXLiveURL = "$TeXLiveServerURL/$TeXLiveServerPath";
+
+# Relocatable packages.
our $RelocTree = "texmf-dist";
our $RelocPrefix = "RELOC";
our @CriticalPackagesList = qw/texlive.infra/;
our $CriticalPackagesRegexp = '^(texlive\.infra)';
-if ($^O=~/^MSWin(32|64)$/i) {
- push(@CriticalPackagesList, "tlperl.win32");
+if ($^O =~ /^MSWin(32|64)$/i) {
+ push (@CriticalPackagesList, "tlperl.win32");
$CriticalPackagesRegexp = '^(texlive\.infra|tlperl\.win32$)';
}
-#
-# stuff formerly set in 00texlive.config
-#
+# the way we package things on the web
+our $DefaultContainerFormat = "xz";
+our $DefaultContainerExtension = "tar.$DefaultContainerFormat";
+
+# archive (not user) settings.
our %TLPDBConfigs = (
"container_split_src_files" => 1,
"container_split_doc_files" => 1,
"container_format" => $DefaultContainerFormat,
- "release" => $ReleaseYear );
+ "release" => $ReleaseYear,
+);
-#
# definition of the option strings and their value types
# possible types are:
# - u: url
@@ -118,8 +118,6 @@ our %TLPDBConfigs = (
# if b is empty end at +infty
# so "n:.." is equivalent to "n"
-# WARNING: keep these in sync!
-#
# $TLPDBOptions{"option"}->[0] --> type
# ->[1] --> default value
# ->[2] --> tlmgr name
@@ -127,58 +125,45 @@ our %TLPDBConfigs = (
our %TLPDBOptions = (
"location" =>
- [ "u", "__MASTER__",
- "location",
+ [ "u", "__MASTER__", "location",
"Default installation location" ],
"create_formats" =>
- [ "b", 1,
- "formats",
+ [ "b", 1, "formats",
"Create formats on installation" ],
"desktop_integration" =>
- [ "b", 1,
- "desktop_integration",
+ [ "b", 1, "desktop_integration",
"Create shortcuts (menu and desktop) in postinst" ],
"file_assocs" =>
- [ "n:0..2", 1,
- "fileassocs",
+ [ "n:0..2", 1, "fileassocs",
"Change file associations in postinst" ],
"post_code" =>
- [ "b", 1,
- "postcode",
+ [ "b", 1, "postcode",
"Run postinst code blobs" ],
"sys_bin" =>
- [ "p", "/usr/local/bin",
- "sys_bin",
+ [ "p", "/usr/local/bin", "sys_bin",
"Destination for symlinks for binaries" ],
"sys_man" =>
- [ "p", "/usr/local/man",
- "sys_man",
+ [ "p", "/usr/local/man", "sys_man",
"Destination for symlinks for man pages" ],
"sys_info" =>
- [ "p", "/usr/local/info",
- "sys_info",
+ [ "p", "/usr/local/info", "sys_info",
"Destination for symlinks for info docs" ],
"install_docfiles" =>
- [ "b", 1,
- "docfiles",
+ [ "b", 1, "docfiles",
"Install documentation files" ],
"install_srcfiles" =>
- [ "b", 1,
- "srcfiles",
+ [ "b", 1, "srcfiles",
"Install source files" ],
"w32_multi_user" =>
- [ "b", 1,
- "multiuser",
+ [ "b", 1, "multiuser",
"Install for shortcuts/menu items for all users (w32)" ],
"autobackup" =>
- [ "n:-1..", 0,
- "autobackup",
+ [ "n:-1..", 0, "autobackup",
"Number of backups to keep" ],
"backupdir" =>
- [ "p", "",
- "backupdir",
+ [ "p", "", "backupdir",
"Directory for backups" ],
- );
+);
our %TLPDBSettings = (
@@ -253,26 +238,24 @@ These values specify where to find packages.
=item C<$TeXLive::TLConfig::TeXLiveServerURL>
=item C<$TeXLive::TLConfig::TeXLiveServerPath>
-C<TeXLiveURL> is concatencated from these values, with a string between.
+C<TeXLiveURL> is concatenated from these values, with a string between.
The defaults are respectively, C<http://mirror.ctan.org> and
-C<systems/texlive/tlnet/>I<rel>, where I<rel> specifies the TeX Live
-release version, such as C<tldev> or C<2008>.
+C<systems/texlive/tlnet/>.
=item C<@TeXLive::TLConfig::CriticalPackagesList>
=item C<@TeXLive::TLConfig::CriticalPackagesRegexp>
-A list of all those packages which we do not update regularly
-since they are too central, currently only texlive.infra (and tlperl.win32
-for Windows).
+A list of all those packages which we do not update regularly since they
+are too central, currently texlive.infra and (for Windows) tlperl.win32.
=item C<$TeXLive::TLConfig::RelocTree>
-the texmf-tree name that can be relocated, defaults to "texmf-dist"
+The texmf-tree name that can be relocated, defaults to C<texmf-dist>.
=item C<$TeXLive::TLConfig::RelocPrefix>
-The string that replaces the RelocTree in the tlpdb if a package is
-reloaced, defaults to "RELOC".
+The string that replaces the C<RelocTree> in the tlpdb if a package is
+relocated, defaults to C<RELOC>".
=back
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index b069bae9d3c..c2780c8c647 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -1110,7 +1110,7 @@ sub setting_pkg {
if (defined $ret) {
@ret = split(" ", $ret);
} else {
- tlwarn "TLPDB::setting: no $key, returning empty list ...\n";
+ tlwarn "TLPDB::setting_pkg: no $key, returning empty list ...\n";
@ret = ();
}
return @ret;