summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2019-12-10 06:20:44 +0000
committerNorbert Preining <preining@logic.at>2019-12-10 06:20:44 +0000
commit7f85e4a77221267523ef1738a61320991bdbc000 (patch)
tree5f4ca539653a989188167a65a13dc16185736f00 /Master/texmf-dist/scripts
parentf201f6cfe15e09e8d152c6b4d8f7c7cb1bb0f7c7 (diff)
Revert "work on win64 support"
git-svn-id: svn://tug.org/texlive/trunk@53076 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl47
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/uninstall-win32.pl3
2 files changed, 15 insertions, 35 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index b65494e2fd5..6630f556a1c 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -54,11 +54,7 @@ BEGIN {
$Master =~ s!\\!/!g;
$Master =~ s![^/]*$!../../..!
unless ($Master =~ s!/texmf-dist/scripts/texlive/tlmgr\.pl$!!i);
- if (win32_32()) {
- $bindir = "$Master/bin/win32";
- } else {
- $bindir = "$Master/bin/win64";
- }
+ $bindir = "$Master/bin/win32";
$kpsewhichname = "kpsewhich.exe";
# path already set by wrapper batchfile
} else {
@@ -109,7 +105,7 @@ use TeXLive::TLWinGoo;
use TeXLive::TLDownload;
use TeXLive::TLConfFile;
use TeXLive::TLCrypto;
-TeXLive::TLUtils->import(qw(member info give_ctan_mirror win32 win32_32 dirname
+TeXLive::TLUtils->import(qw(member info give_ctan_mirror win32 dirname
mkdirhier copy debug tlcmp repository_to_array));
use TeXLive::TLPaper;
@@ -818,8 +814,7 @@ sub do_cmd_and_check {
if ($opts{"dry-run"}) {
$ret = $F_OK;
$out = "";
- } elsif ((win32_32() && (! -r "$Master/bin/win32/luatex.dll")) ||
- (win32_64() && (! -r "$Master/bin/win64/luatex.dll"))) {
+ } elsif (win32() && (! -r "$Master/bin/win32/luatex.dll")) {
# deal with the case where only scheme-infrastructure is installed
# on Windows, thus no luatex.dll is available and the wrapper cannot be started
tlwarn("Cannot run wrapper due to missing luatex.dll\n");
@@ -1482,7 +1477,7 @@ sub action_path {
if ($what =~ m/^add$/i) {
if (win32()) {
$ret |= TeXLive::TLUtils::w32_add_to_path(
- $localtlpdb->root . win32_32() ? "/bin/win32" : "/bin/win64",
+ $localtlpdb->root . "/bin/win32",
$winadminmode);
$ret |= TeXLive::TLWinGoo::broadcast_env();
} else {
@@ -1495,7 +1490,7 @@ sub action_path {
} elsif ($what =~ m/^remove$/i) {
if (win32()) {
$ret |= TeXLive::TLUtils::w32_remove_from_path(
- $localtlpdb->root . win32_32() ? "/bin/win32" : "/bin/win64",
+ $localtlpdb->root . "/bin/win32",
$winadminmode);
$ret |= TeXLive::TLWinGoo::broadcast_env();
} else {
@@ -4813,9 +4808,6 @@ sub action_platform {
my @extra_w32_packs = qw/tlperl.win32 tlgs.win32 tlpsv.win32
collection-wintools
dviout.win32 wintools.win32/;
- my @extra_w64_packs = qw/tlperl.win64 tlgs.win64 tlpsv.win64
- collection-wintools
- dviout.win64 wintools.win64/;
if ($^O =~ /^MSWin/i) {
warn("action `platform' not supported on Windows\n");
# return an error here so that we don't go into post-actions
@@ -4887,19 +4879,14 @@ sub action_platform {
}
}
}
- my @extrapacks;
if (TeXLive::TLUtils::member('win32', @todoarchs)) {
- push @extrapacks, @extra_w32_packs;
- }
- if (TeXLive::TLUtils::member('win64', @todoarchs)) {
- push @extrapacks, @extra_w64_packs;
- }
- # install the necessary w32 stuff
- for my $p (@extrapacks) {
- info("install: $p\n");
- if (!$opts{'dry-run'}) {
- if (! $remotetlpdb->install_package($p, $localtlpdb)) {
- $ret |= $F_ERROR;
+ # install the necessary w32 stuff
+ for my $p (@extra_w32_packs) {
+ info("install: $p\n");
+ if (!$opts{'dry-run'}) {
+ if (! $remotetlpdb->install_package($p, $localtlpdb)) {
+ $ret |= $F_ERROR;
+ }
}
}
}
@@ -4956,12 +4943,6 @@ sub action_platform {
$localtlpdb->remove_package($p) if (!$opts{"dry-run"});
}
}
- if (TeXLive::TLUtils::member('win64', @todoarchs)) {
- for my $p (@extra_w64_packs) {
- info("remove: $p\n");
- $localtlpdb->remove_package($p) if (!$opts{"dry-run"});
- }
- }
if (!$opts{"dry-run"}) {
# try to remove bin/$a dirs
for my $a (@todoarchs) {
@@ -5339,7 +5320,7 @@ sub init_tltree {
# if we are on W32, die (no find).
my $arch = $localtlpdb->platform();
- if (($arch eq "win32") || ($arch eq "win64")) {
+ if ($arch eq "win32") {
tldie("$prg: sorry, cannot check this on Windows.\n");
}
@@ -5856,7 +5837,7 @@ sub check_depends {
# For each package, check that it is a dependency of some collection.
if (! exists $coll_deps{$pkg}) {
# Except that schemes and our ugly Windows packages are ok.
- push (@no_dep, $pkg) unless $pkg =~/^scheme-|\.win(32|64)$/;
+ push (@no_dep, $pkg) unless $pkg =~/^scheme-|\.win32$/;
}
# For each dependency, check that we have a package.
diff --git a/Master/texmf-dist/scripts/texlive/uninstall-win32.pl b/Master/texmf-dist/scripts/texlive/uninstall-win32.pl
index 4c6e8c6c7a5..d82bd38184f 100755
--- a/Master/texmf-dist/scripts/texlive/uninstall-win32.pl
+++ b/Master/texmf-dist/scripts/texlive/uninstall-win32.pl
@@ -55,8 +55,7 @@ sub doit {
`rmdir /s /q "$menupath\\$TeXLive::TLConfig::WindowsMainMenuName" 2>nul`;
# remove bindir from PATH settings
- TeXLive::TLUtils::w32_remove_from_path(
- TeXLive::TLUtils::win32_32 ? "$Master/bin/win32" : "$Master/bin/win64",
+ TeXLive::TLUtils::w32_remove_from_path("$Master/bin/win32",
$localtlpdb->option("w32_multi_user"));
# unsetenv_reg("TEXBINDIR");