summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x[-rw-r--r--]Master/source/tlgui/tltcl/tcl8.6.11-src.tar.gz (renamed from Master/source/tlgui/tltcl/tcl8.6.10.tar.gz)bin10144235 -> 10259009 bytes
-rw-r--r--Master/source/tlgui/tltcl/tk8.6.10.tar.gzbin4444764 -> 0 bytes
-rwxr-xr-xMaster/source/tlgui/tltcl/tk8.6.11-src.tar.gzbin0 -> 4496914 bytes
-rw-r--r--Master/source/tlgui/tltcl/tltcl.README48
4 files changed, 23 insertions, 25 deletions
diff --git a/Master/source/tlgui/tltcl/tcl8.6.10.tar.gz b/Master/source/tlgui/tltcl/tcl8.6.11-src.tar.gz
index b34ba452e1c..4cc866c692e 100644..100755
--- a/Master/source/tlgui/tltcl/tcl8.6.10.tar.gz
+++ b/Master/source/tlgui/tltcl/tcl8.6.11-src.tar.gz
Binary files differ
diff --git a/Master/source/tlgui/tltcl/tk8.6.10.tar.gz b/Master/source/tlgui/tltcl/tk8.6.10.tar.gz
deleted file mode 100644
index 53d1d1c8d9b..00000000000
--- a/Master/source/tlgui/tltcl/tk8.6.10.tar.gz
+++ /dev/null
Binary files differ
diff --git a/Master/source/tlgui/tltcl/tk8.6.11-src.tar.gz b/Master/source/tlgui/tltcl/tk8.6.11-src.tar.gz
new file mode 100755
index 00000000000..ffe8b8de55a
--- /dev/null
+++ b/Master/source/tlgui/tltcl/tk8.6.11-src.tar.gz
Binary files differ
diff --git a/Master/source/tlgui/tltcl/tltcl.README b/Master/source/tlgui/tltcl/tltcl.README
index 5e56317b407..a4e90bcde40 100644
--- a/Master/source/tlgui/tltcl/tltcl.README
+++ b/Master/source/tlgui/tltcl/tltcl.README
@@ -1,42 +1,40 @@
-Notes on building Tcl/Tk for TeX Live 2020
+Notes on building Tcl/Tk for TeX Live 2021
-The 2020 edition contains a standard basic Tcl/Tk installation.
-However, I was unable this time to create a single-file Tcl/Tk
-runtime, as for the 2019 TeX Live edition.
+The 2021 edition contains a subset of a basic Tcl/Tk installation.
-The Tcl/Tk 8.6.10 sources were downloaded via
+The Tcl/Tk 8.6.11 sources were downloaded via
http://www.tcl.tk/software/tcltk/download.html
-Tcl/Tk was cross-compiled under Ubuntu Linux 18.04 as follows. For
-first Tcl, then Tk do:
+Tcl/Tk was cross-compiled under ArchLinux (5.11.1-arch1-1) as follows.
-- Unpack the source, and run in the win subdirectory:
-
- ./configure --host=i686-w64-mingw32 --enable-embedded-manifest \
- --prefix=<tcltk root>
-
-- For Tk, patch the file tk8.6.10/win/win/wish.exe.manifest for
+First,patch the file tk8.6.11/win/wish.exe.manifest.in for
better HiPDI support by adding a dpiAwareness element; the
asmv3:windowsSettings element in this file becomes:
- <asmv3:windowsSettings
- xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
- <dpiAware>true</dpiAware>
- <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
- </asmv3:windowsSettings>
+<asmv3:windowsSettings
+ xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+</asmv3:windowsSettings>
- Presumably I could instead have patched wish.exe.manifest.in
- _before_ running configure.
+Create or choose a root for the installation. Do for Tcl and Tk successively:
-- run 'make' and 'make install'
+- Unpack the source, and run in the win subdirectory:
+ ./configure --host=i686-w64-mingw32 --enable-embedded-manifest \
+ --prefix=<tcltk root>
make
make install
-Portability of the result should be no problem. I removed
-sqlite3_analyzer from <tcltk root>/bin and placed the resulting lib-
-and bin subdirectories under <TL root>/tlpkg/tltcl.
+Portability of the result should be no problem.
+
+For a smaller installation, I stripped all the .exe- and .dll files.
+I removed sqlite3_analyzer from <tcltk root>/bin and copied
+tclsh86.exe and wish86.exe to tclsh.exe and wish.exe respectively.
+I placed just the resulting lib- and bin subdirectories under
+<TL root>/tlpkg/tltcl, omitting the include- and share
+subdirectories.
Siep Kroonenberg
-March 2020
+March 2021