From 4cfbfa2afc6e43658dbf01cc9eb3ab34963d87f6 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 18 Apr 2022 05:58:07 +0000 Subject: Revert "work on win64 support" This reverts commit daa265a214b9e12e2a9bab636398c2dd699f7cd4. git-svn-id: svn://tug.org/texlive/trunk@63068 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLConfig.pm | 5 ++-- Master/tlpkg/TeXLive/TLPDB.pm | 6 ----- Master/tlpkg/TeXLive/TLPSRC.pm | 9 +++----- Master/tlpkg/TeXLive/TLUtils.pm | 50 ++++------------------------------------ Master/tlpkg/TeXLive/TLWinGoo.pm | 1 - 5 files changed, 9 insertions(+), 62 deletions(-) (limited to 'Master/tlpkg/TeXLive') diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index 9d513811395..8308c6efeb8 100644 --- a/Master/tlpkg/TeXLive/TLConfig.pm +++ b/Master/tlpkg/TeXLive/TLConfig.pm @@ -120,8 +120,7 @@ our @CriticalPackagesList = qw/texlive.infra/; our $CriticalPackagesRegexp = '^(texlive\.infra)'; if ($^O =~ /^MSWin/i) { push (@CriticalPackagesList, "tlperl.win32"); - push (@CriticalPackagesList, "tlperl.win64"); - $CriticalPackagesRegexp = '^(texlive\.infra|tlperl\.win(32|64)$)'; + $CriticalPackagesRegexp = '^(texlive\.infra|tlperl\.win32$)'; } @@ -368,7 +367,7 @@ C. =item C<@TeXLive::TLConfig::CriticalPackagesRegexp> A list of all those packages which we do not update regularly since they -are too central, currently texlive.infra and (for Windows) tlperl.win(32|64). +are too central, currently texlive.infra and (for Windows) tlperl.win32. =item C<@TeXLive::TLConfig::InstallExtraRequiredPackages> diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 108e041e1eb..be818fccaed 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -881,12 +881,6 @@ sub expand_dependencies { if (grep(/^win32$/,@archs)) { $install{$p_dep} = 0; } - } elsif ($p_dep =~ m/^(.*)\.win64$/) { - # a win32 package should *only* be installed if we are installing - # the win64 arch - if (grep(/^win64$/,@archs)) { - $install{$p_dep} = 0; - } } else { $install{$p_dep} = 0 unless $only_arch; } diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index 360064b0598..0a1146386ac 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -162,7 +162,7 @@ sub from_file { # - normal texlive specific packages: ^texlive.*\..*$ # - configuration texlive specific packages: ^00texlive.*\..*$ if ($line =~ /^name\s/) { - $line =~ /^name\s+([-\w]+(\.win(32|64))?|(00)?texlive\..*)$/; + $line =~ /^name\s+([-\w]+(\.win32)?|(00)?texlive\..*)$/; $foundnametag && die "$srcfile:$lineno: second name directive not allowed: $line" . "(have $name)\n"; @@ -494,16 +494,13 @@ sub make_tlpobj { if ($finalp =~ m! bin/win32/!) { @todoarchs = qw/win32/; } - if ($finalp =~ m! bin/win64/!) { - @todoarchs = qw/win64/; - } # now @todoarchs contains only those archs for which we want # to match the pattern foreach my $arch (@todoarchs) { # get only those files matching the pattern my @archfiles = $tltree->get_matching_files('bin',$finalp, $pkgname, $arch); if (!@archfiles) { - if ((($arch ne "win32") && ($arch ne "win64")) || defined($::tlpsrc_pattern_warn_win)) { + if (($arch ne "win32") || defined($::tlpsrc_pattern_warn_win)) { tlwarn("$self->{name} ($arch): no hit on binpattern $finalp\n"); } } @@ -540,7 +537,7 @@ sub make_tlpobj { # get only those files matching the pattern my @archfiles = $tltree->get_matching_files('bin', $finalp, $pkgname, $arch); if (!@archfiles) { - if ((($arch ne "win32") && ($arch ne "win64")) || defined($::tlpsrc_pattern_warn_win)) { + if (($arch ne "win32") || defined($::tlpsrc_pattern_warn_win)) { tlwarn("$self->{name} ($arch): no hit on negative binpattern $finalp\n") unless $::tlpsrc_pattern_no_warn_negative; # see comments in libexec/place script. diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index bcea1f2a882..4751574b681 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -27,8 +27,6 @@ C - TeX Live infrastructure miscellany TeXLive::TLUtils::platform(); TeXLive::TLUtils::platform_name($canonical_host); TeXLive::TLUtils::platform_desc($platform); - TeXLive::TLUtils::win32_32(); - TeXLive::TLUtils::win32_64(); TeXLive::TLUtils::win32(); TeXLive::TLUtils::unix(); @@ -262,7 +260,7 @@ BEGIN { @EXPORT = qw(setup_programs download_file process_logging_options tldie tlwarn info log debug ddebug dddebug debug debug_hash_str debug_hash - win32 win32_32 win32_64 xchdir xsystem run_cmd system_pipe sort_archs); + win32 xchdir xsystem run_cmd system_pipe sort_archs); } use Cwd; @@ -301,7 +299,6 @@ sub platform { unless (defined $::_platform_) { if ($^O =~ /^MSWin/i) { $::_platform_ = "win32"; - # TODO make sure we check how to detect win64!!! } else { my $config_guess = "$::installerdir/tlpkg/installer/config.guess"; @@ -526,8 +523,7 @@ sub platform_desc { 'sparc-linux' => 'GNU/Linux on Sparc', 'sparc-solaris' => 'Solaris on Sparc', 'universal-darwin' => 'MacOSX current (10.14-) on ARM/x86_64', - 'win32' => 'Windows 32bit', - 'win64' => 'Windows 64bit', + 'win32' => 'Windows', 'x86_64-cygwin' => 'Cygwin on x86_64', 'x86_64-darwinlegacy' => 'MacOSX legacy (10.6-) on x86_64', 'x86_64-dragonfly' => 'DragonFlyBSD on x86_64', @@ -549,44 +545,9 @@ sub platform_desc { } -=item C - -Return C<1> if platform is Windows32 and C<0> otherwise. The test is -currently based on the value of Perl's C<$^O> variable. - -=cut - -sub win32_32 { - if ($^O =~ /^MSWin/i) { - # TODO check 32bit - return 1; - } else { - return 0; - } - # the following needs config.guess, which is quite bad ... - # return (&platform eq "win32")? 1:0; -} -=item C - -Return C<1> if platform is Windows64 and C<0> otherwise. The test is -currently based on the value of Perl's C<$^O> variable. - -=cut - -sub win32_64 { - if ($^O =~ /^MSWin/i) { - # TODO check 64bit - return 1; - } else { - return 0; - } - # the following needs config.guess, which is quite bad ... - # return (&platform eq "win32")? 1:0; -} - =item C -Return C<1> if platform is Windows32 or 64 and C<0> otherwise. The test is +Return C<1> if platform is Windows and C<0> otherwise. The test is currently based on the value of Perl's C<$^O> variable. =cut @@ -602,9 +563,6 @@ sub win32 { } - - - =item C Return C<1> if platform is UNIX and C<0> otherwise. @@ -612,7 +570,7 @@ Return C<1> if platform is UNIX and C<0> otherwise. =cut sub unix { - return (&platform eq "win32" || &platform eq "win64" )? 0:1; + return (&platform eq "win32")? 0:1; } diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm index 5996697336c..94c7877ebb7 100644 --- a/Master/tlpkg/TeXLive/TLWinGoo.pm +++ b/Master/tlpkg/TeXLive/TLWinGoo.pm @@ -1167,7 +1167,6 @@ sub create_uninstaller { my $td = $td_fw; $td =~ s!/!\\!g; - # TODO win64 support!!! my $tdmain = `"$td\\bin\\win32\\kpsewhich" -var-value=TEXMFMAIN`; $tdmain =~ s!/!\\!g; chomp $tdmain; -- cgit v1.2.3