update installer

knossos-project · Mar 18, 2017 · 5221257 · 5221257
1 parent 4c1526b
commit 5221257
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/installer/wix/bundle.wxs b/installer/wix/bundle.wxs
@@ -2,24 +2,24 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'
   xmlns:util='http://schemas.microsoft.com/wix/UtilExtension'
   xmlns:bal='http://schemas.microsoft.com/wix/BalExtension'>
-  <?define Version='5.0'?>
+  <?define Version='5.0.1'?>
 <!-- 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://www.gnu.org/licenses/old-licenses/gpl-2.0.txt'
-        LogoFile='64x64.png'
+        LogoFile='../64x64.png'
         ShowVersion='yes'
         ThemeFile='HyperlinkTheme.xml'
         />
     </BootstrapperApplicationRef>
-    <Variable Name='InstallFolder' Type='string' Value='[ProgramFiles64Folder]MPIN\KNOSSOS 5.0'/>
+    <Variable Name='InstallFolder' Type='string' Value='[ProgramFiles64Folder]MPIN\KNOSSOS $(var.Version)'/>
     <Variable Name="LocalPythonCheckbox" Value="1"/>
     <Variable Name="LocalDesktopShortcutCheckbox" Value="1"/>
 
@@ -56,5 +56,4 @@
         InstallCondition='NOT PYTHONVERSION AND LocalPythonCheckbox = "1"' />
     </PackageGroup> 
   </Fragment> 
-
-</Wix>
+</Wix>
diff --git a/installer/wix/create-installer.sh b/installer/wix/create-installer.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
+export PATH="/c/Program Files (x86)/WiX Toolset v3.11/bin":$PATH$
 candle knossos.wxs && light knossos.wixobj
 candle bundle.wxs -ext WixBalExtension -ext WixUtilExtension && light bundle.wixobj -ext WixBalExtension
-
-#signing process:
-#insignia -ib bundle.exe -o engine.exe
-# ... sign engine.exe with e.g. signtool engine.exe
-#insignia -ab engine.exe bundle.exe -o bundle.exe
-# ... sign bundle.exe with e.g. signtool bundle.exe
+insignia.exe -ib bundle.exe -o engine.exe
+read -n1 -r -p "sign engine.exe  then press a key"
+insignia -ab engine.exe bundle.exe -o bundle.exe
+read -n1 -r -p "sign bundle.exe  then press a key"
diff --git a/installer/wix/knossos.wxs b/installer/wix/knossos.wxs
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 
-  <?define Version='5.0'?>
+  <?define Version='5.0.1'?>
 <!-- Windows installer considers 1.0.0.0 to be equal to 1.0.0.1 -->
 
 <!-- Product ID should be Id='*' so it will be auto generated when creating a new installer
@@ -45,12 +45,12 @@ Upgrade Code should remain always the same! -->
     <DirectoryRef Id='ApplicationProgramsFolder'>
       <Component Id='AppShortcut' Win64='yes' Guid='08c32753-d431-4755-ab2f-807064fc4159'>
         <Condition>INSTALLSHORTCUT = "1"</Condition>
-        <RegistryValue Root='HKCU' Key='Software\MPImF\KNOSSOS' Name='shortcut' Type='integer' Value='1' KeyPath='yes'/>
+        <RegistryValue Root='HKCU' Key='Software\MPIN\KNOSSOS' Name='shortcut' Type='integer' Value='1' KeyPath='yes'/>
             <Shortcut Id='desktopKNOSSOS'
             Directory='DesktopFolder'
             Name='KNOSSOS'
             WorkingDirectory='INSTALLDIR'
-            Icon='knossos64.exe'
+            Icon='knossos.exe'
             Target='[INSTALLDIR]knossos.exe'
             IconIndex='0'
             Advertise='no' />
@@ -59,13 +59,12 @@ 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='win64-standalone-KNSOSSOS.5.0.exe' KeyPath='yes'>
+        <File Id='knossos.exe' Name='knossos.exe' Source='win.standalone.KNOSSOS-5.0.1.exe' KeyPath='yes'>
           <Shortcut Id='ApplicationStartMenuShortcut'
             Directory='ApplicationProgramsFolder'
-            Name='KNOSSOS' 
-            Description='tell me'
+            Name='KNOSSOS'
             WorkingDirectory='INSTALLDIR'
-            Icon='knossos64.exe' 
+            Icon='knossos.exe' 
             Advertise='yes' />
         </File>
         <RegistryValue Root='HKLM' Key='Software\MPIN\KNOSSOS' Name='InstallLocation' Type='string' Value='[INSTALLDIR]' />
@@ -85,7 +84,7 @@ Upgrade Code should remain always the same! -->
       <ComponentRef Id='AppShortcut' />
       <ComponentRef Id='ApplicationShortcut' />
     </Feature>
-    <Icon Id='knossos64.exe' SourceFile='logo.ico' />
-    <Property Id="ARPPRODUCTICON" Value="knossos64.exe" />
+    <Icon Id='knossos.exe' SourceFile='../logo.ico' />
+    <Property Id="ARPPRODUCTICON" Value="knossos.exe" />
   </Product>
-</Wix>
+</Wix>