From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Thu, 31 May 2012 12:23:02 +0000 (+0000)
Subject: Handle Updates a bit better
X-Git-Tag: 2.5.0~72
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=de97bb285010eaf5daf776c1deb92ebd67d62926

Handle Updates a bit better

- Have a separate dialog for updates (allowing us to refactor the current dialog into a separate file)
- Save all user supplied parameters (in case we need them later)
- Set up parameters from these as appropriate for the update case.
- Remove some old cruft from no-longer needed Dialogs

We still have some work to do because an update will sense shibd running and we are about to stop it.
---

diff --git a/msi/WiX/Compile.bat b/msi/WiX/Compile.bat
index da6fd95..f02a0f2 100644
--- a/msi/WiX/Compile.bat
+++ b/msi/WiX/Compile.bat
@@ -16,12 +16,18 @@ candle ShibbolethSP-registry-x86.wxs
 wixcop -indent:2 ShibbolethSP-gui.wxs
 candle ShibbolethSP-gui.wxs
 
+wixcop -indent:2 ShibbolethSP-update-dlg.wxs
+candle ShibbolethSP-update-dlg.wxs
+
+wixcop -indent:2 ShibbolethSP-install-dlg.wxs
+candle ShibbolethSP-install-dlg.wxs
+
 wixcop -indent:2 ShibbolethSP-main-x64.wxs
 candle ShibbolethSP-main-x64.wxs
-light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-gui.wixobj -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
+light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
 
 wixcop -indent:2 ShibbolethSP-main-x86.wxs
 candle ShibbolethSP-main-x86.wxs
-light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x86.msi ShibbolethSP-main-x86.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension
+light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x86.msi ShibbolethSP-main-x86.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension
 
 
diff --git a/msi/WiX/Info.bmp b/msi/WiX/Info.bmp
deleted file mode 100644
index 7e0ff7f..0000000
Binary files a/msi/WiX/Info.bmp and /dev/null differ
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 58fbedb..94bc4fa 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -81,6 +81,9 @@
   <ComponentRef Id='shibd.exe_debug'/>
 
   <!-- ShibbolethSP-registry-x32 -->
+  <ComponentRef Id='TargetDir'/>
+  <ComponentRef Id='InstallShibd'/>
+  <ComponentRef Id='InstallIsapi'/>
   <ComponentRef Id='file_extension'/>
   <ComponentRef Id='shib.ico' />
 </Include>
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index 3f65cc3..6216a82 100644
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -131,7 +131,7 @@
           <ServiceInstall Id='shibd' Name='shibd_Default' 
                           DisplayName='Shibboleth 2 Daemon (Default)' Type='ownProcess' 
                           Start='auto' ErrorControl='ignore' />
-          <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='uninstall'  
+          <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='both'  
                           Remove='uninstall' Start='install' Wait='no' />
         </Component>
         <Directory Id='sbin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >
diff --git a/msi/WiX/ShibbolethSP-gui.wxs b/msi/WiX/ShibbolethSP-gui.wxs
index 2aaf3cc..fde8f37 100644
--- a/msi/WiX/ShibbolethSP-gui.wxs
+++ b/msi/WiX/ShibbolethSP-gui.wxs
@@ -17,7 +17,7 @@
      permissions and limitations under the License.  -->
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->
+  <!-- This file controls the dispaying of the GUI dialogs (both WiX and custom) -->
   <Fragment>
 
     <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
@@ -43,7 +43,6 @@
       <!-- "WixUI_InstallDir includes the following dialogs:" -->
       <DialogRef Id='BrowseDlg' />
       <DialogRef Id='DiskCostDlg' />
-      <DialogRef Id='InstallDirDlg' />
       <DialogRef Id='InvalidDirDlg' />
       <DialogRef Id='LicenseAgreementDlg' />
       <DialogRef Id='WelcomeDlg' />
@@ -67,6 +66,10 @@
       <DialogRef Id='VerifyReadyDlg' />
       <DialogRef Id='WaitForCostingDlg' />
 
+      <!-- We also define two dialogs -->
+      <DialogRef Id='UpdateDlgShib' />
+      <DialogRef Id='InstallDirDlgShib' />
+
       <!-- Text Styles (from Orca) -->
       <TextStyle Id='WixUI_Font_Normal' FaceName='Tahoma' Size='8' />
       <TextStyle Id='WixUI_Font_Bigger' FaceName='Tahoma' Size='12' />
