From 1d9d8a6a90edd716553877ec1c2c971e388105fe Mon Sep 17 00:00:00 2001
From: Fyodor Sheremetyev <sheremetyev@gmail.com>
Date: Wed, 13 Feb 2013 00:19:35 +0400
Subject: Install Pandoc per-user on Windows.

---
 windows/pandoc.wxs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'windows')

diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index 1e391d14a..cfce6eda8 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -4,7 +4,7 @@
   UpgradeCode="A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562" Name="Pandoc $(var.VERSION)"
   Version="$(var.VERSION)" Manufacturer="John MacFarlane"
   Language="1033">
-    <Package InstallerVersion="200" Compressed="yes"
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perUser"
     Comments="Windows Installer Package" />
     <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
     <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
@@ -22,10 +22,13 @@
       <Directory Id="ProgramMenuFolder">
         <Directory Id="ApplicationProgramsFolder" Name="Pandoc"/>
       </Directory>
-      <Directory Id="ProgramFilesFolder">
+      <Directory Id="LocalAppDataFolder">
         <Directory Id="INSTALLDIR" Name="Pandoc">
           <Component Id="MainExecutable"
-          Guid="ECD35082-4C28-49E1-977E-B90FC7C400C7" KeyPath="yes">
+          Guid="ECD35082-4C28-49E1-977E-B90FC7C400C7">
+            <RegistryValue Root="HKCU" Key="Software\John MacFarlane\Pandoc"
+            Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
+            <RemoveFolder Id="INSTALLDIR" On="uninstall"/>
             <File Id="pandocEXE" Name="pandoc.exe"
             Source="..\cabal-dev\bin\pandoc.exe" />
             <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
@@ -33,10 +36,12 @@
             <File Id="pandocCOPYING" Name="COPYING.rtf"
             Source="..\COPYING.rtf" />
             <Environment Id="UpdatePath" Name="PATH" Action="set"
-		    Part="last" System="yes" Value="[INSTALLDIR]" />
+		    Part="last" Value="[INSTALLDIR]" />
           </Component>
           <Component Id="Documentation"
-          Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3" KeyPath="yes">
+          Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3">
+            <RegistryValue Root="HKCU" Key="Software\John MacFarlane\Pandoc"
+            Name="DocumentationInstalled" Type="integer" Value="1" KeyPath="yes"/>
             <File Id="pandocREADME" Name="Pandoc User's Guide.html"
             Source="..\README.html" />
           </Component>
@@ -51,7 +56,8 @@
 		Target="[INSTALLDIR]Pandoc User's Guide.html"
 	        WorkingDirectory="INSTALLDIR" />
         <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
-        <RegistryValue Root="HKCU" Key="Software\John MacFarlane\Pandoc" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+        <RegistryValue Root="HKCU" Key="Software\John MacFarlane\Pandoc"
+        Name="ShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
       </Component>
     </DirectoryRef>
     <Feature Id="Complete" Level="1" Title="Pandoc $(var.VERSION)" Description="Complete package"  Display="expand" ConfigurableDirectory="INSTALLDIR">
-- 
cgit v1.2.3


From fec852e181f5cb598c4ff6f2fa30d0d1c945e245 Mon Sep 17 00:00:00 2001
From: Fyodor Sheremetyev <sheremetyev@gmail.com>
Date: Wed, 13 Feb 2013 00:21:09 +0400
Subject: Disable WiX warning LGHT1076 ICE91.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s harmless. http://msdn.microsoft.com/en-us/library/aa369053(VS.85).aspx
---
 windows/make-windows-installer.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'windows')

diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat
index 269458dc3..91a31cfb9 100644
--- a/windows/make-windows-installer.bat
+++ b/windows/make-windows-installer.bat
@@ -26,7 +26,7 @@ cd windows
 echo Creating msi...
 "C:\Program Files\WiX Toolset v3.7\bin\candle.exe" -dVERSION=%VERSION% -ext WixUIExtension pandoc.wxs
 if %errorlevel% neq 0 exit /b %errorlevel%
-"C:\Program Files\WiX Toolset v3.7\bin\light.exe" -ext WixUIExtension -out pandoc-%VERSION%.msi pandoc.wixobj
+"C:\Program Files\WiX Toolset v3.7\bin\light.exe"  -sw1076 -ext WixUIExtension -out pandoc-%VERSION%.msi pandoc.wixobj
 if %errorlevel% neq 0 exit /b %errorlevel%
 echo Starting kSign: sign, then quit kSign to complete the build...
 "C:\Program Files\kSign\kSign.exe"
