Inverted checkboxes in WiX installer and other minor fixes

knossos-project · Jan 18, 2017 · 0f4ccf7 · 0f4ccf7
1 parent 32fceb3
commit 0f4ccf7
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 21 deletions.
diff --git a/installer/wix/HyperlinkTheme.xml b/installer/wix/HyperlinkTheme.xml
@@ -31,8 +31,8 @@
         <Editbox Name="FolderEditbox" X="11" Y="143" Width="-91" Height="21" TabStop="yes" FontId="3" FileSystemAutoComplete="yes" />
         <Button Name="BrowseButton" X="-11" Y="142" Width="75" Height="23" TabStop="yes" FontId="3">#(loc.OptionsBrowseButton)</Button>
 
-        <Checkbox Name="LocalPythonCheckbox" X="11" Y="170" Width="260" Height="17" TabStop="yes" FontId="3">Don't install Python 2.7.13</Checkbox> 
-        <Checkbox Name="LocalDesktopShortcutCheckbox" X="11" Y="193" Width="260" Height="17" TabStop="yes" FontId="3">Don't create Desktop Shortcut</Checkbox>
+        <Checkbox Name="LocalPythonCheckbox" X="11" Y="170" Width="260" Height="17" TabStop="yes" FontId="3">Install Python 2.7.13</Checkbox> 
+        <Checkbox Name="LocalDesktopShortcutCheckbox" X="11" Y="193" Width="260" Height="17" TabStop="yes" FontId="3">Create Desktop Shortcut</Checkbox>
 
         <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsOkButton)</Button>
         <Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsCancelButton)</Button>
@@ -64,7 +64,7 @@
     <Page Name="Success">
         <Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
         <Text Name="SuccessInstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader)</Text>
-        <Text Name="SuccessRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text> 	
+        <Text Name="SuccessRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>  
         <Text Name="SuccessUninstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text> 
         <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
         <Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
@@ -75,11 +75,11 @@
         <Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
         <Text Name="FailureInstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
         <Text Name="FailureUninstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
-        <Text Name="FailureRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>	
+        <Text Name="FailureRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>  
         <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
         <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
         <Text Name="FailureRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
         <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
         <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
     </Page>
-</Theme>
+</Theme>
diff --git a/installer/wix/bundle.wxs b/installer/wix/bundle.wxs
@@ -6,27 +6,29 @@
 <!-- Windows installer considers 1.0.0.0 to be equal to 1.0.0.1 -->
   <Bundle Version='$(var.Version)' 
     UpgradeCode='b836aaf3-c2dd-4976-b28d-2836865657eb'
-    IconSourceFile='../logo.ico' 
+    IconSourceFile='logo.ico' 
     AboutUrl='https://knossostool.org'
     Manufacturer='Max-Planck-Gesellschaft zur Förderung der Wissenschaften e.V.'
     Copyright='Copyright © Max-Planck-Gesellschaft zur Förderung der Wissenschaften e.V.. All rights reserved.'
     Name='KNOSSOS $(var.Version)'>
     <BootstrapperApplicationRef Id='WixStandardBootstrapperApplication.HyperlinkLargeLicense'>
       <bal:WixStandardBootstrapperApplication
-        LicenseUrl='https://github.com/knossos-project/knossos/blob/master/LICENSE.txt'
-        LogoFile='../64x64.png'
+        LicenseUrl='https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt'
+        LogoFile='64x64.png'
         ShowVersion='yes'
         ThemeFile='HyperlinkTheme.xml'
         />
     </BootstrapperApplicationRef>
-    <Variable Name='InstallFolder' Type='string' Value='[ProgramFilesFolder]'/>
+    <Variable Name='InstallFolder' Type='string' Value='[ProgramFiles64Folder]MPIN\KNOSSOS 5.0'/>
+    <Variable Name="LocalPythonCheckbox" Value="1"/>
+    <Variable Name="LocalDesktopShortcutCheckbox" Value="1"/>
 
     <Chain>
       <PackageGroupRef Id='Python27' />
       <!-- Visible='no' so only the bundle appears in ARP and we uninstall the bundle and not only the .msi  -->
       <MsiPackage Id='MainExecutable' SourceFile='knossos.msi' Visible='no'>
