summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-01-13 19:23:00 +0000
committerNorbert Preining <preining@logic.at>2008-01-13 19:23:00 +0000
commit678d87295a3f5792fd86d4c2579a898bfed0deb8 (patch)
tree19cd7fb0ce58337ee6ef70d877076ddb466f0f32 /Master
parent9eaeb3ea104f3b6add854d8dd089e693ec963072 (diff)
install-tl-tk.pl is gone, all merged back into install-tl
git-svn-id: svn://tug.org/texlive/trunk@6214 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/tlpkg/bin/mk_download_pkg24
1 files changed, 4 insertions, 20 deletions
diff --git a/Master/tlpkg/bin/mk_download_pkg b/Master/tlpkg/bin/mk_download_pkg
index 228716e8e26..93283e3de24 100755
--- a/Master/tlpkg/bin/mk_download_pkg
+++ b/Master/tlpkg/bin/mk_download_pkg
@@ -114,8 +114,6 @@ my $tlpdb = TeXLive::TLPDB->new ("root" => "$installerdir");
die("Cannot find tlpdb in $installerdir!\n") unless defined($tlpdb);
my $tlp = $tlpdb->get_package("00texlive.installer");
die("Cannot find package 00texlive.installer in ${installerdir}'s texlive.tlpdb\n") unless defined($tlp);
-my $tlperl = $tlpdb->get_package("bin-tlperl.win32");
-die("Cannot find package bin-tlperl.win32 in ${installerdir}'s texlive.tlpdb\n") unless defined($tlperl);
my @unix;
push @unix, $tlp->runfiles;
@@ -130,24 +128,17 @@ push @win32, @unix;
if (defined($tlpbin{"win32"})) {
push @win32, @{$tlpbin{"win32"}};
}
-my @win32full;
-push @win32full, @unix;
-push @win32full, $tlperl->runfiles;
### copy files from the repository to tmpdir
sub copy_files {
- my ($a, $b, @files) = @_;
my ($dir, $file);
- for (@files) {
+ for (@_) {
if ($_ !~ m!/!) {
# file in the root, missing ./
$_ = "./$_";
}
- my $dest = $_;
- $dest =~ s!$a!$b!;
- #($dir, $file) = /^(.*)\/(.*)/;
- ($dir, $file) = ($dest =~ /^(.*)\/(.*)/);
+ ($dir, $file) = /^(.*)\/(.*)/;
mkdirhier "$inst_tmp/$dir";
copy "$_", "$inst_tmp/$dir";
}
@@ -160,8 +151,6 @@ sub make_zip {
chdir "$tmpdir" or die "Can't chdir \"$tmpdir\".\n";
if ($type eq 'zip') {
system('zip', '-rq', 'install-tl.zip', 'install-tl');
- } elsif ($type eq 'zipfull') {
- system('zip', '-rq', 'install-tl-tk.zip', 'install-tl');
} else {
system('tar', '-czf', 'install-tl.tar.gz', 'install-tl');
}
@@ -175,21 +164,16 @@ sub install_zip {
system ('ls', '-l', "$outputdir/install-tl.tar.gz") unless ($opt_qiet);
copy "$tmpdir/install-tl.zip", "$outputdir";
system ('ls', '-l', "$outputdir/install-tl.zip") unless ($opt_qiet);
- copy "$tmpdir/install-tl-tk.zip", "$outputdir";
- system ('ls', '-l', "$outputdir/install-tl-tk.zip") unless ($opt_qiet);
}
### main
-copy_files ("a","a",@unix);
+copy_files (@unix);
make_zip 'tgz';
-copy_files ("a","a",@win32);
+copy_files (@win32);
make_zip 'zip';
-copy_files ("/tlperl/lib/","/lib/Perl5_lib-TL_inst/",@win32full);
-make_zip 'zipfull';
-
install_zip;
cleanup;