From 9d3ae8109fdc7c115eed95e0a9b18a3bf9d28ed6 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Tue, 2 Apr 2024 21:54:34 +0100
Subject: [PATCH] Bundle TCL init scripts with Windows installer

---
 contrib/msi/genlibs.py       | 29 +++++++++++++++++++++++++++++
 contrib/msi/installer.wxs.in |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/contrib/msi/genlibs.py b/contrib/msi/genlibs.py
index 8fcc2f6b..046d9a07 100644
--- a/contrib/msi/genlibs.py
+++ b/contrib/msi/genlibs.py
@@ -3,10 +3,12 @@ import subprocess
 import sys
 import os
 import uuid
+from glob import glob
 
 print("<?xml version=\"1.0\" encoding=\"utf-8\"?>")
 print("<Wix xmlns=\"http://schemas.microsoft.com/wix/2006/wi\">")
 print("<Fragment Id=\"LibsFragment\">")
+
 print("<DirectoryRef Id=\"BIN\">")
 
 wprefix = os.getenv("MSYSTEM_PREFIX")
@@ -40,11 +42,38 @@ for d in dlls:
     print("</Component>")
 
 print("</DirectoryRef>")
+
+print("<DirectoryRef Id=\"TCL\">")
+
+tcl = glob(wprefix + "\\lib\\tcl8.6\\*")
+tcl.sort()
+
+for t in tcl:
+    if os.path.isdir(t):
+        pass
+    else:
+        base = os.path.basename(t)
+        ref = get_ref(t)
+        print(f"<Component Id=\"{ref}\" Win64=\"yes\" DiskId=\"1\"")
+        print(f"           Guid=\"{uuid.uuid3(uuid.NAMESPACE_OID, base)}\">")
+        print(f"  <File Id=\"{ref}\" Name=\"{base}\"")
+        print(f"        Source=\"{t}\" />")
+        print("</Component>")
+
+
+print("</DirectoryRef>")
+
 print("<ComponentGroup Id=\"LIBS\">")
 
 for d in dlls:
     print(f"<ComponentRef Id=\"{get_ref(d)}\" />")
 
+for t in tcl:
+    if os.path.isdir(t):
+        pass
+    else:
+        print(f"<ComponentRef Id=\"{get_ref(t)}\" />")
+
 print("</ComponentGroup>")
 print("</Fragment>")
 print("</Wix>")
diff --git a/contrib/msi/installer.wxs.in b/contrib/msi/installer.wxs.in
index 2dcf8469..f7e52c90 100644
--- a/contrib/msi/installer.wxs.in
+++ b/contrib/msi/installer.wxs.in
@@ -34,6 +34,8 @@
             </Component>
           </Directory>
           <Directory Id="LIB" Name="lib">
+            <Directory Id="TCL" Name="tcl8.6">
+            </Directory>
             <Directory Id="NVC" Name="nvc">
               <Component Win64="yes" Id="LIBNVCIMP.A" DiskId="1"
                          Guid="4AA37250-6FCE-4718-9C5A-F269A5AD62D0">
-- 
2.39.2