@@ -89,7 +92,10 @@
       <Publish Dialog='MaintenanceWelcomeDlg' Control='Next' Event='NewDialog' Value='MaintenanceTypeDlg'>1</Publish>
 
       <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='LicenseAgreementDlg'>
-        NOT Installed
+        (NOT Installed) AND (NOT ALREADYINSTALLED)
+      </Publish>
+      <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='UpdateDlgShib'>
+        (NOT Installed) AND ALREADYINSTALLED
       </Publish>
       <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='VerifyReadyDlg'>
         Installed AND PATCH
@@ -102,121 +108,15 @@
         Installed AND PATCH
       </Publish>
       <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='InstallDirDlgShib'>
-        NOT Installed
+        (NOT Installed) AND (NOT ALREADYINSTALLED)
+      </Publish>
+      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='UpdateDlgShib'>
+        (NOT Installed) AND ALREADYINSTALLED
       </Publish>
       <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='MaintenanceTypeDlg'>
         Installed AND NOT PATCH
       </Publish>
 
-      <!-- And now the new dialog that we add.  This sets up:
-           INSTALLDIR
-           INSTALL_SHIBD_SERVICE
-           INSTALL_32BIT (if a 64bit machine)
-           INSTALL_ISAPI_FILTER (if IIS about)
-           SHIB_FILE_EXTENSION (if IIS about)
-        -->
-
-      <Dialog Id='InstallDirDlgShib' Width='370' Height='270' Title='[ProductName] Setup'>
-        <!-- Stuff at the top: picture, some text, a line -->
-        <Control Id='TopBitMap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' Text='WixUI_Bmp_Banner' />
-        <Control Id='TopInfo' Type='Text' X='15' Y='6' Width='150' Height='12' 
-                 Text='{\WixUI_Font_Title}Configure Shibboleth' Transparent='yes'/>
-        <Control Id='TopDetailed' Type='Text' X='25' Y='24' Width='320' Height='12' 
-                 Text='Please choose where to install the Shibboleth SP and other installation options' Transparent='yes'/>
-        <Control Id='TopLine' Type='Line' X='0' Y='44' Width='370' Height='1' />
-
-        <!-- Buttons to control Shibboleth Setup -->
-        <Control Id='DescriptionLine1' Type='Text' X='25' Y='51' Height='12' Width='320' 
-                 Text='The files for [ProductName] will be installed in the following folder.'/>
-
-        <Control Id='DescriptionLine2' Type='Text' X='25' Y='70' Height='12' Width='320' 
-                 Text='To install into a different folder, click the Browse button, and select another folder.'/>
-
-        <Control Id='DescriptionLine3' Type='Text' X='25' Y='90' Height='12' Width='320' 
-                 Text='You can choose not to install [ProductName] by clicking Cancel to exit the installer.' />
-
-        <!-- Where? -->
-        <Control Id='Dest' Type='Edit' X='25' Y='115' Width='228' Height='17' Property='INSTALLDIR' Text='[INSTALLDIR]' />
-        <Control Id='ChangeFolder' Type='PushButton' X='265' Y='115' Height='17' Width='56' Text='B&amp;rowse...'>
-          <Publish Event='SpawnDialog' Value='BrowseDlg' Order='1'>1</Publish>
-          <Publish Event='[_BrowseProperty]' Value='[WIXUI_INSTALLDIR]' Order='1'>1</Publish>
-        </Control>
-
-        <!-- Service? -->
-        <Control Id='InstallShibd' Type='CheckBox' X='25' Y='146' Height='17' Width='160' 
-                 Property='INSTALL_SHIBD_SERVICE' CheckBoxValue='TRUE' 
-                 Text='Install Shibd daemon' />
-
-        <!-- 32 Bits? -->
-        <Control Id='Install32Bit' Type='CheckBox' X='185' Y='146' Height='17' Width='160'
-                 Property='INSTALL_32BIT' CheckBoxValue='TRUE' 
-                 Text='32bit defaults'>
-          <Condition Action='show'>IS64BITINSTALL = "TRUE"</Condition>
-          <Condition Action='hide'>IS64BITINSTALL &lt;&gt; "TRUE"</Condition>
-        </Control>
-
-        <!-- ISAPI? -->
-        <Control Id='InstallISAPI' Type='CheckBox' X='25' Y='175' Height='17' Width='160'
-                 Property='INSTALL_ISAPI_FILTER' CheckBoxValue='TRUE' 
-                 Text='Install ISAPI filter and configure IIS'>
-          <Condition Action='show'>IISMAJORVERSION</Condition>
-          <Condition Action='hide'>NOT IISMAJORVERSION</Condition>
-        </Control>
-        <Control Id='FileExtensionText' Type='Text' X='185' Y='178' Height='17' Width='96'
-                 Text='Shibboleth File Extension'>
-          <Condition Action='show'>IISMAJORVERSION</Condition>
-          <Condition Action='hide'>NOT IISMAJORVERSION</Condition>
-        </Control>
-        <Control Id='FileExtensionEdit' Type='Edit' X='285' Y='175' Height='17' Width='50'
-                 Property='SHIB_FILE_EXTENSION' Text='[SHIB_FILE_EXTENSION]'>
-          <Condition Action='show'>IISMAJORVERSION</Condition>
-          <Condition Action='hide'>NOT IISMAJORVERSION</Condition>
-          <Condition Action='enable'>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
-          <Condition Action='disable'>INSTALL_ISAPI_FILTER &lt;&gt; "TRUE"</Condition>
-        </Control>
-
-        <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
-        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='1' />
-        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' Text='&amp;Back'>
-          <Publish  Event='NewDialog' Value='LicenseAgreementDlg'>1</Publish>
-        </Control>
-
-        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Text='&amp;Next' Default='yes'>
-          <Publish Event='SetTargetPath' Value='[WIXUI_INSTALLDIR]'>1</Publish>
-          <Publish Event='DoAction' Value='WixUIValidatePath' >
-            NOT WIXUI_DONTVALIDATEPATH
-          </Publish>
-          <Publish Event='SpawnDialog' Value='InvalidDirDlg' >
-            NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;"1"
-          </Publish>
-          <Publish Event='NewDialog' Value='VerifyReadyDlg'>
-            WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"
-          </Publish>
-        </Control>
-
-        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Text='&amp;Cancel' Cancel='yes'>
-          <Publish  Event='SpawnDialog' Value='CancelDlg'>1</Publish>
-        </Control>
-      </Dialog>
-
-      <Publish Dialog='InstallDirDlg' Control='Back' Event='NewDialog' Value='LicenseAgreementDlg'>1</Publish>
-
-      <Publish Dialog='InstallDirDlg' Control='Next' Event='NewDialog' Value='VerifyReadyDlg' Order='4'>
-        WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"
-      </Publish>
-
-      <Publish Dialog='InstallDirDlg' Control='Next' Event='SpawnDialog' Value='InvalidDirDlg' Order='3'>
-        NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;"1"
-      </Publish>
-
-      <Publish Dialog='InstallDirDlg' Control='Next' Event='DoAction' Value='WixUIValidatePath' Order='2'>
-        NOT WIXUI_DONTVALIDATEPATH
-      </Publish>
-      <Publish Dialog='InstallDirDlg' Control='Next' Event='SetTargetPath' Value='[WIXUI_INSTALLDIR]' Order='1'>1</Publish>
-      <Publish Dialog='InstallDirDlg' Control='ChangeFolder' Event='SpawnDialog' Value='BrowseDlg' Order='2'>1</Publish>
-      <Publish Dialog='InstallDirDlg' Control='ChangeFolder' Event='[_BrowseProperty]' Value='[WIXUI_INSTALLDIR]' >1</Publish>
-
-
     </UI>
   </Fragment>
 </Wix>
