[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: Info.bmp ShibbolethSP-gui.wxs ShibbolethSP-iis-dialog.wxs ShibbolethSP-ma...

[noreply at shibboleth.net]

Author: rdw
Date: Thu May 24 15:03:26 2012
New Revision: 3676

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3676&view=rev
Log:
First pass at a non encumbered GUI.  Uses the Wix InstallDirDlg (as per documentation) but linked in by hand.

Remove old dialogs for shibd and iis

Added:
    branches/REL_2/msi/WiX/Info.bmp   (with props)
    branches/REL_2/msi/WiX/new.bmp   (with props)
    branches/REL_2/msi/WiX/up.bmp   (with props)
Removed:
    branches/REL_2/msi/WiX/ShibbolethSP-iis-dialog.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-shibd-dialog.wxs
Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs

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=3676&r1=3675&r2=3676&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs Thu May 24 15:03:26 2012
@@ -17,77 +17,126 @@
      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 -->
   <Fragment>
 
-    <!-- our local copy of the InstallDir Dialog  from the Wix Sources under CPT.txt -->
     <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
     <WixVariable Id="WixUIBannerBmp" Value="TopBanner.bmp" />
     <WixVariable Id="WixUIDialogBmp" Value="Dialog.bmp" />
+    <WixVariable Id="WixUICostingPopupOptOut" Value="1" />    
 
-    <UI Id="Shib_InstallDir">
-      <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
-      <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
-      <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+    <!-- GUI For Shibboleth installer.  Uses the Wix packages, but linked in
+         blindly by looking at documentation (for sizes and dialog names) 
+         and the generated.msi -->
 
-      <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-      <Property Id="WixUI_Mode" Value="InstallDir" />
-      <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+    <!-- The Banners for the dialog boxes -->
+    <Binary Id='WixUI_Bmp_Dialog' SourceFile='Dialog.bmp' />
+    <Binary Id='WixUI_Bmp_Banner' SourceFile='TopBanner.bmp' />
 
-      <DialogRef Id="BrowseDlg" />
-      <DialogRef Id="DiskCostDlg" />
-      <DialogRef Id="ErrorDlg" />
-      <DialogRef Id="FatalError" />
-      <DialogRef Id="FilesInUse" />
-      <DialogRef Id="MsiRMFilesInUse" />
-      <DialogRef Id="PrepareDlg" />
-      <DialogRef Id="ProgressDlg" />
-      <DialogRef Id="ResumeDlg" />
-      <DialogRef Id="UserExit" />
+    <!-- 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' />
 
-      <!-- Our dialogs -->
-      <DialogRef Id="ShibdDlg" />
-      <DialogRef Id="IISDlg" />
+    <!-- property that Light complained for -->
+    <Property Id='DefaultUIFont' Value='WixUI_Font_Normal' />
 
-      <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
-      <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+    <!-- "You must set a property named WIXUI_INSTALLDIR with a value
+         of the ID of the directory you want the user to be able to specify
+         the location of." -->
 
-      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+    <Property Id='WIXUI_INSTALLDIR' Value='INSTALLDIR' />
 
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+    <UI Id='ShibbolethInstallDir' >
 
-      <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">LicenseAccepted = "1"</Publish>
+      <!-- "WixUI_InstallDir includes the following dialogs:" -->
+      <DialogRef Id='BrowseDlg' />
+      <DialogRef Id='DiskCostDlg' />
+      <DialogRef Id='InstallDirDlg' />
+      <DialogRef Id='InvalidDirDlg' />
+      <DialogRef Id='LicenseAgreementDlg' />
+      <DialogRef Id='WelcomeDlg' />
 
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>

[... 136 lines stripped ...]