wixcop -indent:2 ShibbolethSP-registry-x86.wxs
candle ShibbolethSP-registry-x86.wxs
+wixcop -indent:2 ShibbolethSP-gui.wxs
+candle ShibbolethSP-gui.wxs
+
+wixcop -indent:2 ShibbolethSP-shibd-dialog.wxs
+candle ShibbolethSP-shibd-dialog.wxs
+
+wixcop -indent:2 ShibbolethSP-iis-dialog.wxs
+candle ShibbolethSP-iis-dialog.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 -ext WixUtilExtension.dll -ext WixUIExtension
+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-shibd-dialog.wixobj ShibbolethSP-iis-dialog.wixobj ShibbolethSP-gui.wixobj -ext WixUtilExtension.dll -ext WixUIExtension
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 -ext WixUtilExtension.dll -ext WixUIExtension
+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-shibd-dialog.wixobj ShibbolethSP-iis-dialog.wixobj ShibbolethSP-gui.wixobj -ext WixUtilExtension.dll -ext WixUIExtension
+++ /dev/null
-<?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
-<Include>\r
-\r
- <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />\r
- <UIRef Id="WixUI_InstallDir" />\r
-\r
- <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />\r
- <WixVariable Id="WixUIBannerBmp" Value="TopBanner.bmp" />\r
- <WixVariable Id="WixUIDialogBmp" Value="Dialog.bmp" />\r
-\r
-\r
-</Include>\r
--- /dev/null
+<?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
+\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
+\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">1</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</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
--- /dev/null
+<?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='154' 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='165' Width='175' Height='35' TabSkip='yes' />\r
+ <Control Id='ShibExtensionText' Type='Text' X='114' Y='180' Width='96' Height='12' \r
+ Text='Shibboleth File Extension:' TabSkip='yes'/>\r
+ <Control Id='ShibExtensionEdit' Type='Edit' X='211' Y='177' Width='51' Height='16' \r
+ Property='SHIB_FILE_EXTENSION' TabSkip='yes'>\r
+ <Condition Action='disable'>INSTALL_ISAPI_FILTER <> "TRUE"</Condition>\r
+ <Condition Action='enable'>INSTALL_ISAPI_FILTER = "TRUE"</Condition>\r
+ </Control>\r
+\r
+ </Dialog>\r
+ </UI>\r
+ </Fragment>\r
+</Wix>\r
\r
<Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
\r
+\r
<?include ShibbolethSP-properties.wxi?>\r
\r
- <?include ShibbolethSP-gui.wxi ?>\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
+\r
\r
<!-- Files -->\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
\r
<?include ShibbolethSP-properties.wxi?>\r
\r
- <?include ShibbolethSP-gui.wxi ?>\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
<!-- Files -->\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<!-- set service path to 64 bit one if this is an install and if we werre told to -->\r
\r
<Custom Action='SetServicePath64' \r
- Before='CostInitialize'>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT)</Custom>\r
+ Before='CostInitialize'>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")</Custom>\r
<Custom Action='ServicePath64' \r
- After='InstallServices'>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT)</Custom>\r
+ After='InstallServices'>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")</Custom>\r
\r
\r
<!-- Do not mess with SCM if this is an upgrade -->\r
--- /dev/null
+<?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}Shibd Service' />\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='280' Height='15' Transparent='yes' NoPrefix='yes' \r
+ Text='Specify which architecture to run and the port for the Shibd daemon'>\r
+ <Condition Action='hide' >IS64BITINSTALL <> "TRUE"</Condition>\r
+ </Control>\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
+ <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 shibboleth.xml already exists in the installation path, it will NOT be updated with this new port number.'/>\r
+ <Control Id='InstallShibdCheckBox' Type='CheckBox' X='118' Y='154' Width='96' Height='14' \r
+ Property='INSTALL_SHIBD_SERVICE' Text='Install Shibd daemon' \r
+ CheckBoxValue='TRUE' TabSkip='yes' />\r
+\r
+ <Control Id='ShibdPortBox' Type='GroupBox' X='131' Y='165' Width='104' Height='35' />\r
+\r
+ <Control Id='ShibdPortText' Type='Text' X='146' Y='181' Width='40' Height='12' Text='Shibd port' >\r
+ <Condition Action='disable'>INSTALL_SHIBD_SERVICE <> "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 <> "TRUE"</Condition>\r
+ <Condition Action='enable'>INSTALL_SHIBD_SERVICE = "TRUE"</Condition>\r
+ </Control>\r
+\r
+ <Control Id='Install32BitShibd' Type='CheckBox' X='118' Y='205' Width='140' Height='14' \r
+ Property='INSTALL_32BIT' Text='Install 32 bit shibd and plugins' \r
+ CheckBoxValue='TRUE' TabSkip='yes'>\r
+ <Condition Action='hide' >IS64BITINSTALL <> "TRUE"</Condition>\r
+ </Control>\r
+\r
+ </Dialog>\r
+ </UI>\r
+ </Fragment>\r
+</Wix>\r
projects / shibboleth / cpp-sp.git / commitdiff