summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2007-11-30 11:53:14 +0000
committerNorbert Preining <preining@logic.at>2007-11-30 11:53:14 +0000
commitc710b203fa04e47c1dfebca72868d0ecea4cbb91 (patch)
tree5b22c3d1a1846d11ccc3e53c7acb1a009923a60a /Master/tlpkg
parent0a3a6c3abaafb43615003d9269707335021f3967 (diff)
work on installer, we are close (at least on unixes)
git-svn-id: svn://tug.org/texlive/trunk@5656 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm28
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm2
2 files changed, 10 insertions, 20 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 5303e7d605c..752746f3834 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -349,29 +349,14 @@ sub generate_listfiles {
}
foreach (sort keys %{$self->{'tlps'}}) {
$tlp = $self->{'tlps'}{$_};
- $self->_generate_listfile($tlp, $destdir, "all");
- if ($tlp->is_arch_dependent) {
- foreach my $a (keys %{$tlp->binfiles}) {
- $self->_generate_listfile($tlp, $destdir, $a);
- }
- }
+ $self->_generate_listfile($tlp, $destdir);
}
}
sub _generate_listfile {
- my ($self,$tlp,$destdir,$arch) = @_;
- my @files = ();
- my $listname;
- if ($arch ne "all") {
- my %foo = %{$tlp->binfiles};
- push @files, @{$foo{$arch}};
- $listname = $tlp->name . ".$arch";
- } else {
- $listname = $tlp->name;
- push @files, $tlp->runfiles;
- push @files, $tlp->docfiles;
- push @files, $tlp->srcfiles;
- }
+ my ($self,$tlp,$destdir) = @_;
+ my $listname = $tlp->name;
+ my @files = $tlp->all_files;
@files = TeXLive::TLUtils::sort_uniq(@files);
&mkpath("$destdir") if (! -d "$destdir");
my (@lop, @lot);
@@ -384,7 +369,10 @@ sub _generate_listfile {
push @lop, $d;
}
} else {
- warn "Strange: $tlp->name depends on $d, but this package does not exists!\n";
+ # speudo dependencies on $Package.ARCH can be ignored
+ if ($d !~ m/\.ARCH$/) {
+ warn "Strange: $tlp->name depends on $d, but this package does not exists!\n";
+ }
}
}
open(TMP, ">$destdir/$listname") or die "Cannot open $destdir/$listname!";
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index fd6e53eb35f..968a5219f7d 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -671,6 +671,8 @@ sub make_var_skeleton {
mkdirhier "$prefix/fonts/map/dvipdfm/updmap";
mkdirhier "$prefix/fonts/map/dvips/updmap";
mkdirhier "$prefix/fonts/map/pdftex/updmap";
+ mkdirhier "$prefix/fonts/pk";
+ mkdirhier "$prefix/fonts/tfm";
mkdirhier "$prefix/web2c";
mkdirhier "$prefix/xdvi";
mkdirhier "$prefix/tex/context/config";