summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLUtils.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2022-04-18 05:58:07 +0000
committerNorbert Preining <preining@logic.at>2022-04-18 05:58:07 +0000
commit4cfbfa2afc6e43658dbf01cc9eb3ab34963d87f6 (patch)
treec8b4a4a9c2725b187c89d72825300176413f7de6 /Master/tlpkg/TeXLive/TLUtils.pm
parentb4e55918f6964c7de8b1e61103c4991a7d59229c (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/tlpkg/TeXLive/TLUtils.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm50
1 files changed, 4 insertions, 46 deletions
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<TeXLive::TLUtils> - 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<win32_32>
-
-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<win32_64>
-
-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<win32>
-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<unix>
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;
}