summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLPOBJ.pm
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPOBJ.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm18
1 files changed, 10 insertions, 8 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index 2de48ace3b5..dcd22ff99eb 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -353,7 +353,7 @@ sub writeout_simple {
sub make_zip {
- my ($self,$tltree,$destdir,$zipname) = @_;
+ my ($self,$instroot,$destdir,$zipname) = @_;
my $zipn;
if (not(defined($zipname))) {
$zipname = $self->name . ".zip";
@@ -361,9 +361,9 @@ sub make_zip {
if (not(defined($destdir))) {
$destdir = TeXLive::TLPOBJ->zipdir;
}
- die("Undefined tltree argument!") if (not(defined($tltree)));
+ die("Undefined instroot argument!") if (not(defined($instroot)));
# first build the arch independent part
- $self->_make_zip($tltree,$destdir,$zipname,"all");
+ $self->_make_zip($instroot,$destdir,$zipname,"all");
# now the $pkg.$arch.zip
if ($self->is_arch_dependent) {
foreach my $t (keys %{$self->{'binfiles'}}) {
@@ -373,14 +373,13 @@ sub make_zip {
} else {
$zipn = "$zipname.$t.zip";
}
- $self->_make_zip($tltree,$destdir,$zipn,$t);
+ $self->_make_zip($instroot,$destdir,$zipn,$t);
}
}
}
sub _make_zip {
- my ($self,$tltree,$destdir,$zipname,$arch) = @_;
- my $root = $tltree->svnroot;
+ my ($self,$instroot,$destdir,$zipname,$arch) = @_;
my @files = ();
my $zipcmd;
if ($arch ne "all") {
@@ -414,7 +413,7 @@ sub _make_zip {
$destdir = "$cwd/$destdir";
}
&mkpath("$destdir") if (! -d "$destdir");
- chdir($tltree->svnroot);
+ chdir($instroot);
if ($arch eq "all") {
# we add the .tlpobj into the .tlpobj directory
my $removetlpobjdir = 0;
@@ -909,7 +908,7 @@ or the filehandle if given:
debugging function for comparison with C<tpm>/C<tlps>, will go away.
-=item C<make_zip($tltree[, $destdir[, $zipname]])>
+=item C<make_zip($instroot[, $destdir[, $zipname]])>
creates a zip file of the arch B<independent> files in the C<TLPOBJ>
in C<$destdir> (if not defined then C<< TLPOBJ->zipdir >> is used).
@@ -924,6 +923,9 @@ All the arch independent zip files B<also> contain the respective
C<TLPOBJ> file in C<.tlpobj/$name.tlpobj> so C<$zipname.zip> does
contain this tlpobj file, while C<$zipname.$arch.zip> does NOT.
+The argument C<$instroot> specifies the root of the installation from
+which the files should be taken.
+
=item C<recompute_sizes($tltree)>
recomputes the sizes based on the information present in C<$tltree>.