summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-07-23 18:16:07 +0000
committerKarl Berry <karl@freefriends.org>2009-07-23 18:16:07 +0000
commitda11537ec4743b2bafb9bb04f388c1cc67c5f06b (patch)
tree861f1761cffb7213b668f736859b05a983b699a6 /Master/tlpkg/TeXLive
parent7ed7c61b5bc6e9a0ac628ec26b923167c273c0d4 (diff)
eradicate Documentation category
git-svn-id: svn://tug.org/texlive/trunk@14408 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm10
-rw-r--r--Master/tlpkg/TeXLive/TLMedia.pm5
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLPSRC.pm6
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm6
5 files changed, 10 insertions, 19 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index 8afef78ce5b..d7c6039c8c3 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -48,13 +48,15 @@ $ReleaseYear = 2009;
# Meta Categories do not ship files, but call only for other packages
our @MetaCategories = qw/Collection Scheme/;
our $MetaCategoriesRegexp = '(Collection|Scheme)';
+#
# Normal Categories contain actial files and do not depend on other things.
-our @NormalCategories = qw/Package TLCore Documentation ConTeXt/;
-
+our @NormalCategories = qw/Package TLCore ConTeXt/;
+#
# list of all Categories
our @Categories = (@MetaCategories, @NormalCategories);
-our $CategoriesRegexp = '(Collection|Scheme|Package|TLCore|Documentation|ConTeXt)';
+# repeat, as a regexp.
+our $CategoriesRegexp = '(Collection|Scheme|Package|TLCore|ConTeXt)';
our $DefaultCategory = "Package";
@@ -205,7 +207,7 @@ C<Collection> and <Scheme>.
=item C<@TeXLive::TLConfig::NormalCategories>
The list of normal categories, i.e., those categories whose packages do
-ship files. Currently C<TLCore>, C<Documentation>, C<Package>.
+ship files. Currently C<TLCore>, C<Package>, C<ConTeXt>.
=item C<@TeXLive::TLConfig::Categories>
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm
index bb8638a765d..d705991fcd4 100644
--- a/Master/tlpkg/TeXLive/TLMedia.pm
+++ b/Master/tlpkg/TeXLive/TLMedia.pm
@@ -141,11 +141,6 @@ sub install_package {
my $opt_src = $totlpdb->option("install_srcfiles");
my $opt_doc = $totlpdb->option("install_docfiles");
my $real_opt_doc = $opt_doc;
- if ($tlpobj->category =~ m/documentation/i) {
- # we do install documenation files for category Documentation
- # even if opt_doc is false
- $real_opt_doc = 1;
- }
my $reloc = 1 if $tlpobj->relocated;
my $container;
my @installfiles;
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 5c65d57f726..7f61215f398 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -719,7 +719,7 @@ sub _generate_listfile {
# first we add all the packages tlps that are directly included
@incpkg = @lop;
# now we select all collections, and for all collections we
- # again select all packages of type Documentation and Package
+ # again select all non-meta-packages
foreach my $c (@lot) {
my $coll = $self->get_package($c);
foreach my $d ($coll->depends) {
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index 4a099bc9c41..7894ffbfaa6 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -434,7 +434,7 @@ sub _do_normal_pattern {
# get the default patterns for all categories from an external file,
-# return hash with keys being the categories (Package, Documentation)
+# return hash with keys being the categories (Package, Collection, etc.)
# and values being refs to another hash. The subhash's keys are the
# file types (run bin doc ...) with values being refs to an array of
# patterns for that type.
@@ -722,8 +722,8 @@ basic infrastructure functionality.
identifies the category into which this package belongs. This determines
the default patterns applied. Possible categories are defined in
C<TeXLive::TLConfig>, currently C<Collection>, C<Scheme>, C<TLCore>,
-C<Documentation>, C<Package>, C<ConTeXt>. Most packages will fall into the
-C<Package> category.
+C<Package>, C<ConTeXt>. Most packages will fall into the C<Package>
+category.
=item C<catalogue>
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 3482df218d8..d69a608db28 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -1115,12 +1115,6 @@ sub install_packages {
&$h($n,$totalnr);
}
my $real_opt_doc = $opt_doc;
- # if we install a package from the Documentation class we
- # reactivate the do_doc in any case. It should apply ONLY for fonts
- # and macros!
- if ($tlpobj->category =~ m/documentation/i) {
- $real_opt_doc = 1;
- }
my $container;
my @installfiles;
push @installfiles, $tlpobj->runfiles;