From 30b963bb39936ec18110c895cc3f81d6597608f6 Mon Sep 17 00:00:00 2001
From: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Sun, 22 May 2022 19:43:11 -0400
Subject: [PATCH] Only include bindist-related files in cryptol.msi

Previously, we would include every file in the current `cryptol` checkout in
`cryptol.msi`, which would result in horribly bloated installer files. We now
only include those files under the `dist` directory (created by
`.github/ci.sh bundle_files`), which curates only those files we want to
include in a binary distribution.

While I was in town, I modified the conventioned used in `win32/cryptol.wxs`
so that we no longer need to reference `dist`, which does not show up in
`.tar.gz`-based bindists.

Fixes #977.
---
 .github/wix.ps1   | 6 +++---
 win32/cryptol.wxs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/wix.ps1 b/.github/wix.ps1
index 9636f3e7..67b1d0d1 100644
--- a/.github/wix.ps1
+++ b/.github/wix.ps1
@@ -1,4 +1,4 @@
-& "$env:WIX\bin\heat.exe" dir "$pwd" -o allfiles.wxs -nologo -var var.pkg -ag -wixvar -cg ALLFILES -srd -dr INSTALLDIR -sfrag
-& "$env:WIX\bin\candle.exe" -ext WixUIExtension -ext WixUtilExtension -dversion="$env:VERSION" -dpkg="$pwd" win32\cryptol.wxs
-& "$env:WIX\bin\candle.exe" -ext WixUIExtension -ext WixUtilExtension -dversion="$env:VERSION" -dpkg="$pwd" allfiles.wxs
+& "$env:WIX\bin\heat.exe" dir "$pwd/dist" -o allfiles.wxs -nologo -var var.pkg -ag -wixvar -cg ALLFILES -srd -dr INSTALLDIR -sfrag
+& "$env:WIX\bin\candle.exe" -ext WixUIExtension -ext WixUtilExtension -dversion="$env:VERSION" win32\cryptol.wxs
+& "$env:WIX\bin\candle.exe" -ext WixUIExtension -ext WixUtilExtension -dversion="$env:VERSION" -dpkg="$pwd/dist" allfiles.wxs
 & "$env:WIX\bin\light.exe" -ext WixUIExtension -ext WixUtilExtension -sval -o cryptol.msi cryptol.wixobj allfiles.wixobj
diff --git a/win32/cryptol.wxs b/win32/cryptol.wxs
index bb5c1f43..732637f3 100644
--- a/win32/cryptol.wxs
+++ b/win32/cryptol.wxs
@@ -32,7 +32,7 @@
             <Shortcut Id="startmenuCryptol"
                       Name="Cryptol $(var.version)"
                       WorkingDirectory='INSTALLDIR'
-                      Target="[INSTALLDIR]\dist\bin\cryptol.exe"
+                      Target="[INSTALLDIR]\bin\cryptol.exe"
                       Icon="crypto.ico"
                       IconIndex="0" />
             <!-- <Shortcut Id="startmenuTutorial" -->
@@ -56,7 +56,7 @@
 
     <DirectoryRef Id="TARGETDIR">
       <Component Id="Path" Guid="4D7F78E6-DA16-4C1B-96C4-B33C87502C81">
-        <Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]\dist\bin" Permanent="no" Part="last" Action="set" System="no" />
+        <Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]\bin" Permanent="no" Part="last" Action="set" System="no" />
       </Component>
     </DirectoryRef>