-        <MsiProperty Name='INSTALLLOCATION' Value='[InstallFolder]' />
-        <MsiProperty Name='DONTINSTALLSHORTCUT' Value='[LocalDesktopShortcutCheckbox]' />
+        <MsiProperty Name='INSTALLDIR' Value='[InstallFolder]' />
+        <MsiProperty Name='INSTALLSHORTCUT' Value='[LocalDesktopShortcutCheckbox]' />
       </MsiPackage>
 
     </Chain>
@@ -51,8 +53,8 @@
         Name='python-2.7.13.amd64.msi' 
         SourceFile='python-2.7.13.amd64.msi'
         EnableFeatureSelection='yes'
-        InstallCondition='NOT PYTHONVERSION AND NOT LocalPythonCheckbox' />
+        InstallCondition='NOT PYTHONVERSION AND LocalPythonCheckbox = "1"' />
     </PackageGroup> 
   </Fragment> 
 
-</Wix>
+</Wix>
diff --git a/installer/wix/knossos.wxs b/installer/wix/knossos.wxs
@@ -33,9 +33,7 @@ Upgrade Code should remain always the same! -->
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder'>
-        <Directory Id='mpi' Name='MPImF'>
-          <Directory Id='INSTALLDIR' Name='KNOSSOS $(var.Version)'>
-          </Directory>
+        <Directory Id='INSTALLDIR' Name='KNOSSOS $(var.Version)'>
         </Directory>
         <Directory Id='ProgramMenuFolder'>
           <Directory Id='ApplicationProgramsFolder' Name='KNOSSOS'/>
@@ -46,7 +44,7 @@ Upgrade Code should remain always the same! -->
 
     <DirectoryRef Id='ApplicationProgramsFolder'>
       <Component Id='AppShortcut' Win64='yes' Guid='08c32753-d431-4755-ab2f-807064fc4159'>
-        <Condition>NOT DONTINSTALLSHORTCUT</Condition>
+        <Condition>INSTALLSHORTCUT = "1"</Condition>
         <RegistryValue Root='HKCU' Key='Software\MPImF\KNOSSOS' Name='shortcut' Type='integer' Value='1' KeyPath='yes'/>
             <Shortcut Id='desktopKNOSSOS'
             Directory='DesktopFolder'
@@ -61,7 +59,7 @@ Upgrade Code should remain always the same! -->
 
     <DirectoryRef Id='INSTALLDIR'>
       <Component Id='MainExecutable' Win64='yes' Guid='b836aaf3-c2dd-4976-b28d-2836865657eb'>
-        <File Id='knossos.exe' Name='knossos.exe' Source='knossos64.exe' KeyPath='yes'>
+        <File Id='knossos.exe' Name='knossos.exe' Source='win64-standalone-KNSOSSOS.5.0.exe' KeyPath='yes'>
           <Shortcut Id='ApplicationStartMenuShortcut'
             Directory='ApplicationProgramsFolder'
             Name='KNOSSOS' 
@@ -70,14 +68,24 @@ Upgrade Code should remain always the same! -->
             Icon='knossos64.exe' 
             Advertise='yes' />
         </File>
+        <RegistryValue Root='HKLM' Key='Software\MPIN\KNOSSOS' Name='InstallLocation' Type='string' Value='[INSTALLDIR]' />
+        <RemoveFolder Id='INSTALLDIR' On='uninstall'/>
       </Component>
     </DirectoryRef>
 
+    <DirectoryRef Id='ApplicationProgramsFolder'>
+      <Component Id='ApplicationShortcut' Win64='yes' Guid='a836aaf3-c2dd-4976-b28d-2836865657eb'>
+        <RemoveFolder Id='ApplicationProgramsFolder' On='uninstall'/>
+        <RegistryValue Root='HKCU' Key='Software\MPIN\KNOSSOS' Name='installed' Type='integer' Value='1' KeyPath='yes'/>
+     </Component>
+    </DirectoryRef>
+
     <Feature Id='Complete' Level='1'>
       <ComponentRef Id='MainExecutable' />
       <ComponentRef Id='AppShortcut' />
+      <ComponentRef Id='ApplicationShortcut' />
     </Feature>
-    <Icon Id='knossos64.exe' SourceFile='../logo.ico' />
-    <Property Id="ARPPRODUCTICON" Value="knossos64.exe" /> 
+    <Icon Id='knossos64.exe' SourceFile='logo.ico' />
+    <Property Id="ARPPRODUCTICON" Value="knossos64.exe" />
   </Product>
-</Wix>
+</Wix>