diff --git a/msi/WiX/ShibbolethSP-install-dlg.wxs b/msi/WiX/ShibbolethSP-install-dlg.wxs
new file mode 100644
index 0000000..f83a4c0
--- /dev/null
+++ b/msi/WiX/ShibbolethSP-install-dlg.wxs
@@ -0,0 +1,119 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the 'License'); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an 'AS IS' BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!-- This file contains the description of the dialog which captures installation
+       values for first time installs -->
+  <Fragment>
+
+    <UI>
+
+      <!-- This Dialog sets up:
+           - INSTALLDIR
+           - INSTALL_SHIBD_SERVICE
+           - INSTALL_32BIT (if a 64bit machine)
+           - INSTALL_ISAPI_FILTER (if IIS about)
+           - SHIB_FILE_EXTENSION (if IIS about)
+        -->
+
+      <Dialog Id='InstallDirDlgShib' Width='370' Height='270' Title='[ProductName] Setup'>
+        <!-- Stuff at the top: picture, some text, a line -->
+        <Control Id='TopBitMap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' Text='WixUI_Bmp_Banner' />
+        <Control Id='TopInfo' Type='Text' X='15' Y='6' Width='150' Height='12' 
+                 Text='{\WixUI_Font_Title}Configure Shibboleth' Transparent='yes'/>
+        <Control Id='TopDetailed' Type='Text' X='25' Y='24' Width='320' Height='12' 
+                 Text='Please choose where to install the Shibboleth SP and other installation options' Transparent='yes'/>
+        <Control Id='TopLine' Type='Line' X='0' Y='44' Width='370' Height='1' />
+
+        <!-- Buttons to control Shibboleth Setup -->
+        <Control Id='DescriptionLine1' Type='Text' X='25' Y='51' Height='12' Width='320' 
+                 Text='The files for [ProductName] will be installed in the following folder.'/>
+
+        <Control Id='DescriptionLine2' Type='Text' X='25' Y='70' Height='12' Width='320' 
+                 Text='To install into a different folder, click the Browse button, and select another folder.'/>
+
+        <Control Id='DescriptionLine3' Type='Text' X='25' Y='90' Height='12' Width='320' 
+                 Text='You can choose not to install [ProductName] by clicking Cancel to exit the installer.' />
+
+        <!-- Where? -->
+        <Control Id='Dest' Type='Edit' X='25' Y='115' Width='228' Height='17' Property='INSTALLDIR' Text='[INSTALLDIR]' />
+        <Control Id='ChangeFolder' Type='PushButton' X='265' Y='115' Height='17' Width='56' Text='B&amp;rowse...'>
+          <Publish Event='SpawnDialog' Value='BrowseDlg' Order='1'>1</Publish>
+          <Publish Event='[_BrowseProperty]' Value='[WIXUI_INSTALLDIR]' Order='1'>1</Publish>
+        </Control>
+
+        <!-- Service? -->
+        <Control Id='InstallShibd' Type='CheckBox' X='25' Y='146' Height='17' Width='160' 
+                 Property='INSTALL_SHIBD_SERVICE' CheckBoxValue='TRUE' 
+                 Text='Install Shibd daemon' />
+
+        <!-- 32 Bits? -->
+        <Control Id='Install32Bit' Type='CheckBox' X='185' Y='146' Height='17' Width='160'
+                 Property='INSTALL_32BIT' CheckBoxValue='TRUE' 
+                 Text='32bit defaults'>
+          <Condition Action='show'>IS64BITINSTALL = "TRUE"</Condition>
+          <Condition Action='hide'>IS64BITINSTALL &lt;&gt; "TRUE"</Condition>
+        </Control>
+
+        <!-- ISAPI? -->
+        <Control Id='InstallISAPI' Type='CheckBox' X='25' Y='175' Height='17' Width='160'
+                 Property='INSTALL_ISAPI_FILTER' CheckBoxValue='TRUE' 
+                 Text='Install ISAPI filter and configure IIS'>
+          <Condition Action='show'>IISMAJORVERSION</Condition>
+          <Condition Action='hide'>NOT IISMAJORVERSION</Condition>
+        </Control>
+        <Control Id='FileExtensionText' Type='Text' X='185' Y='178' Height='17' Width='96'
+                 Text='Shibboleth File Extension'>
+          <Condition Action='show'>IISMAJORVERSION</Condition>
+          <Condition Action='hide'>NOT IISMAJORVERSION</Condition>
+        </Control>
+        <Control Id='FileExtensionEdit' Type='Edit' X='285' Y='175' Height='17' Width='50'
+                 Property='SHIB_FILE_EXTENSION' Text='[SHIB_FILE_EXTENSION]'>
+          <Condition Action='show'>IISMAJORVERSION</Condition>
+          <Condition Action='hide'>NOT IISMAJORVERSION</Condition>
+          <Condition Action='enable'>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
+          <Condition Action='disable'>INSTALL_ISAPI_FILTER &lt;&gt; "TRUE"</Condition>
+        </Control>
+
+        <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
+        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='1' />
+        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' Text='&amp;Back'>
+          <Publish  Event='NewDialog' Value='LicenseAgreementDlg'>1</Publish>
+        </Control>
+
+        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Text='&amp;Next' Default='yes'>
+          <Publish Event='SetTargetPath' Value='[WIXUI_INSTALLDIR]'>1</Publish>
+          <Publish Event='DoAction' Value='WixUIValidatePath' >
+            NOT WIXUI_DONTVALIDATEPATH
+          </Publish>
+          <Publish Event='SpawnDialog' Value='InvalidDirDlg' >
+            NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;"1"
+          </Publish>
+          <Publish Event='NewDialog' Value='VerifyReadyDlg'>
+            WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"
+          </Publish>
+        </Control>
+
+        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Text='&amp;Cancel' Cancel='yes'>
+          <Publish  Event='SpawnDialog' Value='CancelDlg'>1</Publish>
+        </Control>
+      </Dialog>
+
+    </UI>
+  </Fragment>
+</Wix>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index ab20e80..08b3f58 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -171,7 +171,10 @@
       <ComponentRef Id='shibd64.exe_debug'/>
 
       <!-- ShibbolethSP-registry-x64 -->
