[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: Compile.bat Info.bmp ShibbolethSP-defs-x86.wxi ShibbolethSP-exe-x86.wxs S...

[noreply at shibboleth.net]

Author: rdw
Date: Thu May 31 13:23:02 2012
New Revision: 3685

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3685&view=rev
Log:
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.

Added:
    branches/REL_2/msi/WiX/ShibbolethSP-install-dlg.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-update-dlg.wxs
Removed:
    branches/REL_2/msi/WiX/Info.bmp
    branches/REL_2/msi/WiX/new.bmp
    branches/REL_2/msi/WiX/up.bmp
Modified:
    branches/REL_2/msi/WiX/Compile.bat
    branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x86.wxs

Modified: branches/REL_2/msi/WiX/Compile.bat
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Compile.bat?rev=3685&r1=3684&r2=3685&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Compile.bat (original)
+++ branches/REL_2/msi/WiX/Compile.bat Thu May 31 13:23:02 2012
@@ -16,12 +16,18 @@
 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
 
 

Modified: branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi?rev=3685&r1=3684&r2=3685&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi Thu May 31 13:23:02 2012
@@ -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>

Modified: branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs?rev=3685&r1=3684&r2=3685&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs Thu May 31 13:23:02 2012
@@ -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' >

Modified: branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs

[... 398 lines stripped ...]