-- 
cgit v1.2.3


From bf9819585f533af0cec2387d3ef76f7a8e818eed Mon Sep 17 00:00:00 2001
From: Fyodor Sheremetyev <sheremetyev@gmail.com>
Date: Wed, 13 Feb 2013 00:22:15 +0400
Subject: WiX: remove unused reference to Desktop.

---
 windows/pandoc.wxs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'windows')

diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index cfce6eda8..c20b59158 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -18,7 +18,6 @@
       <RemoveExistingProducts After="InstallFinalize"/>
     </InstallExecuteSequence>
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="DesktopFolder" Name="Desktop" />
       <Directory Id="ProgramMenuFolder">
         <Directory Id="ApplicationProgramsFolder" Name="Pandoc"/>
       </Directory>
-- 
cgit v1.2.3


From a65740f7769fdcb0e92d48032f05259b2a00df83 Mon Sep 17 00:00:00 2001
From: Fyodor Sheremetyev <sheremetyev@gmail.com>
Date: Wed, 13 Feb 2013 00:24:31 +0400
Subject: WiX: add product URL to the installation package metadata.

---
 windows/pandoc.wxs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'windows')

diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index c20b59158..9062f10b3 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -14,6 +14,7 @@
 	      Property="PREVIOUSVERSIONSINSTALLED"
 	      IncludeMinimum="yes" IncludeMaximum="no" />
     </Upgrade>
+    <Property Id="ARPURLINFOABOUT" Value="http://johnmacfarlane.net/pandoc/" />
     <InstallExecuteSequence>
       <RemoveExistingProducts After="InstallFinalize"/>
     </InstallExecuteSequence>
-- 
cgit v1.2.3


From 6315161ac2d57a5a2a4b318b489add1a7b0dcf8b Mon Sep 17 00:00:00 2001
From: Fyodor Sheremetyev <sheremetyev@gmail.com>
Date: Wed, 13 Feb 2013 00:32:09 +0400
Subject: WiX: uninstall any previously installed version.

---
 windows/pandoc.wxs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'windows')

diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index 9062f10b3..69b980ad4 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -9,10 +9,9 @@
     <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
     <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
     <Upgrade Id="A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562">
-      <UpgradeVersion
-	      Minimum="0.46.0.0" Maximum="$(var.VERSION)"
-	      Property="PREVIOUSVERSIONSINSTALLED"
-	      IncludeMinimum="yes" IncludeMaximum="no" />
+      <UpgradeVersion Property='PREVIOUSVERSIONSINSTALLED'
+        Minimum='0.0.0.0'  IncludeMinimum='yes'
+        Maximum="99.0.0.0" IncludeMaximum="no" />
     </Upgrade>
     <Property Id="ARPURLINFOABOUT" Value="http://johnmacfarlane.net/pandoc/" />
     <InstallExecuteSequence>
-- 
cgit v1.2.3


From 7fa4fc150374d6d348e6a4c7b0e513b3eb7c1da9 Mon Sep 17 00:00:00 2001
From: Fyodor Sheremetyev <sheremetyev@gmail.com>
Date: Wed, 13 Feb 2013 00:34:45 +0400
Subject: WiX: extract upgrade code into a define to avoid duplication.

---
 windows/pandoc.wxs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'windows')

diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index 69b980ad4..71afa8eb0 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
+<?define UpgradeCode = "A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562" ?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Product Id="*"
-  UpgradeCode="A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562" Name="Pandoc $(var.VERSION)"
+  UpgradeCode="$(var.UpgradeCode)" Name="Pandoc $(var.VERSION)"
   Version="$(var.VERSION)" Manufacturer="John MacFarlane"
   Language="1033">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perUser"
     Comments="Windows Installer Package" />
     <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
     <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
-    <Upgrade Id="A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562">
+    <Upgrade Id="$(var.UpgradeCode)">
       <UpgradeVersion Property='PREVIOUSVERSIONSINSTALLED'
         Minimum='0.0.0.0'  IncludeMinimum='yes'
         Maximum="99.0.0.0" IncludeMaximum="no" />
-- 
cgit v1.2.3