-
+      <ComponentRef Id='TargetDir64'/>
+      <ComponentRef Id='InstallShibd64'/>
+      <ComponentRef Id='InstallIsapi64'/>
+      <ComponentRef Id='Install32Bit64'/>
       <ComponentRef Id='file_extension64'/>
       <ComponentRef Id='shib64.ico' />
 
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index f09ff55..d3877c4 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -168,6 +168,8 @@
       </Directory><!-- var -->
     </DirectoryRef>
 
+    <!-- Stuff to do the editing and copy of the files -->
+
     <Binary Id='EditConfigFileSrc' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix' />
 
     <CustomAction Id='EditConfigFiles' 
@@ -177,6 +179,8 @@
     <CustomAction Id='KeyGen' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetKeyGen' Property='KeyGen' Value='&quot;[INSTALLDIR]etc\shibboleth\keygen.bat&quot;' />
 
+    <!-- Stuff to configure IIS.  This is a one-shot (first install/last uninstall) -->
+
     <Binary Id='install_isapi'
             SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_install_isapi_filter.vbs-wix'/>
     <Binary Id='uninstall_isapi' 
@@ -196,6 +200,24 @@
     <CustomAction Id='ServicePath64' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetServicePath64' Property='ServicePath64' Value='&quot;[INSTALLDIR]etc\shibboleth\SetService64.bat&quot;' />
 
