First pass at a non encumbered GUI. Uses the Wix InstallDirDlg (as per documentation...
authorrdw <rdw@cb58f699-b61c-0410-a6fe-9272a202ed29>
Thu, 24 May 2012 14:03:26 +0000 (14:03 +0000)
committerrdw <rdw@cb58f699-b61c-0410-a6fe-9272a202ed29>
Thu, 24 May 2012 14:03:26 +0000 (14:03 +0000)
Remove old dialogs for shibd and iis

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3676 cb58f699-b61c-0410-a6fe-9272a202ed29

msi/WiX/Info.bmp [new file with mode: 0644]
msi/WiX/ShibbolethSP-gui.wxs
msi/WiX/ShibbolethSP-iis-dialog.wxs [deleted file]
msi/WiX/ShibbolethSP-main-x64.wxs
msi/WiX/ShibbolethSP-main-x86.wxs
msi/WiX/ShibbolethSP-shibd-dialog.wxs [deleted file]
msi/WiX/new.bmp [new file with mode: 0644]
msi/WiX/up.bmp [new file with mode: 0644]

diff --git a/msi/WiX/Info.bmp b/msi/WiX/Info.bmp
new file mode 100644 (file)
index 0000000..7e0ff7f
Binary files /dev/null and b/msi/WiX/Info.bmp differ
index a5dd059..005520d 100644 (file)
      permissions and limitations under the License.  -->\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+  <!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->\r
   <Fragment>\r
 \r
-    <!-- our local copy of the InstallDir Dialog  from the Wix Sources under CPT.txt -->\r
     <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />\r
     <WixVariable Id="WixUIBannerBmp" Value="TopBanner.bmp" />\r
     <WixVariable Id="WixUIDialogBmp" Value="Dialog.bmp" />\r
+    <WixVariable Id="WixUICostingPopupOptOut" Value="1" />    \r
+\r
+    <!-- GUI For Shibboleth installer.  Uses the Wix packages, but linked in\r
+         blindly by looking at documentation (for sizes and dialog names) \r
+         and the generated.msi -->\r
+\r
+    <!-- The Banners for the dialog boxes -->\r
+    <Binary Id='WixUI_Bmp_Dialog' SourceFile='Dialog.bmp' />\r
+    <Binary Id='WixUI_Bmp_Banner' SourceFile='TopBanner.bmp' />\r
+\r
+    <!-- Banners that WixUI needs (taken from the old installer) -->\r
+    <Binary Id='WixUI_Ico_Info' SourceFile='Info.bmp' />\r
+    <Binary Id='WixUI_Ico_Exclam' SourceFile='Info.bmp' />\r
+    <Binary Id='WixUI_Bmp_Up' SourceFile='Up.bmp' />\r
+    <Binary Id='WixUI_Bmp_New' SourceFile='New.bmp' />\r
+\r
+    <!-- property that Light complained for -->\r
+    <Property Id='DefaultUIFont' Value='WixUI_Font_Normal' />\r
+\r
+    <!-- "You must set a property named WIXUI_INSTALLDIR with a value\r
+         of the ID of the directory you want the user to be able to specify\r
+         the location of." -->\r
+\r
+    <Property Id='WIXUI_INSTALLDIR' Value='INSTALLDIR' />\r
+\r
+    <UI Id='ShibbolethInstallDir' >\r
+\r
+      <!-- "WixUI_InstallDir includes the following dialogs:" -->\r
+      <DialogRef Id='BrowseDlg' />\r
+      <DialogRef Id='DiskCostDlg' />\r
+      <DialogRef Id='InstallDirDlg' />\r
+      <DialogRef Id='InvalidDirDlg' />\r
+      <DialogRef Id='LicenseAgreementDlg' />\r
+      <DialogRef Id='WelcomeDlg' />\r
+\r
+      <!-- "In addition, WixUI_InstallDir includes the following common\r
+           dialogs that appear in all WixUI dialog sets:" -->\r
+      <DialogRef Id='CancelDlg' />\r
+      <DialogRef Id='ErrorDlg' />\r
+      <DialogRef Id='ExitDialog' />\r
+      <DialogRef Id='FatalError' />\r
+      <DialogRef Id='FilesInUse' />\r
+      <DialogRef Id='MaintenanceTypeDlg' />\r
+      <DialogRef Id='MaintenanceWelcomeDlg' />\r
+      <DialogRef Id='MsiRMFilesInUse' />\r
+      <DialogRef Id='OutOfDiskDlg' />\r
+      <DialogRef Id='OutOfRbDiskDlg' />\r
+      <DialogRef Id='PrepareDlg' />\r
+      <DialogRef Id='ProgressDlg' />\r
+      <DialogRef Id='ResumeDlg' />\r
+      <DialogRef Id='UserExit' />\r
+      <DialogRef Id='VerifyReadyDlg' />\r
+      <DialogRef Id='WaitForCostingDlg' />\r
+\r
+      <!-- Text Styles (from Orca) -->\r
+      <TextStyle Id='WixUI_Font_Normal' FaceName='Tahoma' Size='8' />\r
+      <TextStyle Id='WixUI_Font_Bigger' FaceName='Tahoma' Size='12' />\r
+      <TextStyle Id='WixUI_Font_Title' FaceName='Tahoma' Size='9' Bold='yes'/>\r
+\r
+      <!-- Events (from Orca\ControlEvent and from light's complaints) -->\r
+      <Publish Dialog='BrowseDlg' Control='OK' Event='DoAction' Value='WixUIValidatePath' Order='3'>1</Publish>\r
+      <Publish Dialog='BrowseDlg' Control='OK' Event='SpawnDialog' Value='InvalidDirDlg' Order='4'>\r
+       WIXUI_INSTALLDIR_VALID&lt;&gt;"1"\r
+      </Publish>\r
+\r
+      <Publish Dialog='LicenseAgreementDlg' Control='Next' Event='NewDialog' Value='InstallDirDlg'>\r
+       LicenseAccepted = "1"\r
+      </Publish>\r
+\r
+      <Publish Dialog='MaintenanceTypeDlg' Control='RepairButton' Event='NewDialog' Value='VerifyReadyDlg'>1</Publish>\r
+      <Publish Dialog='MaintenanceTypeDlg' Control='RemoveButton' Event='NewDialog' Value='VerifyReadyDlg'>1</Publish>\r
+\r
+\r
+      <Publish Dialog='MaintenanceWelcomeDlg' Control='Next' Event='NewDialog' Value='MaintenanceTypeDlg'>1</Publish>\r
+\r
+      <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='LicenseAgreementDlg'>\r
+        NOT Installed\r
+      </Publish>\r
+      <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='VerifyReadyDlg'>\r
+        Installed AND PATCH\r
+      </Publish>\r
+\r
+      <Publish Dialog='ExitDialog' Control='Finish' Event='EndDialog' Value='Return'>1</Publish>\r
+      <Publish Dialog='LicenseAgreementDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg'>1</Publish>\r
+      <Publish Dialog='MaintenanceTypeDlg' Control='Back' Event='NewDialog' Value='MaintenanceWelcomeDlg'>1</Publish>\r
+      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg'>\r
+        Installed AND PATCH\r
+      </Publish>\r
+      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='InstallDirDlg'>\r
+        NOT Installed\r
+      </Publish>\r
+      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='MaintenanceTypeDlg'>\r
+        Installed AND NOT PATCH\r
+      </Publish>\r
+\r
+      <!-- Events we need to kill -->\r
+      <Publish Dialog='InstallDirDlg' Control='Back' Event='NewDialog' Value='LicenseAgreementDlg'>1</Publish>\r
+\r
+      <Publish Dialog='InstallDirDlg' Control='Next' Event='NewDialog' Value='VerifyReadyDlg' Order='4'>\r
+        WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"\r
+      </Publish>\r
+\r
+      <Publish Dialog='InstallDirDlg' Control='Next' Event='SpawnDialog' Value='InvalidDirDlg' Order='3'>\r
+        NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;"1"\r
+      </Publish>\r
+\r
+      <Publish Dialog='InstallDirDlg' Control='Next' Event='DoAction' Value='WixUIValidatePath' Order='2'>\r
+        NOT WIXUI_DONTVALIDATEPATH\r
+      </Publish>\r
+      <Publish Dialog='InstallDirDlg' Control='Next' Event='SetTargetPath' Value='[WIXUI_INSTALLDIR]' Order='1'>1</Publish>\r
+      <Publish Dialog='InstallDirDlg' Control='ChangeFolder' Event='SpawnDialog' Value='BrowseDlg'>1</Publish>\r
+      <Publish Dialog='InstallDirDlg' Control='ChangeFolder' Event='[_BrowseProprty]' Value='[WIXUI_INSTALLDIR]' >1</Publish>\r
 \r
-    <UI Id="Shib_InstallDir">\r
-      <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />\r
-      <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />\r
-      <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />\r
-\r
-      <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />\r
-      <Property Id="WixUI_Mode" Value="InstallDir" />\r
-      <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />\r
-\r
-      <DialogRef Id="BrowseDlg" />\r
-      <DialogRef Id="DiskCostDlg" />\r
-      <DialogRef Id="ErrorDlg" />\r
-      <DialogRef Id="FatalError" />\r
-      <DialogRef Id="FilesInUse" />\r
-      <DialogRef Id="MsiRMFilesInUse" />\r
-      <DialogRef Id="PrepareDlg" />\r
-      <DialogRef Id="ProgressDlg" />\r
-      <DialogRef Id="ResumeDlg" />\r
-      <DialogRef Id="UserExit" />\r
-\r
-      <!-- Our dialogs -->\r
-      <DialogRef Id="ShibdDlg" />\r
-      <DialogRef Id="IISDlg" />\r
-\r
-      <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>\r
-      <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>\r
-\r
-      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>\r
-\r
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>\r
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>\r
-\r
-      <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>\r
-      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">LicenseAccepted = "1"</Publish>\r
-\r
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>\r
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>\r
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>\r
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>\r
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="ShibdDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>\r
-      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>\r
-      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>\r
-\r
-      <Publish Dialog="ShibdDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg">1</Publish>\r
-      <Publish Dialog="ShibdDlg" Control="Next" Event="NewDialog" Value="IISDlg">IISMAJORVERSION</Publish>\r
-      <Publish Dialog="ShibdDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">NOT IISMAJORVERSION</Publish>\r
-\r
-      <Publish Dialog="IISDlg" Control="Back" Event="NewDialog" Value="ShibdDlg">1</Publish>\r
-      <Publish Dialog="IISDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>\r
-\r
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="IISDlg" Order="1">(NOT Installed) AND IISMAJORVERSION </Publish>\r
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="IISDlg" Order="1">(NOT Installed) AND (NOT IISMAJORVERSION)</Publish>\r
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>\r
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>\r
-\r
-      <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>\r
-\r
-      <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>\r
-      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>\r
-      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>\r
 \r
     </UI>\r
-\r
-    <UIRef Id="WixUI_Common" />\r
-\r
   </Fragment>\r
 </Wix>\r
diff --git a/msi/WiX/ShibbolethSP-iis-dialog.wxs b/msi/WiX/ShibbolethSP-iis-dialog.wxs
deleted file mode 100644 (file)
index 21386e3..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the 'License'); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an 'AS IS' BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Fragment>\r
-    <UI>\r
-      <Dialog Id='IISDlg' Width='370' Height='270' Title='[ProductName] Setup' >\r
-        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Default='yes' \r
-                 Text='!(loc.WixUINext)' />\r
-        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' \r
-                 Text='!(loc.WixUIBack)' />\r
-        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Cancel='yes' \r
-                 Text='!(loc.WixUICancel)'>\r
-          <Publish Event='SpawnDialog' Value='CancelDlg'>1</Publish>\r
-        </Control>\r
-\r
-        <Control Id='Title' Type='Text' X='15' Y='6' Width='200' Height='15' Transparent='yes' NoPrefix='yes' \r
-                 Text='{\WixUI_Font_Title}Install ISAPI Filter' />\r
-        <Control Id='BannerBitmap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' TabSkip='no' \r
-                 Text='!(loc.InstallDirDlgBannerBitmap)' />\r
-        <Control Id='Description' Type='Text' X='25' Y='23' Width='280' Height='15' Transparent='yes'\r
-                 NoPrefix='yes' Text='Install the ISAPI filter for IIS' />\r
-        <Control Id='BannerLine' Type='Line' X='0' Y='44' Width='370' Height='0' />\r
-        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='0' />\r
-\r
-\r
-        <Control Id='IISLine2' Type='Text' X='25' Y='79' Width='312' Height='20' \r
-                 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).'/>\r
-        <Control Id='InstallISAPICheckBox' Type='CheckBox' X='86' Y='120' Width='180' Height='14' \r
-                 Property='INSTALL_ISAPI_FILTER' Text='Install ISAPI filter and configure IIS' \r
-                 CheckBoxValue='TRUE' TabSkip='yes' />\r
-\r
-        <Control Id='ShibExtensionBox' Type='GroupBox' X='99' Y='145' Width='175' Height='35' TabSkip='yes' />\r
-        <Control Id='ShibExtensionText' Type='Text' X='114' Y='160' Width='96' Height='12' \r
-                 Text='Shibboleth File Extension:' TabSkip='yes'/>\r
-        <Control Id='ShibExtensionEdit' Type='Edit' X='211' Y='157' Width='51' Height='16' \r
-                 Property='SHIB_FILE_EXTENSION' TabSkip='yes'>\r
-          <Condition Action='disable'>INSTALL_ISAPI_FILTER &lt;&gt; "TRUE"</Condition>\r
-          <Condition Action='enable'>INSTALL_ISAPI_FILTER = "TRUE"</Condition>\r
-        </Control>\r
-\r
-      </Dialog>\r
-    </UI>\r
-  </Fragment>\r
-</Wix>\r
index 2fe4dae..d54e803 100644 (file)
@@ -41,7 +41,7 @@
 \r
     <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->\r
     <Property Id='IS64BITINSTALL' Value='TRUE'/>\r
