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

1 files changed, 12 insertions, 1 deletions

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();
 }