Revert "work on win64 support"

git-svn-id: svn://tug.org/texlive/trunk@53076 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 4 insertions, 13 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 1d64be755bb..3ca1a0ae65a 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1350,8 +1350,7 @@ sub do_path_adjustments {
   my $ret = 0;
   info ("running path adjustment actions\n");
   if (win32()) {
-    my $subpath = win32() ? "win32" : "win64";
-    TeXLive::TLUtils::w32_add_to_path($vars{'TEXDIR'} . $subpath,
+    TeXLive::TLUtils::w32_add_to_path($vars{'TEXDIR'}.'/bin/win32',
       $vars{'tlpdbopt_w32_multi_user'});
     broadcast_env();
   } else {
@@ -1694,11 +1693,6 @@ sub calc_depends {
     $install{"tlgs.win32"} = 1;
     $install{"tlpsv.win32"} = 1;
   }
-  if (grep(/^win64$/,@archs)) {
-    $install{"tlperl.win64"} = 1;
-    $install{"tlgs.win64"} = 1;
-    $install{"tlpsv.win64"} = 1;
-  }
 
   # loop over all the packages until it is getting stable
   my $changed = 1;
@@ -1725,15 +1719,12 @@ sub calc_depends {
           foreach $a (@archs) {
             $install{"$foo.$a"} = 1 if defined($tlpdb->get_package("$foo.$a"));
           }
-        } elsif ($p_dep =~ m/^(.*)\.win(32|64)$/) {
+        } elsif ($p_dep =~ m/^(.*)\.win32$/) {
           # a win32 package should *only* be installed if we are installing
           # the win32 arch
           if (grep(/^win32$/,@archs)) {
             $install{$p_dep} = 1;
           }
-          if (grep(/^win64$/,@archs)) {
-            $install{$p_dep} = 1;
-          }
         } else {
           $install{$p_dep} = 1;
         }
@@ -1890,7 +1881,7 @@ sub initialize_collections {
       ++$vars{'n_collections_selected'};
     }
   }
-  if ($vars{"binary_win32"} || $vars{"binary_win64"}) {
+  if ($vars{"binary_win32"}) {
     $vars{"collection-wintools"} = 1;
     ++$vars{'n_collections_selected'};
   }
@@ -2445,7 +2436,7 @@ sub select_scheme {
   # 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{"binary_win64"}) {
+  if ($vars{"binary_win32"}) {
     $vars{"collection-wintools"} = 1;
     ++$vars{'n_collections_selected'};
   }