diff options
author | Norbert Preining <preining@logic.at> | 2022-04-18 05:58:07 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2022-04-18 05:58:07 +0000 |
commit | 4cfbfa2afc6e43658dbf01cc9eb3ab34963d87f6 (patch) | |
tree | c8b4a4a9c2725b187c89d72825300176413f7de6 /Master/install-tl | |
parent | b4e55918f6964c7de8b1e61103c4991a7d59229c (diff) |
Revert "work on win64 support"
This reverts commit daa265a214b9e12e2a9bab636398c2dd699f7cd4.
git-svn-id: svn://tug.org/texlive/trunk@63068 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-x | Master/install-tl | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/Master/install-tl b/Master/install-tl index 4a529eaa36a..862858c75fa 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -1373,8 +1373,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 { @@ -1724,11 +1723,6 @@ sub calc_depends { # tlpsv is gone # $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; @@ -1755,15 +1749,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; } @@ -1920,7 +1911,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'}; } @@ -2482,7 +2473,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'}; } |