summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-04-17 08:02:23 +0000
committerNorbert Preining <preining@logic.at>2008-04-17 08:02:23 +0000
commit0057c38056386ec2fa7171c13972417cd3d01241 (patch)
tree05f3738c4c3ab875f81302e5631919c28fe56719 /Master/tlpkg
parent4384299786a2e06413f870924dd95d2eb2e572fd (diff)
remove the "update from net" stuff, we will not support it but
will add support for adding binaries via tlmgr git-svn-id: svn://tug.org/texlive/trunk@7464 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm8
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm28
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl50
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl74
-rw-r--r--Master/tlpkg/installer/lang/perltk-de2
-rw-r--r--Master/tlpkg/installer/lang/perltk-en.sample2
-rw-r--r--Master/tlpkg/installer/lang/perltk-pl2
7 files changed, 22 insertions, 144 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index 48e97c8f9a2..f7dbc6c8cda 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -25,7 +25,6 @@ BEGIN {
$DiskArchive
$TeXLiveURL
$TeXLiveAlternativeURL
- $MaxBinOnCD
);
@EXPORT = @EXPORT_OK;
}
@@ -62,8 +61,6 @@ our $TeXLiveAlternativeURL;
#our $TeXLiveURL = 'http://mirror.ctan.org/systems/texlive/tlnet/2008';
#our $TeXLiveAlternativeURL = 'http://www.ctan.org/systems/texlive/tlnet/2008';
-our $MaxBinOnCD = 7;
-
1;
@@ -125,11 +122,6 @@ The assumed block size, currently 4k.
These values specify where to find packages.
-=item <$TeXLive::TLConfig::MaxBinOnCD>
-
-The maximum number of binary systems on the CD. This number must be
-smaller than the number of binaries available from the network.
-
=back
=head1 SEE ALSO
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index e0fa075e473..efd3aece132 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -53,7 +53,7 @@ C<TeXLive::TLUtils> -- utilities used in the TeX Live infrastructure
TeXLive::TLUtils::create_fmtutil($tlpdb,$dest,$localconf);
TeXLive::TLUtils::create_updmap($tlpdb,$dest,$localconf);
TeXLive::TLUtils::create_language($tlpdb,$dest,$localconf);
- TeXLive::TLUtils::install_packages($from_tlpdb,$to_tlpdb,$what, $netarchsref, $opt_src, $opt_doc)>);
+ TeXLive::TLUtils::install_packages($from_tlpdb,$to_tlpdb,$what,$opt_src, $opt_doc)>);
TeXLive::TLUtils::install_package($what, $filelistref, $target, $platform);
=head2 Miscellaneous
@@ -508,22 +508,19 @@ sub copy {
=pod
-=item C<install_packages($from_tlpdb, $to_tlpdb, $what, $netarchsref, $opt_src, $opt_doc)>
+=item C<install_packages($from_tlpdb, $to_tlpdb, $what, $opt_src, $opt_doc)>
Installs the list of packages found in C<@$what> (a ref to a list) into
the TLPDB given by C<$to_tlpdb>. Information on files are taken from
the TLPDB C<$from_tlpdb>.
-C<$netarchrefs> is a reference to a list of arch/os combination which should
-be installed from the network.
-
C<$opt_src> and C<$opt_doc> specify whether srcfiles and docfiles should be
installed (currently implemented only for installation from DVD).
=cut
sub install_packages {
- my ($fromtlpdb,$totlpdb,$what,$netarchs,$opt_src,$opt_doc) = @_;
+ my ($fromtlpdb,$totlpdb,$what,$opt_src,$opt_doc) = @_;
my $container_src_split = $fromtlpdb->config_src_container;
my $container_doc_split = $fromtlpdb->config_doc_container;
foreach my $package (@$what) {
@@ -549,22 +546,9 @@ sub install_packages {
} elsif (-r "$::installerdir/$DiskArchive/$package.tar.lzma") {
$container = "$::installerdir/$DiskArchive/$package.tar.lzma";
} else {
- # ok, it could be a binary package which should be installed from
- # the net
- my $donefromnet = 0;
- foreach my $a (@$netarchs) {
- if ($package =~ m/\.$a$/) {
- # ok this is a binary we should install from the net
- $container = "$TeXLiveURL/$NetArchive/$package.$DefaultContainerExtension";
- $donefromnet = 1;
- last;
- }
- }
- if (!$donefromnet) {
- # for now only warn and return, should (?) be die!?
- warn "Cannot find a package $package (.zip or .lzma) in $::installerdir/$DiskArchive\n";
- next;
- }
+ # for now only warn and return, should (?) be die!?
+ warn "Cannot find a package $package (.zip or .lzma) in $::installerdir/$DiskArchive\n";
+ next;
}
} elsif (&media eq 'NET') {
$container = "$TeXLiveURL/$NetArchive/$package.$DefaultContainerExtension";
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 6e7fb965b7a..bb2efcc8c17 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -19,7 +19,6 @@ our @collections_std;
our @collections_lang;
our @collections_lang_doc;
our $texlive_release;
-our $trynet;
our $MENU_INSTALL = 0;
our $MENU_ABORT = 1;
@@ -132,8 +131,6 @@ my %text = ( title => 'TeX Live 2008 Installation',
binto => 'binaries to',
manto => 'manpages to',
infoto => 'info to',
- onnet => 'On Net',
- ondisk => 'On Disk',
selectsys => 'Select arch-os',
clicknetbin => 'Click for net bins',
outof => 'out of',
@@ -553,62 +550,21 @@ sub menu_select_symlink {
sub menu_select_binsystems {
our $f2r;
our $f2;
- our @netarchs = ();
- sub update_net_archs() {
- my $oldnrnetarch = $#netarchs;
- $trynet = 1;
- set_platforms_supported();
- $trynet=0;
- @netarchs = ();
- foreach my $key (keys %vars) {
- if ($key=~/netbin_(.*)/) {
- push @netarchs, $1;
- $from_net{"$1"}=1;
- }
- }
- menu_update_texts();
- if ($#netarchs != $oldnrnetarch) {
- # we have to destroy the old $f2r frame and make a new one
- $f2r->destroy;
- do_net_frame();
- }
- }
- sub do_net_frame {
- $f2r = $f2->Frame;
- if ($#netarchs >= 0) {
- $f2r->Label(-text => $text{'onnet'})->pack;
- foreach my $sys (sort @netarchs) {
- $f2r->Checkbutton(-variable => \$vars{"netbin_$sys"}, -text => "$sys")->pack(-anchor => 'w');
- }
- $f2r->pack(-side => 'right');
- }
- $f2->pack;
- }
my $sw = $mw->Toplevel(-title => $labels{'binsys'});
my @diskarchs = ();
foreach my $key (keys %vars) {
- if ($key=~/diskbin_(.*)/) {
+ if ($key=~/binary_(.*)/) {
push @diskarchs, $1;
- $from_net{"$1"}=0;
- }
- if ($key=~/netbin_(.*)/) {
- push @netarchs, $1;
- $from_net{"$1"}=1;
}
}
$sw->Label(-text => $text{'selectsys'})->pack;
$f2 = $sw->Frame;
my $f2l = $f2->Frame;
- $f2l->Label(-text => $text{'ondisk'})->pack;
foreach my $sys (sort @diskarchs) {
- $f2l->Checkbutton(-variable => \$vars{"diskbin_$sys"}, -text => platform_desc($sys))->pack(-anchor => 'w');
+ $f2l->Checkbutton(-variable => \$vars{"binary_$sys"}, -text => platform_desc($sys))->pack(-anchor => 'w');
}
$f2l->pack(-side => 'left');
- do_net_frame();
- my $f4 = $sw->Frame;
- $f4->pack;
- $f4->Button(-text => $text{'clicknetbin'},
- -command => sub { update_net_archs(); })->pack;
+ $f2->pack;
my $f3 = $sw->Frame;
$f3->Button(-text => $text{'ok'},
-command => sub { callback_select_systems() ; $sw->destroy })->pack(-side => 'left');
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 7bd49d79eb9..cf68c36d430 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -16,7 +16,6 @@ our @collections_std;
our @collections_lang;
our @collections_lang_doc;
our $texlive_release;
-our $trynet;
my $MENU_CONTINUE = -1;
our $MENU_INSTALL = 0;
@@ -65,7 +64,6 @@ sub other_options {
'+' => 'select all',
'H' => 'help',
'I' => 'start installation',
- 'N' => 'add binaries from net',
'R' => 'return to main menu',
'Q' => 'quit'
);
@@ -105,63 +103,30 @@ sub binary_menu {
'Q' => \&quit
);
- my @diskbins;
- my @netbins;
- my %from_net;
+ my @binaries;
my @keys=string_to_list "abcdefghijklmopstuvwxyz";
my $index=0;
- my $diskbin='';
my %keyval;
my $selected_platform;
menu_head "Available sets of binaries:";
foreach my $key (keys %vars) {
- if ($key=~/diskbin_(.*)/) {
- push @diskbins, $1;
- $from_net{"$1"}=0;
+ if ($key =~ /binary_(.*)/) {
+ push @binaries, $1;
}
- if ($key=~/netbin_(.*)/) {
- push @netbins, $1;
- $from_net{"$1"}=1;
- }
- }
- my @binaries=sort(@diskbins,@netbins);
-
- set_install_platform;
-
- $vars{'n_systems_available'}=0;
- for my $key (keys %vars) {
- ++$vars{'n_systems_available'} if ($key=~/^(disk|net)bin/);
}
-
- $diskbin=' '
- if (media eq 'CD' and $vars{'n_systems_available'}>$MaxBinOnCD);
+ @binaries=sort(@binaries);
foreach my $binary (@binaries) {
- if (media eq 'CD' and $vars{'n_systems_available'}>$MaxBinOnCD) {
- $diskbin=$from_net{"$binary"}? "* ":" ";
- }
- printf " %s %s %s%-16s %s\n", $keys[$index],
- button($from_net{"$binary"}?
- $vars{"netbin_$binary"}:$vars{"diskbin_$binary"}),
- $diskbin, "$binary" . ":",
- platform_desc "$binary";
- $keyval{"$keys[$index]"}=$from_net{"$binary"}?
- "netbin_$binary":"diskbin_$binary";
+ printf " %s %s %-16s %s\n", $keys[$index],
+ button($vars{"binary_$binary"}),
+ "$binary" . ":",
+ platform_desc "$binary";
+ $keyval{"$keys[$index]"} = "binary_$binary";
++$index;
}
- if ($vars{'n_systems_available'}<=$MaxBinOnCD ) {
- print "\n Binaries for additional systems are available on the DVD.\n" .
- " If you have network access, try option <N>.\n";
-
- other_options qw(- + N R Q);
- } else {
- print "\n Network access is required to install binary systems " .
- "marked with '*'.\n" if (media eq 'CD');
-
- other_options qw(- + R Q);
- }
+ other_options qw(- + R Q);
my $answer=prompt 'Press key to select/deselect binary systems';
@@ -170,26 +135,18 @@ sub binary_menu {
foreach my $keystroke (@keystrokes) {
if ($keystroke eq '-') {
for my $binary (@binaries) {
- $vars{"netbin_$binary"}=0 if defined $vars{"netbin_$binary"};
- $vars{"diskbin_$binary"}=0 if defined $vars{"diskbin_$binary"};
+ $vars{"binary_$binary"}=0 if defined $vars{"binary_$binary"};
}
}
if ($keystroke eq '+') {
for my $binary (@binaries) {
- $vars{"netbin_$binary"}=1 if defined $vars{"netbin_$binary"};
- $vars{"diskbin_$binary"}=1 if defined $vars{"diskbin_$binary"};
+ $vars{"binary_$binary"}=1 if defined $vars{"binary_$binary"};
}
}
if (defined $keyval{$keystroke}) {
toggle "$keyval{$keystroke}";
}
}
- if ("\u$answer" eq 'N' and media eq 'CD') {
- $trynet=1;
- set_platforms_supported;
- $trynet=0;
- return $command{'self'};
- }
if (defined $command{"\u$answer"}) {
return $command{"\u$answer"}->();
} else {
@@ -765,17 +722,12 @@ sub main_menu {
my $warn_nobin;
- $vars{'n_systems_available'}=0;
- for my $key (keys %vars) {
- ++$vars{'n_systems_available'} if ($key=~/^(disk|net)bin/);
- }
-
$warn_nobin=set_install_platform;
$vars{'n_systems_selected'}=0;
$vars{'n_collections_selected'}=0;
foreach my $key (keys %vars) {
- if ($key=~/^diskbin.*/ or $key=~/^netbin.*/) {
+ if ($key=~/^binary.*/) {
++$vars{'n_systems_selected'} if $vars{$key}==1;
}
if ($key=~/^collection/) {
diff --git a/Master/tlpkg/installer/lang/perltk-de b/Master/tlpkg/installer/lang/perltk-de
index 987b605cf3d..f22e014cc10 100644
--- a/Master/tlpkg/installer/lang/perltk-de
+++ b/Master/tlpkg/installer/lang/perltk-de
@@ -29,8 +29,6 @@ text.createsym: Erstellen von symbolischen Links in Standardordnern
text.binto: Programme nach
text.manto: Hilfeseiten nach
text.infoto: Infoseiten nach
-text.onnet: Am Netz
-text.ondisk: Auf dem Medium
text.selectsys: Auswahl von arch-os
text.clicknetbin: Klicken für Netzwerk Programme
text.outof: von
diff --git a/Master/tlpkg/installer/lang/perltk-en.sample b/Master/tlpkg/installer/lang/perltk-en.sample
index 08d91e8a9b2..184d7b347c5 100644
--- a/Master/tlpkg/installer/lang/perltk-en.sample
+++ b/Master/tlpkg/installer/lang/perltk-en.sample
@@ -32,8 +32,6 @@ text.createsym: create symlinks in standard directories
text.binto: binaries to
text.manto: manpages to
text.infoto: info to
-text.onnet: On Net
-text.ondisk: On Disk
text.selectsys: Select arch-os
text.clicknetbin: Click for net bins
text.outof: out of
diff --git a/Master/tlpkg/installer/lang/perltk-pl b/Master/tlpkg/installer/lang/perltk-pl
index cd26bb1b18d..75631fca399 100644
--- a/Master/tlpkg/installer/lang/perltk-pl
+++ b/Master/tlpkg/installer/lang/perltk-pl
@@ -29,8 +29,6 @@ text.createsym: Ustalenie linkow symbolicznych w standardowych folderach
text.binto: Programy według
text.manto: Strony pomocy według
text.infoto: Strony informacyjne według
-text.onnet: W sieci
-text.ondisk: Na nośniku
text.selectsys: Wybór arch-os
text.clicknetbin: Kliknij aby uzyskać programy sieciowe
text.outof: spośród