texlive[63068] Master: Revert "work on win64 support"
commits+preining at tug.org
commits+preining at tug.org
Mon Apr 18 07:58:08 CEST 2022
Revision: 63068
http://tug.org/svn/texlive?view=revision&revision=63068
Author: preining
Date: 2022-04-18 07:58:07 +0200 (Mon, 18 Apr 2022)
Log Message:
-----------
Revert "work on win64 support"
This reverts commit daa265a214b9e12e2a9bab636398c2dd699f7cd4.
Modified Paths:
--------------
trunk/Master/install-tl
trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
trunk/Master/texmf-dist/scripts/texlive/uninstall-win32.pl
trunk/Master/tlpkg/TeXLive/TLConfig.pm
trunk/Master/tlpkg/TeXLive/TLPDB.pm
trunk/Master/tlpkg/TeXLive/TLPSRC.pm
trunk/Master/tlpkg/TeXLive/TLUtils.pm
trunk/Master/tlpkg/TeXLive/TLWinGoo.pm
trunk/Master/tlpkg/bin/tl-compare-tlpdbs
trunk/Master/tlpkg/bin/tl-update-4ht
trunk/Master/tlpkg/bin/tl-update-bindir
trunk/Master/tlpkg/bin/tl-update-install-pkg
trunk/Master/tlpkg/bin/tl-update-nsis
trunk/Master/tlpkg/bin/tl-update-tlcritical
trunk/Master/tlpkg/installer/install-menu-text.pl
trunk/Master/tlpkg/installer/tl-cmd.bat
trunk/Master/tlpkg/installer/tl-tray-menu.ini
trunk/Master/tlpkg/libexec/ctan2tds
Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/install-tl 2022-04-18 05:58:07 UTC (rev 63068)
@@ -1373,8 +1373,7 @@
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 @@
# tlpsv is gone
# $install{"tlpsv.win32"} = 1;
}
- if (grep(/^win64$/, at 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 @@
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$/, at archs)) {
$install{$p_dep} = 1;
}
- if (grep(/^win64$/, at archs)) {
- $install{$p_dep} = 1;
- }
} else {
$install{$p_dep} = 1;
}
@@ -1920,7 +1911,7 @@
++$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 @@
# 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'};
}
Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl 2022-04-18 05:58:07 UTC (rev 63068)
@@ -51,11 +51,7 @@
$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 {
@@ -100,7 +96,7 @@
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;
@@ -847,8 +843,7 @@
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");
@@ -1568,7 +1563,7 @@
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);
# ignore this return value, since broadcase_env might return
# nothing in case of errors, and there is no way around it.
@@ -1583,7 +1578,7 @@
} 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);
# ignore this return value, since broadcase_env might return
# nothing in case of errors, and there is no way around it.
@@ -4945,9 +4940,6 @@
my @extra_w32_packs = qw/tlperl.win32 tlgs.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
@@ -5019,19 +5011,14 @@
}
}
}
- 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;
+ }
}
}
}
@@ -5088,12 +5075,6 @@
$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) {
@@ -5518,7 +5499,7 @@
# 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");
}
@@ -6057,7 +6038,7 @@
# 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.
Modified: trunk/Master/texmf-dist/scripts/texlive/uninstall-win32.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/uninstall-win32.pl 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/texmf-dist/scripts/texlive/uninstall-win32.pl 2022-04-18 05:58:07 UTC (rev 63068)
@@ -61,8 +61,7 @@
`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");
Modified: trunk/Master/tlpkg/TeXLive/TLConfig.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLConfig.pm 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/TeXLive/TLConfig.pm 2022-04-18 05:58:07 UTC (rev 63068)
@@ -120,8 +120,7 @@
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 @@
=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>
Modified: trunk/Master/tlpkg/TeXLive/TLPDB.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPDB.pm 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/TeXLive/TLPDB.pm 2022-04-18 05:58:07 UTC (rev 63068)
@@ -881,12 +881,6 @@
if (grep(/^win32$/, at 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$/, at archs)) {
- $install{$p_dep} = 0;
- }
} else {
$install{$p_dep} = 0 unless $only_arch;
}
Modified: trunk/Master/tlpkg/TeXLive/TLPSRC.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPSRC.pm 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/TeXLive/TLPSRC.pm 2022-04-18 05:58:07 UTC (rev 63068)
@@ -162,7 +162,7 @@
# - 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,9 +494,6 @@
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) {
@@ -503,7 +500,7 @@
# 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 @@
# 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.
Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm 2022-04-18 05:58:07 UTC (rev 63068)
@@ -27,8 +27,6 @@
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 @@
@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 @@
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 @@
'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 @@
}
-=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 @@
}
-
-
-
=item C<unix>
Return C<1> if platform is UNIX and C<0> otherwise.
@@ -612,7 +570,7 @@
=cut
sub unix {
- return (&platform eq "win32" || &platform eq "win64" )? 0:1;
+ return (&platform eq "win32")? 0:1;
}
Modified: trunk/Master/tlpkg/TeXLive/TLWinGoo.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLWinGoo.pm 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/TeXLive/TLWinGoo.pm 2022-04-18 05:58:07 UTC (rev 63068)
@@ -1167,7 +1167,6 @@
my $td = $td_fw;
$td =~ s!/!\\!g;
- # TODO win64 support!!!
my $tdmain = `"$td\\bin\\win32\\kpsewhich" -var-value=TEXMFMAIN`;
$tdmain =~ s!/!\\!g;
chomp $tdmain;
Modified: trunk/Master/tlpkg/bin/tl-compare-tlpdbs
===================================================================
--- trunk/Master/tlpkg/bin/tl-compare-tlpdbs 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/bin/tl-compare-tlpdbs 2022-04-18 05:58:07 UTC (rev 63068)
@@ -20,7 +20,7 @@
# packages ignored unless --all is given
# see @critical_pkg_list in tl-update-containers
-my @add_ignored_packs = qw/texlive.infra tlperl.win32 tlperl.win64/;
+my @add_ignored_packs = qw/texlive.infra tlperl.win32/;
our ($mydir, $vc_id);
my $opt_version = 0;
@@ -116,7 +116,7 @@
=item B<--all>
-Also compare packages C<texlive.infra> and C<tlperl.win(32|64)>, which are
+Also compare packages C<texlive.infra> and C<tlperl.win32>, which are
ignored by default.
=item B<--help>
Modified: trunk/Master/tlpkg/bin/tl-update-4ht
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-4ht 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/bin/tl-update-4ht 2022-04-18 05:58:07 UTC (rev 63068)
@@ -27,7 +27,6 @@
#
diff -u1 $tm/bin/win32 bin/win32/ | fgrep -v "Only in /home" >/tmp/u; v /tmp/u #tex4ht, t4ht
-diff -u1 $tm/bin/win64 bin/win64/ | fgrep -v "Only in /home" >/tmp/u; v /tmp/u #tex4ht, t4ht
#\cp -pf bin/win32/* /home/texlive/karl/Master/bin/win32/
#
diff -u1 .. src | fgrep -v "Only in .." >/tmp/u; v /tmp/u
@@ -67,7 +66,7 @@
#(cd $tm/texmf-dist/tex4ht/ && svn add `cat /tmp/c`)
# check results:
-svn status .. $tm/bin/win32 $tm/bin/win64 \
+svn status .. $tm/bin/win32 \
$tm/texmf-dist/tex/generic/tex4ht \
$tm/texmf-dist/tex4ht \
$tm/texmf-dist/scripts/tex4ht
Modified: trunk/Master/tlpkg/bin/tl-update-bindir
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-bindir 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/bin/tl-update-bindir 2022-04-18 05:58:07 UTC (rev 63068)
@@ -182,7 +182,6 @@
universal-darwin)
default_bin_loc=/home/koch/$tlplat.tar.xz
;;
- win64)
win32)
# default_bin_loc=$tmpdir/tl.$tlplat.zip
# $grab http://members2.jcom.home.ne.jp/wt1357ak/tl2009w32-02.zip;;
Modified: trunk/Master/tlpkg/bin/tl-update-install-pkg
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-install-pkg 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/bin/tl-update-install-pkg 2022-04-18 05:58:07 UTC (rev 63068)
@@ -158,7 +158,7 @@
my %tlpbin = %{$tlpinst->binfiles};
for my $a (keys %tlpbin) {
- next if ($a =~ m/win(32|64)/);
+ next if ($a =~ m/win32/);
push (@unix, @{$tlpbin{$a}});
}
@@ -167,9 +167,6 @@
if (defined $tlpbin{"win32"}) {
push (@win32, @{$tlpbin{"win32"}});
}
-if (defined $tlpbin{"win64"}) {
- push (@win32, @{$tlpbin{"win64"}});
-}
# main.
Modified: trunk/Master/tlpkg/bin/tl-update-nsis
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-nsis 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/bin/tl-update-nsis 2022-04-18 05:58:07 UTC (rev 63068)
@@ -41,11 +41,10 @@
my $texliveinfra = $tlpdb->get_package("texlive.infra");
my $texliveinfraw32 = $tlpdb->get_package("texlive.infra.win32");
- my $texliveinfraw64 = $tlpdb->get_package("texlive.infra.win64");
+ #
my @allfiles = ();
push(@allfiles, $texliveinfra->all_files);
push(@allfiles, $texliveinfraw32->all_files) if defined $texliveinfraw32;
- push(@allfiles, $texliveinfraw64->all_files) if defined $texliveinfraw64;
# create the tlpobj files, and directory if necessary.
my $tlpobjdir = "$InfraLocation/tlpobj";
@@ -54,7 +53,7 @@
&TeXLive::TLUtils::mkdirhier($abs_tlpobjdir);
}
my $rev = 0; # get the highest rev of all our packages
- for my $p ($texliveinfra, $texliveinfraw32, $texliveinfraw64) {
+ for my $p ($texliveinfra, $texliveinfraw32) {
if (defined $p) {
if ($p->revision > $rev) {
$rev = $p->revision;
@@ -134,7 +133,6 @@
print " File $mm\\$dd\\$f\n";
}
}
- # TODO win64 SUPPORT
print " ExecWait \'\"\$INSTDIR\\bin\\win32\\tlmgr.bat\" _include_tlpobj";
for my $p ($texliveinfra, $texliveinfraw32) {
if (defined $p) {
Modified: trunk/Master/tlpkg/bin/tl-update-tlcritical
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-tlcritical 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/bin/tl-update-tlcritical 2022-04-18 05:58:07 UTC (rev 63068)
@@ -82,7 +82,7 @@
# update normal containers.
echo "$0: running tl-update-containers (for critical packages)..."
tl-update-containers -location $tlcrit $recreate -all \
- 00texlive.installation 00texlive.config texlive.infra tlperl.win32 tlperl.win64 \
+ 00texlive.installation 00texlive.config texlive.infra tlperl.win32 \
$moredis
else
# this is an option so that if the repository already contains
Modified: trunk/Master/tlpkg/installer/install-menu-text.pl
===================================================================
--- trunk/Master/tlpkg/installer/install-menu-text.pl 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/installer/install-menu-text.pl 2022-04-18 05:58:07 UTC (rev 63068)
@@ -323,7 +323,7 @@
print "Unknown command: $answer\n\n";
}
}
- if ($vars{"binary_win32"} || $vars{"binary_win64"}) {
+ if ($vars{"binary_win32"}) {
$vars{"collection-wintools"} = 1;
} else {
$vars{"collection-wintools"} = 0;
@@ -371,7 +371,7 @@
select_scheme($vars{'selected_scheme'});
- if ($vars{"binary_win32"} || $vars{"binary_win64"}) {
+ if ($vars{"binary_win32"}) {
$vars{"collection-wintools"} = 1;
} else {
$vars{"collection-wintools"} = 0;
Modified: trunk/Master/tlpkg/installer/tl-cmd.bat
===================================================================
--- trunk/Master/tlpkg/installer/tl-cmd.bat 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/installer/tl-cmd.bat 2022-04-18 05:58:07 UTC (rev 63068)
@@ -8,7 +8,6 @@
@echo off
setlocal enableextensions
-rem TODO need to fix for win64 !!!!
rem Add bin dir to beginning of PATH only if it is not already there
for /f "tokens=1,2 delims=;" %%I in ("%~dp0..\..\bin\win32;%PATH%") do if not "%%~fI"=="%%~fJ" set "PATH=%%~fI;%PATH%"
Modified: trunk/Master/tlpkg/installer/tl-tray-menu.ini
===================================================================
--- trunk/Master/tlpkg/installer/tl-tray-menu.ini 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/installer/tl-tray-menu.ini 2022-04-18 05:58:07 UTC (rev 63068)
@@ -25,4 +25,4 @@
;Your own choice of portable editor:
;&My editor=..\my_editor\my_editor.exe
Notepad="%windir%\system32\notepad.exe"
-&Command Prompt=cmd /k "title TeX Live"
+&Command Prompt=cmd /k "title TeX Live"
\ No newline at end of file
Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds 2022-04-18 05:56:58 UTC (rev 63067)
+++ trunk/Master/tlpkg/libexec/ctan2tds 2022-04-18 05:58:07 UTC (rev 63068)
@@ -4401,7 +4401,7 @@
my $platdir = "$TOPDEST/bin/$p";
&xmkdir ($platdir);
#
- if (($p ne "win32") && ($p ne "win64")) {
+ if ($p ne "win32") {
my $linktarget = "../../$DEST_TREE/scripts/$package/$s";
&SYSTEM ("ln -s $linktarget $platdir/$linkname");
#
@@ -6250,7 +6250,6 @@
# biber uses different platform names.
my %tl_platform = (
"MSWIN32" => "win32",
- "MSWIN64" => "win64",
"amd64-freebsd" => "amd64-freebsd",
"cygwin32" => "i386-cygwin",
"cygwin64" => "x86_64-cygwin",
@@ -6398,9 +6397,7 @@
# Build linked_scripts dir. The executables are cherry-picked from
# ConTeXt's stubs directory.
my $w32_bindir = "$TOPDEST/bin/win32";
- my $w64_bindir = "$TOPDEST/bin/win64";
&xmkdir ($w32_bindir);
- &xmkdir ($w64_bindir);
#
my $pkg_subdir = "stubs/unix"; # where hans keeps them
&xchdir ("$DEST/scripts/$package/$pkg_subdir");
@@ -6411,13 +6408,11 @@
&bindirs_symlink ($exec);
&build_scripts_copy ($exec, $pkg_subdir);
&SYSTEM ("$CP ../mswin/$exec.exe $w32_bindir/");
- &SYSTEM ("$CP ../mswin/$exec.exe $w64_bindir/");
push (@exec, $exec);
}
# mtxrun on Windows needs more than just the .exe.
&xchdir ("../mswin");
&SYSTEM ("$CP mtxrun.dll mtxrun.lua $w32_bindir/");
- &SYSTEM ("$CP mtxrun.dll mtxrun.lua $w64_bindir/");
print "still POST$package - man pages\n";
&xchdir ("$DEST/doc/$package/scripts");
@@ -6457,7 +6452,6 @@
chomp (my @platforms = `cd $Master/bin && ls`);
for my $p (@platforms) {
next if $p eq "win32"; # windows handled separately
- next if $p eq "win64"; # windows handled separately
next if $p eq "man"; # non-platform pain
my $platdir = "$TOPDEST/bin/$p";
&xmkdir ($platdir);
@@ -6971,7 +6965,6 @@
# commonalities doesn't make sense. Sigh.
print "POST$package - user-level executables\n";
my $w32_bindir = "$TOPDEST/bin/win32";
- my $w64_bindir = "$TOPDEST/bin/win64";
&xmkdir ($w32_bindir);
#
my $pkg_subdir = "perl"; # where hans keeps it
@@ -6989,7 +6982,6 @@
my $build_tldir = "texk/texlive";
my $w32_wrapper = "$Build/$build_tldir/w32_wrapper/runscript.exe";
&SYSTEM ("$CP $w32_wrapper $w32_bindir/mptopdf.exe");
- &SYSTEM ("$CP $w32_wrapper $w64_bindir/mptopdf.exe");
#
print "still POST$package - man page\n";
&xchdir ("$DEST/doc/context/scripts/mkii");
More information about the tex-live-commits
mailing list.