+    <!-- Inherit the installation dir if one was set -->
+    <CustomAction Id='InheritInstallDir' Property='INSTALLDIR' Value='[OLD_INSTALLDIR]' />
+    <CustomAction Id='InheritInstallDir64' Property='INSTALLDIR' Value='[OLD_INSTALLDIR64]' />
+
+    <!-- Set INSTALL_SHIBD correctly -->
+    <CustomAction Id='ClearInstallShibd' Property='INSTALL_SHIBD_SERVICE' Value='FALSE' />
+
+    <InstallUISequence>
+      <!-- All we need to sequence here is setting up inherited INSTALLDIR -->
+
+      <!-- inherit installationDir if there is something to inherit -->
+      <Custom Action='InheritInstallDir' After='AppSearch'>
+        OLD_INSTALLDIR
+      </Custom>
+      <Custom Action='InheritInstallDir64' After='InheritInstallDir'>
+        (NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64
+      </Custom>
+    </InstallUISequence>
 
     <InstallExecuteSequence>
       <Custom Action='SetEditConfigFiles' Before='CostInitialize'>NOT Installed</Custom>
@@ -217,7 +239,7 @@
         (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND IISMAJORVERSION
       </Custom>
       <Custom Action='ShibInstallISAPIFilter' After='InstallFiles'>
-        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED)  AND IISMAJORVERSION
+        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND IISMAJORVERSION
       </Custom>
 
       <!-- (try to) Uninstall IIS if
@@ -228,7 +250,8 @@
               After='CostFinalize'>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</Custom>
       <Custom Action='ShibUninstallISAPIFilter' 
               Before='RemoveFiles'>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</Custom>
-      <!-- set service path to 64 bit one if this is an install and if we werre told to -->
+
+      <!-- set service path to 64 bit one if this is an install and if we were told to -->
 
       <Custom Action='SetServicePath64' Before='CostInitialize'>
         (NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
@@ -237,6 +260,23 @@
         (NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
       </Custom>
 
+      <!-- Duplicate actions from the UI case -->
+      <Custom Action='InheritInstallDir' After='AppSearch'>
+        OLD_INSTALLDIR
+      </Custom>
+      <Custom Action='InheritInstallDir64' After='InheritInstallDir'>
+        (NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64
+      </Custom>
+
+      <!-- Clear out INSTALL_SHIBD_SERVICE (Set it to FALSE) if
+           - This is an update
+           - We didn't see an appropriate registryEntry
+           - TODO - we don't need this here I think
+        -->
+      <Custom Action='ClearInstallShibd' After='AppSearch'>
+        ALREADYINSTALLED AND (NOT OLD_SERVICEINSTALLED)
+      </Custom>
+
       <!-- Do not mess with SCM if this is an upgrade -->
 
       <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED) AND (INSTALL_SHIBD_SERVICE = "TRUE")</InstallServices>
diff --git a/msi/WiX/ShibbolethSP-registry-x64.wxs b/msi/WiX/ShibbolethSP-registry-x64.wxs
index fa91cdc..a77d341 100644
--- a/msi/WiX/ShibbolethSP-registry-x64.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x64.wxs
@@ -57,7 +57,50 @@
                       Name='DisplayVersion' Type='raw' Win64='yes' />
     </Property>
 
+    <Property Id='OLD_INSTALLDIR64' Secure='yes'>
+      <RegistrySearch Id='OldInstallDir64' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallDir' Type='directory' Win64='yes'/>
+    </Property>
+
+    <Property Id='OLD_INSTALL_SHIBD_SERVICE64' Secure='yes'>
+      <RegistrySearch Id='OldInstallShibd64' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallShibd' Type='raw' Win64='yes'/>
+    </Property>
+
+    <Property Id='OLD_INSTALL_ISAPI_FILTER64' Secure='yes'>
+      <RegistrySearch Id='OldInstallIsapi64' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallIsapi' Type='raw' Win64='yes'/>
+    </Property>
+
+    <!-- 64 bit only -->
+    <Property Id='OLD_INSTALL_32BIT' Secure='yes'>
+      <RegistrySearch Id='OldInstall32Bit' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='Install32Bit' Type='raw' Win64='yes'/>
+    </Property>
+
     <DirectoryRef Id='bin64'>
+      <!-- Save the Captured parameters into the registry -->
+      <Component Id='TargetDir64' Guid='{E89D3028-5415-4874-9CBC-806A2064C613}' Win64='yes'>
+        <RegistryValue Id='TargetDir64'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallDir' Value='[INSTALLDIR]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='InstallShibd64' Guid='{7834C30C-DCAB-4C7E-9C75-396EFB759AC9}' Win64='yes'>
+        <RegistryValue Id='InstallShibd64'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallShibd' Value='[INSTALL_SHIBD_SERVICE]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='Install32Bit64' Guid='{9A0181FE-6252-4C2E-8828-70281DCC3825}' Win64='yes'>
+        <RegistryValue Id='Install32Bit64'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='Install32Bit' Value='[INSTALL_32BIT]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='InstallIsapi64' Guid='{288F97F5-E2E8-48DB-8291-B8445B77BA45}' Win64='yes'>
+        <Condition>IISMAJORVERSION</Condition>
+        <RegistryValue Id='InstallIsapi64'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallIsapi' Value='[INSTALL_ISAPI_FILTER]' Type='string' KeyPath='yes' />
+      </Component>
+
       <Component Id='file_extension64' Guid='{F17BED16-5988-4F9E-82E0-1D4DCB69EC26}' Win64='yes'>
         <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
         <RegistryValue Id='FileExtension64' Root='HKLM' Key='SOFTWARE\Shibboleth' 
diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
index ac988a4..ee2f548 100644
--- a/msi/WiX/ShibbolethSP-registry-x86.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x86.wxs
@@ -63,15 +63,54 @@
       <RegistrySearch Id='SP2_3_1' Root='HKLM' 
                       Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E4FA3B6C-6347-4B58-A07D-F9E388B3944B}' 
                       Name='DisplayVersion' Type='raw' />
+    </Property>
+
+    <Property Id='OLD_INSTALLDIR' Secure='yes'>
+      <RegistrySearch Id='OldInstallDir' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallDir' Type='directory' />
+    </Property>
+
+    <Property Id='OLD_INSTALL_SHIBD_SERVICE' Secure='yes'>
+      <RegistrySearch Id='OldInstallShibd' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallShibd' Type='raw' />
+    </Property>
+
+    <Property Id='OLD_INSTALL_ISAPI_FILTER' Secure='yes'>
+      <RegistrySearch Id='OldInstallIsapi' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallIsapi' Type='raw' />
+    </Property>
 
+    <!-- non virtualized registry setting -->
+    <Property Id='OLD_SERVICEINSTALLED' Secure='yes'>
+      <RegistrySearch Id='OldServiceInstalled' Root='HKLM' Key='SYSTEM\CurrentControlSet\services\shibd_Default'
+                      Name='ImagePath' Type='raw' />
     </Property>
+
     <DirectoryRef Id='bin'>
+      <!-- Save the Captured parameters into the registry -->
+      <Component Id='TargetDir' Guid='{F02FB6E5-1146-4EC5-9D59-07BA6732C4DD}' >
+        <RegistryValue Id='TargetDir'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallDir' Value='[INSTALLDIR]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='InstallShibd' Guid='{67ABE9AB-5ACF-44FE-8620-AEA676E88187}' >
+        <RegistryValue Id='InstallShibd'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallShibd' Value='[INSTALL_SHIBD_SERVICE]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='InstallIsapi' Guid='{4F81E47D-B406-42B6-A702-90ACA666075E}' >
+        <Condition>IISMAJORVERSION</Condition>
+        <RegistryValue Id='InstallIsapi'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallIsapi' Value='[INSTALL_ISAPI_FILTER]' Type='string' KeyPath='yes' />
+      </Component>
+
       <Component Id='file_extension' Guid='{88D0BEF3-6E15-4688-8492-9FF23B6221DF}'>
         <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
         <RegistryValue Root='HKLM' Key='SOFTWARE\Shibboleth' 
                        Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />
       </Component>
 
+      <!-- pretty icon for the "install programs" page -->
       <Component Id='shib.ico' Guid='{FA0F86A1-0731-4D66-8216-BC74D231B598}'>
         <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico' />
         <RegistryValue Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' 
diff --git a/msi/WiX/ShibbolethSP-update-dlg.wxs b/msi/WiX/ShibbolethSP-update-dlg.wxs
new file mode 100644
index 0000000..6b185c5
--- /dev/null
+++ b/msi/WiX/ShibbolethSP-update-dlg.wxs
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the 'License'); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an 'AS IS' BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!-- The dialog to display if we sense an upgrade -->
+  <Fragment>
+
+    <UI>
+      <Dialog Id='UpdateDlgShib' Width='370' Height='270' Title='[ProductName] Update'>
+        <!-- Stuff at the top: picture, some text, a line -->
+        <Control Id='TopBitMap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' Text='WixUI_Bmp_Banner' />
+        <Control Id='TopInfo' Type='Text' X='15' Y='6' Width='150' Height='12' 
+                 Text='{\WixUI_Font_Title}Update Shibboleth' Transparent='yes'/>
+        <Control Id='TopDetailed' Type='Text' X='25' Y='24' Width='320' Height='12' 
+                 Text='Update to [ProductName]' Transparent='yes'/>
+        <Control Id='TopLine' Type='Line' X='0' Y='44' Width='370' Height='1' />
+
+        <!-- Buttons to control Shibboleth Setup -->
+        <Control Id='DescriptionLine1' Type='Text' X='25' Y='51' Height='12' Width='320' 
+                 Text='The updates files for [ProductName] will be installed to [INSTALLDIR]'/>
+
+        <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
+        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='1' />
+        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' Text='&amp;Back'>
+          <Publish  Event='NewDialog' Value='WelcomeDlg'>1</Publish>
+        </Control>
+
+        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Text='&amp;Next' Default='yes'>
+          <Publish Event='NewDialog' Value='VerifyReadyDlg'/>
+        </Control>
+
+        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Text='&amp;Cancel' Cancel='yes'>
+          <Publish  Event='SpawnDialog' Value='CancelDlg'>1</Publish>
+        </Control>
+      </Dialog>
+    </UI>
+  </Fragment>
+</Wix>
diff --git a/msi/WiX/new.bmp b/msi/WiX/new.bmp
deleted file mode 100644
index 27881df..0000000
Binary files a/msi/WiX/new.bmp and /dev/null differ
diff --git a/msi/WiX/up.bmp b/msi/WiX/up.bmp
deleted file mode 100644
index 86f6b5a..0000000
Binary files a/msi/WiX/up.bmp and /dev/null differ