From 1b1cdebdd33b5423d86d1cf72e5a57560b47322f Mon Sep 17 00:00:00 2001
From: "Adam C. Foltzer" <acfoltzer@galois.com>
Date: Fri, 15 Jan 2016 11:54:23 -0800
Subject: [PATCH] set user path with Windows installer

Closes #198
---
 Makefile          |  4 ++--
 win32/cryptol.wxs | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ac5d1114..318934b4 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,8 @@ CS_BIN        := $(CS)/bin
 
 # Used only for windows, to find the right Program Files.
 PROGRAM_FILES = Program\ Files\ \(x86\)
-# Windows installer tools; assumes running on Cygwin and using WiX 3.8
-WiX      := /cygdrive/c/${PROGRAM_FILES}/WiX\ Toolset\ v3.8
+# Windows installer tools; assumes running on Cygwin and using WiX 3.10
+WiX      := /cygdrive/c/${PROGRAM_FILES}/WiX\ Toolset\ v3.10
 CANDLE   := ${WiX}/bin/candle.exe
 HEAT     := ${WiX}/bin/heat.exe
 LIGHT    := ${WiX}/bin/light.exe
diff --git a/win32/cryptol.wxs b/win32/cryptol.wxs
index 0a9010ae..732637f3 100644
--- a/win32/cryptol.wxs
+++ b/win32/cryptol.wxs
@@ -22,7 +22,7 @@
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <Directory Id='Galois' Name='Galois'>
           <Directory Id='INSTALLDIR' Name='Cryptol $(var.version)'>
-	  </Directory>
+          </Directory>
         </Directory>
       </Directory>
 
@@ -52,12 +52,18 @@
           </Component>
         </Directory>
       </Directory>
-
     </Directory>
 
+    <DirectoryRef Id="TARGETDIR">
+      <Component Id="Path" Guid="4D7F78E6-DA16-4C1B-96C4-B33C87502C81">
+        <Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]\bin" Permanent="no" Part="last" Action="set" System="no" />
+      </Component>
+    </DirectoryRef>
+
     <Feature Id='Complete' Level='1'>
       <ComponentGroupRef Id='ALLFILES' />
       <ComponentRef Id='Shortcuts' />
+      <ComponentRef Id='Path' />
     </Feature>
 
     <Icon Id="crypto.ico" SourceFile="win32/crypto.ico" />