From 7accc676f2c70c59571f489a2479e57d3dc323f2 Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Thu, 24 May 2012 14:03:26 +0000
Subject: [PATCH] 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
---
 msi/WiX/Info.bmp                      | Bin 0 -> 1078 bytes
 msi/WiX/ShibbolethSP-gui.wxs          | 177 ++++++++++++++++++++++------------
 msi/WiX/ShibbolethSP-iis-dialog.wxs   |  60 ------------
 msi/WiX/ShibbolethSP-main-x64.wxs     |   2 +-
 msi/WiX/ShibbolethSP-main-x86.wxs     |   3 +-
 msi/WiX/ShibbolethSP-shibd-dialog.wxs |  88 -----------------
 msi/WiX/new.bmp                       | Bin 0 -> 318 bytes
 msi/WiX/up.bmp                        | Bin 0 -> 318 bytes
 8 files changed, 116 insertions(+), 214 deletions(-)
 create mode 100644 msi/WiX/Info.bmp
 delete mode 100644 msi/WiX/ShibbolethSP-iis-dialog.wxs
 delete mode 100644 msi/WiX/ShibbolethSP-shibd-dialog.wxs
 create mode 100644 msi/WiX/new.bmp
 create mode 100644 msi/WiX/up.bmp

diff --git a/msi/WiX/Info.bmp b/msi/WiX/Info.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..7e0ff7f14c24ace2d59e24260b666ca60ef57482
GIT binary patch
literal 1078
zcmbW0y-ve06opR-l9@=}pq)_PqC8SIv&9<=QeMd$43&6=ZZKveLsj!#J1I(4B!t`J
z>vMnI>sx818*Mg?Y<=EH56Gq|e7lnFD`|^v10KOjx9n2D_xcJLv4l_rJ4X-{W5kg1
zS1H*E@G+Hb^K$KcD$-x@3wwRR(}KHt!M%rjKNlc%Z+ucX-Eos3KbP#GDUB#{M4>2L
zcBr$}wjn#5X(DH<4u0ITvP0`~GzxPggEMIkSvvo;;K6qbKKzec{hViLOa4sQLR;$3
z+^O8}W&dWXk>A_dVTvE%Ibh<s9p+H{&5XmjKhul(q8NYrZI^gHQ$pzd<ebt6##eIy
z6gz<t#5^Lqle9icHCJ=gs}77~1cAziUlvoGeX2lQB>q4i;&<ff$j9VWDIM0y=DYzL
zFwc49e0_ydl)2^v_?U|APjl`F;y!hjPN{Ha(V9WmM31ajqnqAoFv(lyIXJ%4ppN00
y<bIL_Bzq?GgT2PsBW17fWqC`lQ!kxrX#@jx5B$d?T?z)g7Rz+l4H4gAEqw#;leS<0

literal 0
HcmV?d00001

diff --git a/msi/WiX/ShibbolethSP-gui.wxs b/msi/WiX/ShibbolethSP-gui.wxs
index a5dd059..005520d 100644
--- a/msi/WiX/ShibbolethSP-gui.wxs
+++ b/msi/WiX/ShibbolethSP-gui.wxs
@@ -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" />    
+
+    <!-- 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 -->
+
+    <!-- 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 Id='DefaultUIFont' Value='WixUI_Font_Normal' />
+
+    <!-- "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." -->
+
+    <Property Id='WIXUI_INSTALLDIR' Value='INSTALLDIR' />
+
+    <UI Id='ShibbolethInstallDir' >
+
+      <!-- "WixUI_InstallDir includes the following dialogs:" -->
+      <DialogRef Id='BrowseDlg' />
+      <DialogRef Id='DiskCostDlg' />
+      <DialogRef Id='InstallDirDlg' />
+      <DialogRef Id='InvalidDirDlg' />
+      <DialogRef Id='LicenseAgreementDlg' />
+      <DialogRef Id='WelcomeDlg' />
+
+      <!-- "In addition, WixUI_InstallDir includes the following common
+           dialogs that appear in all WixUI dialog sets:" -->
+      <DialogRef Id='CancelDlg' />
+      <DialogRef Id='ErrorDlg' />
+      <DialogRef Id='ExitDialog' />
+      <DialogRef Id='FatalError' />
+      <DialogRef Id='FilesInUse' />
+      <DialogRef Id='MaintenanceTypeDlg' />
+      <DialogRef Id='MaintenanceWelcomeDlg' />
+      <DialogRef Id='MsiRMFilesInUse' />
+      <DialogRef Id='OutOfDiskDlg' />
+      <DialogRef Id='OutOfRbDiskDlg' />
+      <DialogRef Id='PrepareDlg' />
+      <DialogRef Id='ProgressDlg' />
+      <DialogRef Id='ResumeDlg' />
+      <DialogRef Id='UserExit' />
+      <DialogRef Id='VerifyReadyDlg' />
+      <DialogRef Id='WaitForCostingDlg' />
+
+      <!-- Text Styles (from Orca) -->
+      <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'/>
+
+      <!-- Events (from Orca\ControlEvent and from light's complaints) -->
+      <Publish Dialog='BrowseDlg' Control='OK' Event='DoAction' Value='WixUIValidatePath' Order='3'>1</Publish>
+      <Publish Dialog='BrowseDlg' Control='OK' Event='SpawnDialog' Value='InvalidDirDlg' Order='4'>
+	WIXUI_INSTALLDIR_VALID&lt;&gt;"1"
+      </Publish>
+
+      <Publish Dialog='LicenseAgreementDlg' Control='Next' Event='NewDialog' Value='InstallDirDlg'>
+	LicenseAccepted = "1"
+      </Publish>
+
+      <Publish Dialog='MaintenanceTypeDlg' Control='RepairButton' Event='NewDialog' Value='VerifyReadyDlg'>1</Publish>
+      <Publish Dialog='MaintenanceTypeDlg' Control='RemoveButton' Event='NewDialog' Value='VerifyReadyDlg'>1</Publish>
+
+
+      <Publish Dialog='MaintenanceWelcomeDlg' Control='Next' Event='NewDialog' Value='MaintenanceTypeDlg'>1</Publish>
+
+      <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>
+
+      <Publish Dialog='ExitDialog' Control='Finish' Event='EndDialog' Value='Return'>1</Publish>
+      <Publish Dialog='LicenseAgreementDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg'>1</Publish>
+      <Publish Dialog='MaintenanceTypeDlg' Control='Back' Event='NewDialog' Value='MaintenanceWelcomeDlg'>1</Publish>
+      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg'>
+        Installed AND PATCH
+      </Publish>
+      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='InstallDirDlg'>
+        NOT Installed
+      </Publish>
+      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='MaintenanceTypeDlg'>
+        Installed AND NOT PATCH
+      </Publish>
+
+      <!-- Events we need to kill -->
+      <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'>1</Publish>
+      <Publish Dialog='InstallDirDlg' Control='ChangeFolder' Event='[_BrowseProprty]' Value='[WIXUI_INSTALLDIR]' >1</Publish>
 
-    <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" />
-
-      <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-      <Property Id="WixUI_Mode" Value="InstallDir" />
-      <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
-
-      <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" />
-
-      <!-- Our dialogs -->
-      <DialogRef Id="ShibdDlg" />
-      <DialogRef Id="IISDlg" />
-
-      <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>
-
-      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-
-      <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>
-
-      <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">LicenseAccepted = "1"</Publish>
-
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="ShibdDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
-
-      <Publish Dialog="ShibdDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg">1</Publish>
-      <Publish Dialog="ShibdDlg" Control="Next" Event="NewDialog" Value="IISDlg">IISMAJORVERSION</Publish>
-      <Publish Dialog="ShibdDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">NOT IISMAJORVERSION</Publish>
-
-      <Publish Dialog="IISDlg" Control="Back" Event="NewDialog" Value="ShibdDlg">1</Publish>
-      <Publish Dialog="IISDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="IISDlg" Order="1">(NOT Installed) AND IISMAJORVERSION </Publish>
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="IISDlg" Order="1">(NOT Installed) AND (NOT IISMAJORVERSION)</Publish>
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
-
-      <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-
-      <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
 
     </UI>
-
-    <UIRef Id="WixUI_Common" />
-
   </Fragment>
 </Wix>
diff --git a/msi/WiX/ShibbolethSP-iis-dialog.wxs b/msi/WiX/ShibbolethSP-iis-dialog.wxs
deleted file mode 100644
index 21386e3..0000000
--- a/msi/WiX/ShibbolethSP-iis-dialog.wxs
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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'>
-  <Fragment>
-    <UI>
-      <Dialog Id='IISDlg' Width='370' Height='270' Title='[ProductName] Setup' >
-        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Default='yes' 
-                 Text='!(loc.WixUINext)' />
-        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' 
-                 Text='!(loc.WixUIBack)' />
-        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Cancel='yes' 
-                 Text='!(loc.WixUICancel)'>
-          <Publish Event='SpawnDialog' Value='CancelDlg'>1</Publish>
-        </Control>
-
-        <Control Id='Title' Type='Text' X='15' Y='6' Width='200' Height='15' Transparent='yes' NoPrefix='yes' 
-                 Text='{\WixUI_Font_Title}Install ISAPI Filter' />
-        <Control Id='BannerBitmap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' TabSkip='no' 
-                 Text='!(loc.InstallDirDlgBannerBitmap)' />
-        <Control Id='Description' Type='Text' X='25' Y='23' Width='280' Height='15' Transparent='yes'
-                 NoPrefix='yes' Text='Install the ISAPI filter for IIS' />
-        <Control Id='BannerLine' Type='Line' X='0' Y='44' Width='370' Height='0' />
-        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='0' />
-
-
-        <Control Id='IISLine2' Type='Text' X='25' Y='79' Width='312' Height='20' 
-                 Text='This will install the ISAPI filter for IIS, register the specified file extension and create a Web Services Extension entry (IIS 6 and later).'/>
-        <Control Id='InstallISAPICheckBox' Type='CheckBox' X='86' Y='120' Width='180' Height='14' 
-                 Property='INSTALL_ISAPI_FILTER' Text='Install ISAPI filter and configure IIS' 
-                 CheckBoxValue='TRUE' TabSkip='yes' />
-
-        <Control Id='ShibExtensionBox' Type='GroupBox' X='99' Y='145' Width='175' Height='35' TabSkip='yes' />
-        <Control Id='ShibExtensionText' Type='Text' X='114' Y='160' Width='96' Height='12' 
-                 Text='Shibboleth File Extension:' TabSkip='yes'/>
-        <Control Id='ShibExtensionEdit' Type='Edit' X='211' Y='157' Width='51' Height='16' 
-                 Property='SHIB_FILE_EXTENSION' TabSkip='yes'>
-          <Condition Action='disable'>INSTALL_ISAPI_FILTER &lt;&gt; "TRUE"</Condition>
-          <Condition Action='enable'>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
-        </Control>
-
-      </Dialog>
-    </UI>
-  </Fragment>
-</Wix>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 2fe4dae..d54e803 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -41,7 +41,7 @@
 
     <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
     <Property Id='IS64BITINSTALL' Value='TRUE'/>
-    <UIRef Id="Shib_InstallDir"/>
+    <UIRef Id='ShibbolethInstallDir'/>
 
 
     <!-- Files -->
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 71e336a..93c616f 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -42,7 +42,8 @@
 
     <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
     <Property Id='IS64BITINSTALL' Value='FALSE'/>
-    <UIRef Id="Shib_InstallDir"/>
+
+    <UIRef Id='ShibbolethInstallDir'/> 
 
     <!-- Files -->
     <Directory Id='TARGETDIR' Name='SourceDir'>
diff --git a/msi/WiX/ShibbolethSP-shibd-dialog.wxs b/msi/WiX/ShibbolethSP-shibd-dialog.wxs
deleted file mode 100644
index 3470074..0000000
--- a/msi/WiX/ShibbolethSP-shibd-dialog.wxs
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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'>
-  <Fragment>
-    <UI>
-      <Dialog Id='ShibdDlg' Width='370' Height='270' Title='[ProductName] Setup'>
-        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Default='yes' Text='!(loc.WixUINext)' />
-        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' Text='!(loc.WixUIBack)' />
-        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Cancel='yes' Text='!(loc.WixUICancel)'>
-          <Publish Event='SpawnDialog' Value='CancelDlg'>1</Publish>
-        </Control>
-
-        <Control Id='Title' Type='Text' X='15' Y='6' Width='200' Height='15' Transparent='yes' NoPrefix='yes' 
-                 Text='{\WixUI_Font_Title}Shibboleth Service Provider' />
-
-        <Control Id='BannerBitmap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' TabSkip='no' 
-                 Text='!(loc.InstallDirDlgBannerBitmap)' />
-
-        <Control Id='Description64' Type='Text' X='25' Y='23' Width='300' Height='20' Transparent='yes' NoPrefix='yes' 
-                 Text='Control service, and specify which architecture (64-bit or 32-bit) to make active.'>
-          <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>
-        </Control>
-        <!--
-        <Control Id='Description32' Type='Text' X='25' Y='23' Width='280' Height='15' Transparent='yes' NoPrefix='yes' Text='Specify the port for the Shibd daemon'>
-          <Condition Action='hide' >IS64BITINSTALL = "TRUE"</Condition>
-        </Control>
-        -->
-
-        <Control Id='BannerLine' Type='Line' X='0' Y='44' Width='370' Height='0' />
-        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='0' />
-
-        <!--
-        <Control Id='ShibdLine1' Type='Text' X='25' Y='60' Width='312' Height='10' 
-                 Text='Please enter the TCP port number in which the shibd daemon should run'/>
-        <Control Id='ShibdLine2' Type='Text' X='25' Y='79' Width='312' Height='20' 
-                 Text='NOTE: This is NOT the web server port and MUST be a valid Windows port number that is NOT in use by any other process!'/>
-        <Control Id='ShibdLine3' Type='Text' X='25' Y='108' Width='312' Height='20' 
-                 Text='If a copy of shibboleth2.xml already exists in the installation path, it will NOT be updated with this new port number.'/>
-        -->
-        
-        <!--
-        <Control Id='ShibdPortBox' Type='GroupBox' X='131' Y='165' Width='104' Height='35' />
-        <Control Id='ShibdPortText' Type='Text' X='146' Y='181' Width='40' Height='12' Text='Shibd port' >
-          <Condition Action='disable'>INSTALL_SHIBD_SERVICE &lt;&gt; "TRUE"</Condition>
-          <Condition Action='enable'>INSTALL_SHIBD_SERVICE = "TRUE"</Condition>
-        </Control>
-        <Control Id='ShibdPortEnter' Type='Edit' X='187' Y='178' Width='35' Height='16' 
-                 Property='SHIBD_PORT' TabSkip='no'>
-          <Condition Action='disable'>INSTALL_SHIBD_SERVICE &lt;&gt; "TRUE"</Condition>
-          <Condition Action='enable'>INSTALL_SHIBD_SERVICE = "TRUE"</Condition>
-        </Control>
-        -->
-
-        <Control Id='InstallShibdCheckBox' Type='CheckBox' X='80' Y='80' Width='250' Height='30' 
-          Property='INSTALL_SHIBD_SERVICE' Text='Install Shibboleth Daemon as a service (recommended).' 
-          CheckBoxValue='TRUE' TabSkip='yes' />
-
-        <Control Id='ShibdLine1' Type='Text' X='25' Y='140' Width='312' Height='20' 
-          Text='By default, Shibboleth will operate as a 64-bit system. You can change this now, or after installation.'>
-          <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>
-        </Control>
-        
-        <Control Id='Install32BitShibd' Type='CheckBox' X='118' Y='170' Width='250' Height='30' 
-                 Property='INSTALL_32BIT' Text='Run as a 32-bit system instead.' 
-                 CheckBoxValue='TRUE' TabSkip='yes'>
-          <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>
-        </Control>
-
-      </Dialog>
-    </UI>
-  </Fragment>
-</Wix>
diff --git a/msi/WiX/new.bmp b/msi/WiX/new.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..27881dfe972209bb5825c15cb7bc00bbde46c7c2
GIT binary patch
literal 318
zcmZQzU<5(|0RaXO&|qX>5ChRb3=&ZQVnzlQAj!bc04A{!KpBu^Lj!~Yl0YWIfddDC
zG)Uq<7%}|+4`Kl^5Q2n21UlFa1RH>Y#L_VR++bZW9?>+&2@U*cm>0<B24Z#~mIC_Y
TIs?PQ)j;>w0`Ys0yAd=1E8#zj

literal 0
HcmV?d00001

diff --git a/msi/WiX/up.bmp b/msi/WiX/up.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..86f6b5a84755483dee8175ebc821d3af0ce866b8
GIT binary patch
literal 318
zcma)&F%Ez*3<F(>jinPaBfq3iVrS`7_(?ej5C}1lG<M>oRa7bAIcM3XBn@W5%19)2
zpi~0CfR3A`90Zc8)(X4P;;1!e1a8Ujwl!?g%}lJWd!z?T2-Gq9(9iqVy9{0F7kh<5
P<5%!Eb(Xf+-TO;BySGdd

literal 0
HcmV?d00001

-- 
2.1.4