-    <UIRef Id="Shib_InstallDir"/>\r
+    <UIRef Id='ShibbolethInstallDir'/>\r
 \r
 \r
     <!-- Files -->\r
index 71e336a..93c616f 100644 (file)
@@ -42,7 +42,8 @@
 \r
     <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->\r
     <Property Id='IS64BITINSTALL' Value='FALSE'/>\r
-    <UIRef Id="Shib_InstallDir"/>\r
+\r
+    <UIRef Id='ShibbolethInstallDir'/> \r
 \r
     <!-- Files -->\r
     <Directory Id='TARGETDIR' Name='SourceDir'>\r
diff --git a/msi/WiX/ShibbolethSP-shibd-dialog.wxs b/msi/WiX/ShibbolethSP-shibd-dialog.wxs
deleted file mode 100644 (file)
index 3470074..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the 'License'); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an 'AS IS' BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Fragment>\r
-    <UI>\r
-      <Dialog Id='ShibdDlg' Width='370' Height='270' Title='[ProductName] Setup'>\r
-        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Default='yes' Text='!(loc.WixUINext)' />\r
-        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' Text='!(loc.WixUIBack)' />\r
-        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Cancel='yes' Text='!(loc.WixUICancel)'>\r
-          <Publish Event='SpawnDialog' Value='CancelDlg'>1</Publish>\r
-        </Control>\r
-\r
-        <Control Id='Title' Type='Text' X='15' Y='6' Width='200' Height='15' Transparent='yes' NoPrefix='yes' \r
-                 Text='{\WixUI_Font_Title}Shibboleth Service Provider' />\r
-\r
-        <Control Id='BannerBitmap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' TabSkip='no' \r
-                 Text='!(loc.InstallDirDlgBannerBitmap)' />\r
-\r
-        <Control Id='Description64' Type='Text' X='25' Y='23' Width='300' Height='20' Transparent='yes' NoPrefix='yes' \r
-                 Text='Control service, and specify which architecture (64-bit or 32-bit) to make active.'>\r
-          <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>\r
-        </Control>\r
-        <!--\r
-        <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'>\r
-          <Condition Action='hide' >IS64BITINSTALL = "TRUE"</Condition>\r
-        </Control>\r
-        -->\r
-\r
-        <Control Id='BannerLine' Type='Line' X='0' Y='44' Width='370' Height='0' />\r
-        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='0' />\r
-\r
-        <!--\r
-        <Control Id='ShibdLine1' Type='Text' X='25' Y='60' Width='312' Height='10' \r
-                 Text='Please enter the TCP port number in which the shibd daemon should run'/>\r
-        <Control Id='ShibdLine2' Type='Text' X='25' Y='79' Width='312' Height='20' \r
-                 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!'/>\r
-        <Control Id='ShibdLine3' Type='Text' X='25' Y='108' Width='312' Height='20' \r
-                 Text='If a copy of shibboleth2.xml already exists in the installation path, it will NOT be updated with this new port number.'/>\r
-        -->\r
-        \r
-        <!--\r
-        <Control Id='ShibdPortBox' Type='GroupBox' X='131' Y='165' Width='104' Height='35' />\r
-        <Control Id='ShibdPortText' Type='Text' X='146' Y='181' Width='40' Height='12' Text='Shibd port' >\r
-          <Condition Action='disable'>INSTALL_SHIBD_SERVICE &lt;&gt; "TRUE"</Condition>\r
-          <Condition Action='enable'>INSTALL_SHIBD_SERVICE = "TRUE"</Condition>\r
-        </Control>\r
-        <Control Id='ShibdPortEnter' Type='Edit' X='187' Y='178' Width='35' Height='16' \r
-                 Property='SHIBD_PORT' TabSkip='no'>\r
-          <Condition Action='disable'>INSTALL_SHIBD_SERVICE &lt;&gt; "TRUE"</Condition>\r
-          <Condition Action='enable'>INSTALL_SHIBD_SERVICE = "TRUE"</Condition>\r
-        </Control>\r
-        -->\r
-\r
-        <Control Id='InstallShibdCheckBox' Type='CheckBox' X='80' Y='80' Width='250' Height='30' \r
-          Property='INSTALL_SHIBD_SERVICE' Text='Install Shibboleth Daemon as a service (recommended).' \r
-          CheckBoxValue='TRUE' TabSkip='yes' />\r
-\r
-        <Control Id='ShibdLine1' Type='Text' X='25' Y='140' Width='312' Height='20' \r
-          Text='By default, Shibboleth will operate as a 64-bit system. You can change this now, or after installation.'>\r
-          <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>\r
-        </Control>\r
-        \r
-        <Control Id='Install32BitShibd' Type='CheckBox' X='118' Y='170' Width='250' Height='30' \r
-                 Property='INSTALL_32BIT' Text='Run as a 32-bit system instead.' \r
-                 CheckBoxValue='TRUE' TabSkip='yes'>\r
-          <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>\r
-        </Control>\r
-\r
-      </Dialog>\r
-    </UI>\r
-  </Fragment>\r
-</Wix>\r
diff --git a/msi/WiX/new.bmp b/msi/WiX/new.bmp
new file mode 100644 (file)
index 0000000..27881df
Binary files /dev/null and b/msi/WiX/new.bmp differ
diff --git a/msi/WiX/up.bmp b/msi/WiX/up.bmp
new file mode 100644 (file)
index 0000000..86f6b5a
Binary files /dev/null and b/msi/WiX/up.bmp differ