From f201f6cfe15e09e8d152c6b4d8f7c7cb1bb0f7c7 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 10 Dec 2019 06:17:16 +0000 Subject: work on win64 support git-svn-id: svn://tug.org/texlive/trunk@53075 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/installer/install-menu-perltk.pl | 2 +- Master/tlpkg/installer/install-menu-text.pl | 4 ++-- Master/tlpkg/installer/tl-cmd.bat | 1 + Master/tlpkg/installer/tl-tray-menu.ini | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'Master/tlpkg/installer') diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index 3a3aca2f8b9..09ebd661051 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -1160,7 +1160,7 @@ sub callback_select_collection { } sub callback_select_systems() { - if ($vars{"binary_win32"}) { + if ($vars{"binary_win32"} || $vars{"binary_win64"}) { $vars{"collection-wintools"} = 1; } else { $vars{"collection-wintools"} = 0; diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index bef093d075c..f933ea91b47 100644 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -327,7 +327,7 @@ sub binary_menu { print "Unknown command: $answer\n\n"; } } - if ($vars{"binary_win32"}) { + if ($vars{"binary_win32"} || $vars{"binary_win64"}) { $vars{"collection-wintools"} = 1; } else { $vars{"collection-wintools"} = 0; @@ -375,7 +375,7 @@ sub scheme_menu { select_scheme($vars{'selected_scheme'}); - if ($vars{"binary_win32"}) { + if ($vars{"binary_win32"} || $vars{"binary_win64"}) { $vars{"collection-wintools"} = 1; } else { $vars{"collection-wintools"} = 0; diff --git a/Master/tlpkg/installer/tl-cmd.bat b/Master/tlpkg/installer/tl-cmd.bat index 747d3088239..bc9fdc372c4 100755 --- a/Master/tlpkg/installer/tl-cmd.bat +++ b/Master/tlpkg/installer/tl-cmd.bat @@ -8,6 +8,7 @@ rem Public domain @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%" diff --git a/Master/tlpkg/installer/tl-tray-menu.ini b/Master/tlpkg/installer/tl-tray-menu.ini index dcf38226604..1f5f14664be 100644 --- a/Master/tlpkg/installer/tl-tray-menu.ini +++ b/Master/tlpkg/installer/tl-tray-menu.ini @@ -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" \ No newline at end of file +&Command Prompt=cmd /k "title TeX Live" -- cgit v1.2.3