From f463b283de1a85177ff46c78a14b415c4fc47c39 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 28 May 2008 15:32:16 +0000 Subject: installer: do not install collection_wintools forcibly, but select it when you select win32. But you can still deselect it afterwards git-svn-id: svn://tug.org/texlive/trunk@8387 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 13 ++++++++++++- Master/tlpkg/installer/install-menu-perltk.pl | 5 +++++ Master/tlpkg/installer/install-menu-text.pl | 10 ++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) (limited to 'Master') diff --git a/Master/install-tl b/Master/install-tl index 5aa5cc98fc3..45a4eac98e6 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -537,7 +537,6 @@ sub calc_depends { $install{"bin-tlperl.win32"} = 1; $install{"bin-tlgs.win32"} = 1; $install{"bin-tlpsv.win32"} = 1; - $install{"collection-wintools"} = 1; } # loop over all the packages until it is getting stable @@ -642,6 +641,10 @@ sub initialize_collections { } } } + if ($vars{"binary_win32"}) { + $vars{"collection-wintools"} = 1; + ++$vars{'n_collections_selected'}; + } } sub set_install_platform { @@ -1029,6 +1032,14 @@ sub select_scheme { } } } + # we have first set all collection-* keys to zero and than + # set to 1 only those which are required by the scheme + # since now scheme asks for collection-wintools we set its vars value + # to 1 in case we are installing win32 binaries + if ($vars{"binary_win32"}) { + $vars{"collection-wintools"} = 1; + ++$vars{'n_collections_selected'}; + } # for good measure, update the deps calc_depends(); } diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 452272c6667..2b72870873b 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -649,6 +649,11 @@ sub callback_select_collection { } sub callback_select_systems() { + if ($vars{"binary_win32"}) { + $vars{"collection-wintools"} = 1; + } else { + $vars{"collection-wintools"} = 0; + } calc_depends(); update_numbers(); menu_update_texts(); diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index c13490e91bf..b984b1a075a 100755 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -147,6 +147,11 @@ sub binary_menu { toggle "$keyval{$keystroke}"; } } + if ($vars{"binary_win32"}) { + $vars{"collection-wintools"} = 1; + } else { + $vars{"collection-wintools"} = 0; + } if (defined $command{"\u$answer"}) { return $command{"\u$answer"}->(); } else { @@ -200,6 +205,11 @@ sub scheme_menu { } } } + if ($vars{"binary_win32"}) { + $vars{"collection-wintools"} = 1; + } else { + $vars{"collection-wintools"} = 0; + } other_options qw(R Q); my $answer=prompt 'Press key to select a scheme'; -- cgit v1.2.3