[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: ShibbolethSP-exe-x86.wxs ShibbolethSP-gui.wxs ShibbolethSP-main-x86.wxs S...

[noreply at shibboleth.net]

Author: rdw
Date: Fri May 25 13:32:38 2012
New Revision: 3679

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3679&view=rev
Log:
Complete developmetn of the new GUI.  Further testing needed, particularly in the upgrade and patch case.

Fix an issue whereby we ciouldn't install with no shibd.  Also needs testing through an upgrade.

Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs

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=3679&r1=3678&r2=3679&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs Fri May 25 13:32:38 2012
@@ -132,7 +132,7 @@
                           DisplayName='Shibboleth 2 Daemon (Default)' Type='ownProcess' 
                           Start='auto' ErrorControl='ignore' />
           <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='uninstall'  
-                          Remove='uninstall' Start='install' Wait='yes' />
+                          Remove='uninstall' Start='install' Wait='no' />
         </Component>
         <Directory Id='sbin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >
           <Component Id='shibd.exe_debug' Guid='{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}'>

Modified: branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs?rev=3679&r1=3678&r2=3679&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs Fri May 25 13:32:38 2012
@@ -29,17 +29,7 @@
          blindly by looking at documentation (for sizes and dialog names) 
          and the generated.msi -->
 
-    <!-- The Banners for the dialog boxes -->
-    <Binary Id='WixUI_Bmp_Dialog' SourceFile='Dialog.bmp' />
-    <Binary Id='WixUI_Bmp_Banner' SourceFile='TopBanner.bmp' />
-
-    <!-- Banners that WixUI needs (taken from the old installer) -->
-    <Binary Id='WixUI_Ico_Info' SourceFile='Info.bmp' />
-    <Binary Id='WixUI_Ico_Exclam' SourceFile='Info.bmp' />
-    <Binary Id='WixUI_Bmp_Up' SourceFile='Up.bmp' />
-    <Binary Id='WixUI_Bmp_New' SourceFile='New.bmp' />
-
-    <!-- property that Light complained for -->
+    <!-- Property that Light complained for -->
     <Property Id='DefaultUIFont' Value='WixUI_Font_Normal' />
 
     <!-- "You must set a property named WIXUI_INSTALLDIR with a value
@@ -88,7 +78,7 @@
 	WIXUI_INSTALLDIR_VALID&lt;&gt;"1"
       </Publish>
 
-      <Publish Dialog='LicenseAgreementDlg' Control='Next' Event='NewDialog' Value='InstallDirDlg'>
+      <Publish Dialog='LicenseAgreementDlg' Control='Next' Event='NewDialog' Value='InstallDirDlgShib'>
 	LicenseAccepted = "1"
       </Publish>
 
@@ -111,14 +101,104 @@
       <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg'>
         Installed AND PATCH
       </Publish>
-      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='InstallDirDlg'>
+      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='InstallDirDlgShib'>
         NOT Installed
       </Publish>
       <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='MaintenanceTypeDlg'>
         Installed AND NOT PATCH
       </Publish>
 
-      <!-- Events we need to kill -->
+      <!-- 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.'/>
+

[... 123 lines stripped ...]