diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs index 083c61d32..fa11d2395 100644 --- a/windows/pandoc.wxs +++ b/windows/pandoc.wxs @@ -1,111 +1,110 @@ -<?xml version="1.0"?> -<?define UpgradeCode = "A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562" ?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <Product Id="*" - 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="$(var.UpgradeCode)"> - <UpgradeVersion Property='PREVIOUSVERSIONSINSTALLED' - Minimum='0.0.0.0' IncludeMinimum='yes' - Maximum="99.0.0.0" IncludeMaximum="no" /> - </Upgrade> - <Property Id="ARPURLINFOABOUT" Value="http://pandoc.org" /> - - <InstallExecuteSequence> - <RemoveExistingProducts After="InstallFinalize"/> - </InstallExecuteSequence> - - <Property Id="DISABLEADVTSHORTCUTS" Value="1" /> - - <CustomAction Id="SetPerUserFolder" Property="APPLICATIONFOLDER" Value="[LocalAppDataFolder]Pandoc" Execute="immediate" /> - <CustomAction Id="SetPerMachineFolder" Property="APPLICATIONFOLDER" Value="[ProgramFilesFolder]Pandoc" Execute="immediate" /> - <InstallExecuteSequence> - <Custom Action="SetPerUserFolder" Before="CostFinalize">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom> - <Custom Action="SetPerMachineFolder" After="SetPerUserFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom> - </InstallExecuteSequence> - <InstallUISequence> - <Custom Action="SetPerUserFolder" Before="CostFinalize">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom> - <Custom Action="SetPerMachineFolder" After="SetPerUserFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom> - </InstallUISequence> - -<CustomActionRef Id="WixBroadcastSettingChange" /> -<CustomActionRef Id="WixBroadcastEnvironmentChange" /> - - <Directory Id="TARGETDIR" Name="SourceDir"> - - <Directory Id="ProgramFilesFolder"> - <Directory Id="APPLICATIONFOLDER" Name="Pandoc"> - <Component Id="MainExecutable" - Guid="ECD35082-4C28-49E1-977E-B90FC7C400C7"> - <RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc" - Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/> - <RemoveFolder Id="APPLICATIONFOLDER" On="uninstall"/> - <File Id="pandocEXE" Name="pandoc.exe" - Source="..\.cabal-sandbox\bin\pandoc.exe" /> - <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt" - Source="..\COPYRIGHT.txt" /> - <File Id="pandocCOPYING" Name="COPYING.rtf" - Source="..\COPYING.rtf" /> - </Component> - - <Component Id="CitationSupport" - Guid="0A214839-2E69-4026-8DBB-0F0A9DB75C12"> - <RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc" - Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/> - <File Id="pandoc_citeprocEXE" Name="pandoc-citeproc.exe" - Source="..\.cabal-sandbox\bin\pandoc-citeproc.exe" /> - </Component> - -<Environment Id='UpdatePath' Name='PATH' Action='set' Permanent='no' System='no' Part='last' Value='[INSTALLDIR]' /> - - <Component Id="Documentation" - Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3"> - <File Id="pandocREADME" Name="Pandoc User's Guide.html" - Source="..\README.html" KeyPath="yes"> - <Shortcut Id="ApplicationStartMenuShortcut" Directory="ApplicationProgramsFolder" - Name="Pandoc User’s Guide" Advertise="yes" /> - </File> - </Component> - </Directory> - </Directory> - - <Directory Id="ProgramMenuFolder"> - <Directory Id="ApplicationProgramsFolder" Name="Pandoc"> - <Component Id="ApplicationShortcut" Guid="7F807DD5-CC54-474A-B571-89630893F563"> - <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/> - <RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc" - Name="ShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/> - </Component> - </Directory> - </Directory> - - </Directory> - - <Feature Id="Complete" Level="1" Title="Pandoc $(var.VERSION)" Description="Complete package" Display="expand" ConfigurableDirectory="APPLICATIONFOLDER"> - <Feature Id="MainProgram" Title="Program" Description="The main executable." Level="1"> - <ComponentRef Id="MainExecutable" /> - <ComponentRef Id="UpdatePathUser" /> - <ComponentRef Id="UpdatePathMachine" /> - </Feature> - <Feature Id="Manual" Title="Manual"> - <ComponentRef Id="Documentation" /> - <ComponentRef Id="ApplicationShortcut" /> - </Feature> - <Feature Id="Citation" Title="Citation Support" Description="Citation support."> - <ComponentRef Id="CitationSupport" /> - </Feature> - </Feature> - - <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" /> - <UIRef Id="WixUI_InstallDir" /> - <UIRef Id="WixUI_ErrorProgressText" /> - <WixVariable Id="WixUILicenseRtf" Value="..\COPYING.rtf" /> - - </Product> -</Wix> +<?xml version="1.0"?> +<?define UpgradeCode = "A68E8EF6-ABB1-4F22-A3C5-68DFDF0AB562" ?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Product Id="*" + 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="$(var.UpgradeCode)"> + <UpgradeVersion Property='PREVIOUSVERSIONSINSTALLED' + Minimum='0.0.0.0' IncludeMinimum='yes' + Maximum="99.0.0.0" IncludeMaximum="no" /> + </Upgrade> + <Property Id="ARPURLINFOABOUT" Value="http://pandoc.org" /> + + <InstallExecuteSequence> + <RemoveExistingProducts After="InstallFinalize"/> + </InstallExecuteSequence> + + <Property Id="DISABLEADVTSHORTCUTS" Value="1" /> + + <CustomAction Id="SetPerUserFolder" Property="APPLICATIONFOLDER" Value="[LocalAppDataFolder]Pandoc" Execute="immediate" /> + <CustomAction Id="SetPerMachineFolder" Property="APPLICATIONFOLDER" Value="[ProgramFilesFolder]Pandoc" Execute="immediate" /> + <InstallExecuteSequence> + <Custom Action="SetPerUserFolder" Before="CostFinalize">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom> + <Custom Action="SetPerMachineFolder" After="SetPerUserFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom> + </InstallExecuteSequence> + <InstallUISequence> + <Custom Action="SetPerUserFolder" Before="CostFinalize">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom> + <Custom Action="SetPerMachineFolder" After="SetPerUserFolder">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom> + </InstallUISequence> + + + <Directory Id="TARGETDIR" Name="SourceDir"> + + <Directory Id="ProgramFilesFolder"> + <Directory Id="APPLICATIONFOLDER" Name="Pandoc"> + <Component Id="MainExecutable" + Guid="ECD35082-4C28-49E1-977E-B90FC7C400C7"> + <RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc" + Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/> + <RemoveFolder Id="APPLICATIONFOLDER" On="uninstall"/> + <File Id="pandocEXE" Name="pandoc.exe" + Source="..\.cabal-sandbox\bin\pandoc.exe" /> + <File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt" + Source="..\COPYRIGHT.txt" /> + <File Id="pandocCOPYING" Name="COPYING.rtf" + Source="..\COPYING.rtf" /> + <Environment Id='UpdatePath' Name='PATH' Action='set' Permanent='no' System='no' Part='last' Value='[APPLICATIONFOLDER]' /> + </Component> + + <Component Id="CitationSupport" + Guid="0A214839-2E69-4026-8DBB-0F0A9DB75C12"> + <RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc" + Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/> + <File Id="pandoc_citeprocEXE" Name="pandoc-citeproc.exe" + Source="..\.cabal-sandbox\bin\pandoc-citeproc.exe" /> + </Component> + + + <Component Id="Documentation" + Guid="A8D54A76-1A3D-4647-8327-81B69D39D8A3"> + <File Id="pandocREADME" Name="Pandoc User's Guide.html" + Source="..\README.html" KeyPath="yes"> + <Shortcut Id="ApplicationStartMenuShortcut" Directory="ApplicationProgramsFolder" + Name="Pandoc User’s Guide" Advertise="yes" /> + </File> + </Component> + </Directory> + </Directory> + + <Directory Id="ProgramMenuFolder"> + <Directory Id="ApplicationProgramsFolder" Name="Pandoc"> + <Component Id="ApplicationShortcut" Guid="7F807DD5-CC54-474A-B571-89630893F563"> + <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/> + <RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc" + Name="ShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/> + </Component> + </Directory> + </Directory> + + </Directory> + + <Feature Id="Complete" Level="1" Title="Pandoc $(var.VERSION)" Description="Complete package" Display="expand" ConfigurableDirectory="APPLICATIONFOLDER"> + <Feature Id="MainProgram" Title="Program" Description="The main executable." Level="1"> + <ComponentRef Id="MainExecutable" /> + </Feature> + <Feature Id="Manual" Title="Manual"> + <ComponentRef Id="Documentation" /> + <ComponentRef Id="ApplicationShortcut" /> + </Feature> + <Feature Id="Citation" Title="Citation Support" Description="Citation support."> + <ComponentRef Id="CitationSupport" /> + </Feature> + </Feature> + + <CustomActionRef Id="WixBroadcastSettingChange" /> + <CustomActionRef Id="WixBroadcastEnvironmentChange" /> + + <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" /> + <UIRef Id="WixUI_InstallDir" /> + <UIRef Id="WixUI_ErrorProgressText" /> + <WixVariable Id="WixUILicenseRtf" Value="..\COPYING.rtf" /> + + </Product> +</Wix>