More WiX porting

bypy/windows/wix-template.xml

@@ -1,6 +1,8 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">		
 
-<Package Name="{app}{x64}" UpgradeCode="{upgrade_code}" Language="1033" Codepage="1252" Version="{version}" Manufacturer="Kovid Goyal" InstallerVersion="300"><SummaryInformation Keywords="Installer" Description="{app} Installer" Manufacturer="Kovid Goyal" />
+    <Package Name="{app}{x64}" UpgradeCode="{upgrade_code}" Language="1033" Codepage="1252" Version="{version}" Manufacturer="Kovid Goyal" InstallerVersion="300" Scope="perMachine">
+
+    <SummaryInformation Keywords="Installer" Description="{app} Installer" Manufacturer="Kovid Goyal" />
 
     <!-- Disable creation of system restore points on calibre installs. Speeds
          up the install. We dont need system restore since we dont install any
@@ -43,6 +45,14 @@
     <!-- <Icon Id="viewer_icon" SourceFile="{viewer_icon}"/> -->
     <!-- <Icon Id="editor_icon" SourceFile="{editor_icon}"/> -->
 
+    <StandardDirectory Id="ProgramFiles64Folder">
+        <Directory Id="APPLICATIONFOLDER" Name="Calibre2" />
+    </StandardDirectory>
+    <StandardDirectory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="{app}{x64} - E-book Management" />
+    </StandardDirectory>
+    <StandardDirectory Id="DesktopFolder" />
+
     <DirectoryRef Id="APPLICATIONFOLDER">
             {app_components}
         <Component Id="AddToPath">
@@ -68,10 +78,10 @@
 
     <DirectoryRef Id="ApplicationProgramsFolder">
         <Component Id="StartMenuShortcuts">
-            <Shortcut Id="s1" Name="{app}{x64} - E-book management" Description="Manage your e-book collection, read or edit your e-books and download news" Target="[#{exe_map[calibre]}]" WorkingDirectory="APPLICATIONROOTDIRECTORY" />
+            <Shortcut Id="s1" Name="{app}{x64} - E-book management" Description="Manage your e-book collection, read or edit your e-books and download news" Target="[#{exe_map[calibre]}]" WorkingDirectory="APPLICATIONFOLDER" />
-            <Shortcut Id="s2" Name="E-book viewer{x64}" Description="Viewer for all the major e-book formats" Target="[#{exe_map[ebook-viewer]}]" WorkingDirectory="APPLICATIONROOTDIRECTORY" />
+            <Shortcut Id="s2" Name="E-book viewer{x64}" Description="Viewer for all the major e-book formats" Target="[#{exe_map[ebook-viewer]}]" WorkingDirectory="APPLICATIONFOLDER" />
-            <Shortcut Id="s4" Name="Edit E-book{x64}" Description="Edit e-books" Target="[#{exe_map[ebook-edit]}]" WorkingDirectory="APPLICATIONROOTDIRECTORY" />
+            <Shortcut Id="s4" Name="Edit E-book{x64}" Description="Edit e-books" Target="[#{exe_map[ebook-edit]}]" WorkingDirectory="APPLICATIONFOLDER" />
-            <Shortcut Id="s3" Name="LRF viewer{x64}" Description="Viewer for LRF format e-books" Target="[#{exe_map[lrfviewer]}]" WorkingDirectory="APPLICATIONROOTDIRECTORY" />
+            <Shortcut Id="s3" Name="LRF viewer{x64}" Description="Viewer for LRF format e-books" Target="[#{exe_map[lrfviewer]}]" WorkingDirectory="APPLICATIONFOLDER" />
             <util:InternetShortcut Id="OnlineDocumentationShortcut" Name="User Manual" Type="url" Target="https://manual.calibre-ebook.com" />
             <util:InternetShortcut Id="GetInvolvedS" Name="Get Involved" Type="url" Target="https://calibre-ebook.com/get-involved" />
 
@@ -82,7 +92,7 @@
 
     <StandardDirectory Id="DesktopFolder">
         <Component Id="DesktopShortcut">
-            <Shortcut Id="ds1" Name="{app}{x64} - E-book management" Description="Manage your e-book collection, read or edit your e-books and download news" Target="[#{exe_map[calibre]}]" WorkingDirectory="APPLICATIONROOTDIRECTORY" />
+            <Shortcut Id="ds1" Name="{app}{x64} - E-book management" Description="Manage your e-book collection, read or edit your e-books and download news" Target="[#{exe_map[calibre]}]" WorkingDirectory="APPLICATIONFOLDER" />
             <RegistryValue Root="HKCU" Key="Software\Microsoft\{app}{x64}" Name="desktop_shortcut_installed" Type="integer" Value="1" KeyPath="yes" />
         </Component> 
     </StandardDirectory>
@@ -146,16 +156,12 @@
     </UI>
 
     <!-- 
-    Set default folder name and allow only per machine installs.
+        Set default folder name. For a per-machine installation, the default
-    For a per-machine installation, the default installation location
+        installation location will be [ProgramFilesFolder][ApplicationFolderName]
-    will be [ProgramFilesFolder][ApplicationFolderName] and the user
+        and the user will be able to change it in the setup UI.
-    will be able to change it in the setup UI. This is no longer necessary
-    (i.e. per user installs should work) but left this way as I
-    dont want to deal with the complications 
     -->
     <Property Id="ApplicationFolderName" Value="Calibre2" />
     <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
-    <Property Id="ALLUSERS" Value="1" />
     <WixVariable Id="WixUISupportPerUser" Value="0" />
 
     <!-- Add option to launch calibre after install -->
@@ -165,12 +171,5 @@
     <CustomAction Id="LaunchApplication" DllEntry="WixShellExec" Impersonate="yes" BinaryRef="Wix4UtilCA_X86" />
 
 
-    <StandardDirectory Id="ProgramFiles64Folder">
-        <Directory Id="APPLICATIONFOLDER" Name="Calibre2" />
-    </StandardDirectory>
-    <StandardDirectory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="{app}{x64} - E-book Management" />
-    </StandardDirectory>
-    <StandardDirectory Id="DesktopFolder" />
     </Package>
 </Wix>