[cpp-sp] 01/01: CPPSP-50 Windows installer - upgrades do not work
Codeberg
noreply at shibboleth.net
Wed Mar 4 13:59:39 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch dev/CPPSP-50
in repository cpp-sp.
View the commit online:
https://codeberg.org/Shibboleth/cpp-sp/commit/8546a38a82d46cc7c3764e376be4ac18432cc592
commit 8546a38a82d46cc7c3764e376be4ac18432cc592
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Mar 4 13:57:15 2026 +0000
CPPSP-50 Windows installer - upgrades do not work
https://shibboleth.atlassian.net/browse/CPPSP-50
DEV BRANCH ONLY. Commit the V3->V4 converted old installer.
---
configs/keygen.bat | 2 +-
msi/WiX/Patch-x64.wxs | 3 +-
msi/WiX/Patch-x86.wxs | 3 +-
msi/WiX/ShibbolethSP-defs-x86.wxi | 17 ++-
msi/WiX/ShibbolethSP-exe-x64.wxs | 124 +++++++++++----------
msi/WiX/ShibbolethSP-exe-x86.wxs | 106 +++++++++---------
msi/WiX/ShibbolethSP-gui.wxs | 68 ++++--------
msi/WiX/ShibbolethSP-install-dlg.wxs | 33 ++----
msi/WiX/ShibbolethSP-main-x64.wxs | 199 +++++++++++++++-------------------
msi/WiX/ShibbolethSP-main-x86.wxs | 121 +++++++++------------
msi/WiX/ShibbolethSP-noarch.wxs | 129 ++++++++++------------
msi/WiX/ShibbolethSP-properties.wxi | 6 +-
msi/WiX/ShibbolethSP-registry-x64.wxs | 34 +++---
msi/WiX/ShibbolethSP-registry-x86.wxs | 8 +-
msi/WiX/ShibbolethSP-update-dlg.wxs | 10 +-
15 files changed, 386 insertions(+), 477 deletions(-)
diff --git a/configs/keygen.bat b/configs/keygen.bat
index 53a7fe16..52641194 100644
--- a/configs/keygen.bat
+++ b/configs/keygen.bat
@@ -52,7 +52,7 @@ echo [ext] >>%CNF%
if defined ENTITYID (echo subjectAltName=DNS:%FQDN%,URI:%ENTITYID% >>%CNF%) else (echo subjectAltName=DNS:%FQDN% >>%CNF%)
echo subjectKeyIdentifier=hash >>%CNF%
openssl.exe req -config %CNF% -new -x509 -days %DAYS% -keyout "%OUT%\%PREFIX%-key.pem" -out "%OUT%\%PREFIX%-cert.pem"
-del %CNF%
+rem del %CNF%
exit /b
:protect
diff --git a/msi/WiX/Patch-x64.wxs b/msi/WiX/Patch-x64.wxs
index e5565377..580a8cc2 100644
--- a/msi/WiX/Patch-x64.wxs
+++ b/msi/WiX/Patch-x64.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<PatchCreation Id="{17B36DC5-D54C-4484-9735-0E57B2866153}" CleanWorkingFolder="yes" OutputPath="openssl-101h-on-2.5.3-patch-win64.pcp" WholeFilesOnly="yes">
<!-- Information put into the summary (Details) field -->
diff --git a/msi/WiX/Patch-x86.wxs b/msi/WiX/Patch-x86.wxs
index de3b385b..84b6f0da 100644
--- a/msi/WiX/Patch-x86.wxs
+++ b/msi/WiX/Patch-x86.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<PatchCreation Id="{875E0FB8-5238-4487-912A-04B043CEB5FB}" CleanWorkingFolder="yes" OutputPath="openssl-101h-on-2.5.3-patch-win32.pcp" WholeFilesOnly="yes">
<!-- Information put into the summary (Details) field -->
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index d4865152..faa6b5bf 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- ShibbolethSP-noarch -->
- <ComponentRef Id="ProtectInstallDir"/>
+ <ComponentRef Id="ProtectInstallDir" />
<ComponentRef Id="main.css" />
<ComponentRef Id="CREDITS.txt" />
<ComponentRef Id="LICENSE.txt" />
@@ -48,7 +47,7 @@
<?if $(var.BuildDebug) != "" ?>
<ComponentRef Id="resolvertest.exe_debug" />
<ComponentRef Id="mdquery.exe_debug" />
- <?endif ?>
+ <?endif?>
<ComponentRef Id="adfs.so" />
<ComponentRef Id="adfs_lite.so" />
@@ -57,7 +56,7 @@
<ComponentRef Id="mod_shib_22.so" />
<?if $(var.NSApi) != "" ?>
<ComponentRef Id="nsapi_shib.dll" />
- <?endif ?>
+ <?endif?>
<ComponentRef Id="mod_shib_24.so" />
<ComponentRef Id="odbc_store.so" />
<ComponentRef Id="plugins.so" />
@@ -65,7 +64,7 @@
<?if $(var.FCGI) != "" ?>
<ComponentRef Id="shibauthorizer.exe" />
<ComponentRef Id="shibresponder.exe" />
- <?endif ?>
+ <?endif?>
<?if $(var.BuildDebug) != "" ?>
<ComponentRef Id="adfs.so_debug" />
@@ -75,7 +74,7 @@
<ComponentRef Id="mod_shib_22.so_debug" />
<?if $(var.NSApi) != "" ?>
<ComponentRef Id="nsapi_shib.dll_debug" />
- <?endif ?>
+ <?endif?>
<ComponentRef Id="mod_shib_24.so_debug" />
<ComponentRef Id="odbc_store.so_debug" />
<ComponentRef Id="plugins.so_debug" />
@@ -83,10 +82,10 @@
<?if $(var.FCGI) != "" ?>
<ComponentRef Id="shibauthorizer.exe_debug" />
<ComponentRef Id="shibresponder.exe_debug" />
- <?endif ?>
+ <?endif?>
<ComponentRef Id="shibd.exe_debug" />
- <?endif ?>
+ <?endif?>
<!-- ShibbolethSP-registry-x32 -->
<ComponentRef Id="TargetDir" />
diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
index 4a8c167b..a34496a0 100644
--- a/msi/WiX/ShibbolethSP-exe-x64.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x64.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
+<!-- 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
@@ -16,131 +14,131 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->
<Fragment>
<!-- Configuration, licenses and documentation -->
<DirectoryRef Id="INSTALLDIR">
<Directory Id="bin64" Name="bin64" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release">
- <Component Id="resolvertest64.exe" Guid="{C29672B6-971D-4828-BB51-1190C0877381}" Win64="yes">
+ <Component Id="resolvertest64.exe" Guid="{C29672B6-971D-4828-BB51-1190C0877381}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="resolvertest64.exe" Name="resolvertest.exe" />
- <File KeyPath="no" Checksum="no" Id="resolvertest64.pdb" Name="resolvertest.pdb" />
+ <File KeyPath="no" Checksum="no" Id="resolvertest64.pdb" Name="resolvertest.pdb" />
</Component>
- <Component Id="mdquery64.exe" Guid="{3645630B-3991-4693-8664-A49242B9CF05}" Win64="yes">
+ <Component Id="mdquery64.exe" Guid="{3645630B-3991-4693-8664-A49242B9CF05}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="mdquery64.exe" Name="mdquery.exe" />
- <File KeyPath="no" Checksum="no" Id="mdquery64.pfb" Name="mdquery.pdb" />
+ <File KeyPath="no" Checksum="no" Id="mdquery64.pfb" Name="mdquery.pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="bin64_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug">
- <Component Id="resolvertest64.exe_debug" Guid="{58C98426-8C96-41EE-B956-A6BBAEAE5A10}" Win64="yes">
+ <Component Id="resolvertest64.exe_debug" Guid="{58C98426-8C96-41EE-B956-A6BBAEAE5A10}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="resolvertest64.exe_debug" Name="resolvertest.exe" />
- <File KeyPath="no" Checksum="no" Id="resolvertest64.pdb_debug" Name="resolvertest.pdb" />
+ <File KeyPath="no" Checksum="no" Id="resolvertest64.pdb_debug" Name="resolvertest.pdb" />
</Component>
- <Component Id="mdquery64.exe_debug" Guid="{2153EDFC-9962-4AF4-8071-40D0FF497BF9}" Win64="yes">
+ <Component Id="mdquery64.exe_debug" Guid="{2153EDFC-9962-4AF4-8071-40D0FF497BF9}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="mdquery64.exe_debug" Name="mdquery.exe" />
- <File KeyPath="no" Checksum="no" Id="mdquery64.pdb_debug" Name="mdquery.pdb" />
+ <File KeyPath="no" Checksum="no" Id="mdquery64.pdb_debug" Name="mdquery.pdb" />
</Component>
</Directory><!-- bin_debug -->
- <?endif ?>
+ <?endif?>
</Directory><!-- bin -->
<Directory Id="lib64" Name="lib64">
<Directory Id="lib64_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release">
- <Component Id="adfs64.so" Guid="{2891ECDC-F507-4CEC-8A65-8B20FB93F4B7}" Win64="yes">
+ <Component Id="adfs64.so" Guid="{2891ECDC-F507-4CEC-8A65-8B20FB93F4B7}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="adfs64.so" Name="adfs.so" />
- <File KeyPath="no" Checksum="no" Id="adfs64.pdb" Name="adfs.pdb" />
+ <File KeyPath="no" Checksum="no" Id="adfs64.pdb" Name="adfs.pdb" />
</Component>
- <Component Id="adfs_lite64.so" Guid="{1162CDA0-C3F8-4599-B01E-9EDAA73B2C0B}" Win64="yes">
+ <Component Id="adfs_lite64.so" Guid="{1162CDA0-C3F8-4599-B01E-9EDAA73B2C0B}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="adfs_lite64.so" Name="adfs-lite.so" />
- <File KeyPath="no" Checksum="no" Id="adfs_lite64.pdb" Name="adfs-lite.pdb" />
+ <File KeyPath="no" Checksum="no" Id="adfs_lite64.pdb" Name="adfs-lite.pdb" />
</Component>
- <Component Id="isapi_shib64.dll" Guid="{3BC7260B-D035-4F79-A39E-EDA0181BBB1B}" Win64="yes">
+ <Component Id="isapi_shib64.dll" Guid="{3BC7260B-D035-4F79-A39E-EDA0181BBB1B}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="isapi_shib64.dll" Name="isapi_shib.dll" />
- <File KeyPath="no" Checksum="no" Id="isapi_shib64.pdb" Name="isapi_shib.pdb" />
+ <File KeyPath="no" Checksum="no" Id="isapi_shib64.pdb" Name="isapi_shib.pdb" />
</Component>
- <Component Id="iis7_shib64.dll" Guid="{17B76ADE-0ECE-4214-809F-F32B3AB13D54}" Win64="yes">
+ <Component Id="iis7_shib64.dll" Guid="{17B76ADE-0ECE-4214-809F-F32B3AB13D54}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="iis7_shib64.dll" Name="iis7_shib.dll" />
- <File KeyPath="no" Checksum="no" Id="iis7_shib64.pdb" Name="iis7_shib.pdb" />
+ <File KeyPath="no" Checksum="no" Id="iis7_shib64.pdb" Name="iis7_shib.pdb" />
</Component>
- <Component Id="mod_shib_2264.so" Guid="{3C8F67F5-C7C2-40DB-94AB-A26266C113C8}" Win64="yes">
+ <Component Id="mod_shib_2264.so" Guid="{3C8F67F5-C7C2-40DB-94AB-A26266C113C8}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="mod_shib_2264.so" Name="mod_shib_22.so" />
- <File KeyPath="no" Checksum="no" Id="mod_shib_2264.pdb" Name="mod_shib_22.pdb" />
+ <File KeyPath="no" Checksum="no" Id="mod_shib_2264.pdb" Name="mod_shib_22.pdb" />
</Component>
- <Component Id="mod_shib_2464.so" Guid="{6A7EDDE5-9593-4A8D-B767-E171856EEDD4}" Win64="yes">
+ <Component Id="mod_shib_2464.so" Guid="{6A7EDDE5-9593-4A8D-B767-E171856EEDD4}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="mod_shib_2464.so" Name="mod_shib_24.so" />
- <File KeyPath="no" Checksum="no" Id="mod_shib_2464.pdb" Name="mod_shib_24.pdb" />
+ <File KeyPath="no" Checksum="no" Id="mod_shib_2464.pdb" Name="mod_shib_24.pdb" />
</Component>
- <Component Id="odbc_store64.so" Guid="{D9CF6BD3-4BDB-4BC5-9EB3-6C68CA7544B6}" Win64="yes">
+ <Component Id="odbc_store64.so" Guid="{D9CF6BD3-4BDB-4BC5-9EB3-6C68CA7544B6}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="odbc_store64.so" Name="odbc-store.so" />
- <File KeyPath="no" Checksum="no" Id="odbc_store64.pdb" Name="odbc-store.pdb" />
+ <File KeyPath="no" Checksum="no" Id="odbc_store64.pdb" Name="odbc-store.pdb" />
</Component>
- <Component Id="plugins64.so" Guid="{C78105F1-1258-41A4-8505-5437E90FB1B4}" Win64="yes">
+ <Component Id="plugins64.so" Guid="{C78105F1-1258-41A4-8505-5437E90FB1B4}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="plugins64.so" Name="plugins.so" />
- <File KeyPath="no" Checksum="no" Id="plugins64.pdb" Name="plugins.pdb" />
+ <File KeyPath="no" Checksum="no" Id="plugins64.pdb" Name="plugins.pdb" />
</Component>
- <Component Id="plugins_lite64.so" Guid="{83CA3D25-2370-426A-9747-B8A74EFC9037}" Win64="yes">
+ <Component Id="plugins_lite64.so" Guid="{83CA3D25-2370-426A-9747-B8A74EFC9037}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="plugins_lite64.so" Name="plugins-lite.so" />
- <File KeyPath="no" Checksum="no" Id="plugins_lite64.pdb" Name="plugins-lite.pdb" />
+ <File KeyPath="no" Checksum="no" Id="plugins_lite64.pdb" Name="plugins-lite.pdb" />
</Component>
<?if $(var.FCGI) != "" ?>
- <Component Id="shibauthorizer64.exe" Guid="{5A323F4F-AE87-451A-9253-1965E46C9C5F}" Win64="yes">
+ <Component Id="shibauthorizer64.exe" Guid="{5A323F4F-AE87-451A-9253-1965E46C9C5F}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="shibauthorizer64.exe" Name="shibauthorizer.exe" />
- <File KeyPath="no" Checksum="no" Id="shibauthorizer64.pdb" Name="shibauthorizer.pdb" />
+ <File KeyPath="no" Checksum="no" Id="shibauthorizer64.pdb" Name="shibauthorizer.pdb" />
</Component>
- <Component Id="shibresponder64.exe" Guid="{538D6EEC-1AE1-400B-94AF-2B7791BFEBDA}" Win64="yes">
+ <Component Id="shibresponder64.exe" Guid="{538D6EEC-1AE1-400B-94AF-2B7791BFEBDA}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="shibresponder64.exe" Name="shibresponder.exe" />
- <File KeyPath="no" Checksum="no" Id="shibresponder64.pdb" Name="shibresponder.pdb" />
+ <File KeyPath="no" Checksum="no" Id="shibresponder64.pdb" Name="shibresponder.pdb" />
</Component>
- <?endif ?>
+ <?endif?>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib64_shibboleth_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug">
- <Component Id="adfs64.so_debug" Guid="{BFF58DDD-CF04-49B1-A172-C84087705D2A}" Win64="yes">
+ <Component Id="adfs64.so_debug" Guid="{BFF58DDD-CF04-49B1-A172-C84087705D2A}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="adfs64.so_debug" Name="adfs.so" />
- <File KeyPath="no" Checksum="no" Id="adfs64.pdb_debug" Name="adfs.pdb" />
+ <File KeyPath="no" Checksum="no" Id="adfs64.pdb_debug" Name="adfs.pdb" />
</Component>
- <Component Id="adfs_lite64.so_debug" Guid="{2A3D71BE-BF8F-4CBD-B890-B25F391B09FA}" Win64="yes">
+ <Component Id="adfs_lite64.so_debug" Guid="{2A3D71BE-BF8F-4CBD-B890-B25F391B09FA}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="adfs_lite64.so_debug" Name="adfs-lite.so" />
- <File KeyPath="no" Checksum="no" Id="adfs_lite64.pdb_debug" Name="adfs-lite.pdb" />
+ <File KeyPath="no" Checksum="no" Id="adfs_lite64.pdb_debug" Name="adfs-lite.pdb" />
</Component>
- <Component Id="isapi_shib64.dll_debug" Guid="{60BC5679-A40E-42E5-9FC0-CCE924E660ED}" Win64="yes">
+ <Component Id="isapi_shib64.dll_debug" Guid="{60BC5679-A40E-42E5-9FC0-CCE924E660ED}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="isapi_shib64.dll_debug" Name="isapi_shib.dll" />
- <File KeyPath="no" Checksum="no" Id="isapi_shib64.pdb_debug" Name="isapi_shib.pdb" />
+ <File KeyPath="no" Checksum="no" Id="isapi_shib64.pdb_debug" Name="isapi_shib.pdb" />
</Component>
- <Component Id="iis7_shib64.dll_debug" Guid="{C6071995-5BFC-4F43-AE02-E6C6510983C5}" Win64="yes">
+ <Component Id="iis7_shib64.dll_debug" Guid="{C6071995-5BFC-4F43-AE02-E6C6510983C5}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="iis7_shib64.dll_debug" Name="iis7_shib.dll" />
- <File KeyPath="no" Checksum="no" Id="iis7_shib64.pdb_debug" Name="iis7_shib.pdb" />
+ <File KeyPath="no" Checksum="no" Id="iis7_shib64.pdb_debug" Name="iis7_shib.pdb" />
</Component>
- <Component Id="mod_shib_2264.so_debug" Guid="{59FE3C18-1920-48A0-80BC-7ECF8579E441}" Win64="yes">
+ <Component Id="mod_shib_2264.so_debug" Guid="{59FE3C18-1920-48A0-80BC-7ECF8579E441}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="mod_shib_2264.so_debug" Name="mod_shib_22.so" />
- <File KeyPath="no" Checksum="no" Id="mod_shib_2264.pdb_debug" Name="mod_shib_22.pdb" />
+ <File KeyPath="no" Checksum="no" Id="mod_shib_2264.pdb_debug" Name="mod_shib_22.pdb" />
</Component>
- <Component Id="mod_shib_2464.so_debug" Guid="{38EE87FE-EA2B-41B4-A457-38A8F84B9866}" Win64="yes">
+ <Component Id="mod_shib_2464.so_debug" Guid="{38EE87FE-EA2B-41B4-A457-38A8F84B9866}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="mod_shib_2464.so_debug" Name="mod_shib_24.so" />
- <File KeyPath="no" Checksum="no" Id="mod_shib_2464.pdb_debug" Name="mod_shib_24.pdb" />
+ <File KeyPath="no" Checksum="no" Id="mod_shib_2464.pdb_debug" Name="mod_shib_24.pdb" />
</Component>
- <Component Id="odbc_store64.so_debug" Guid="{586CE55A-F089-4541-96D5-5EE26F8FC471}" Win64="yes">
+ <Component Id="odbc_store64.so_debug" Guid="{586CE55A-F089-4541-96D5-5EE26F8FC471}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="odbc_store64.so_debug" Name="odbc-store.so" />
- <File KeyPath="no" Checksum="no" Id="odbc_store64.pdb_debug" Name="odbc-store.pdb" />
+ <File KeyPath="no" Checksum="no" Id="odbc_store64.pdb_debug" Name="odbc-store.pdb" />
</Component>
- <Component Id="plugins64.so_debug" Guid="{E6E051C8-6C84-4CC9-B718-365E627068B6}" Win64="yes">
+ <Component Id="plugins64.so_debug" Guid="{E6E051C8-6C84-4CC9-B718-365E627068B6}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="plugins64.so_debug" Name="plugins.so" />
- <File KeyPath="no" Checksum="no" Id="plugins64.pdb_debug" Name="plugins.pdb" />
+ <File KeyPath="no" Checksum="no" Id="plugins64.pdb_debug" Name="plugins.pdb" />
</Component>
- <Component Id="plugins_lite64.so_debug" Guid="{3A05BDF3-12C8-4502-A30D-7C8B9C7A5855}" Win64="yes">
+ <Component Id="plugins_lite64.so_debug" Guid="{3A05BDF3-12C8-4502-A30D-7C8B9C7A5855}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="plugins_lite64.so_debug" Name="plugins-lite.so" />
- <File KeyPath="no" Checksum="no" Id="plugins_lite64.pdb_debug" Name="plugins-lite.pdb" />
+ <File KeyPath="no" Checksum="no" Id="plugins_lite64.pdb_debug" Name="plugins-lite.pdb" />
</Component>
<?if $(var.FCGI) != "" ?>
- <Component Id="shibauthorizer64.exe_debug" Guid="{642C9137-66C8-4E2E-A76C-4D9F65B17157}" Win64="yes">
+ <Component Id="shibauthorizer64.exe_debug" Guid="{642C9137-66C8-4E2E-A76C-4D9F65B17157}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="shibauthorizer64.exe_debug" Name="shibauthorizer.exe" />
- <File KeyPath="no" Checksum="no" Id="shibauthorizer64.pdb_debug" Name="shibauthorizer.pdb" />
+ <File KeyPath="no" Checksum="no" Id="shibauthorizer64.pdb_debug" Name="shibauthorizer.pdb" />
</Component>
- <Component Id="shibresponder64.exe_debug" Guid="{7947F31A-1429-44FC-85B2-BF1E7AA50D20}" Win64="yes">
+ <Component Id="shibresponder64.exe_debug" Guid="{7947F31A-1429-44FC-85B2-BF1E7AA50D20}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="shibresponder64.exe_debug" Name="shibresponder.exe" />
- <File KeyPath="no" Checksum="no" Id="shibresponder64.pdb_debug" Name="shibresponder.pdb" />
+ <File KeyPath="no" Checksum="no" Id="shibresponder64.pdb_debug" Name="shibresponder.pdb" />
</Component>
- <?endif ?>
+ <?endif?>
</Directory><!-- lib_shibboleth_debug -->
- <?endif ?>
+ <?endif?>
</Directory><!-- lib_shibboleth -->
</Directory><!-- lib -->
<!-- the service bin -->
@@ -148,12 +146,12 @@
<!-- Service bins are declared in main -->
<?if $(var.BuildDebug) != "" ?>
<Directory Id="sbin64_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug">
- <Component Id="shibd64.exe_debug" Guid="{657A1902-0104-47C7-84A7-AEB5F736B02F}" Win64="yes">
+ <Component Id="shibd64.exe_debug" Guid="{657A1902-0104-47C7-84A7-AEB5F736B02F}" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="shibd64.exe_debug" Name="shibd.exe" />
- <File KeyPath="no" Checksum="no" Id="shibd64.pdb_debug" Name="shibd.pdb" />
+ <File KeyPath="no" Checksum="no" Id="shibd64.pdb_debug" Name="shibd.pdb" />
</Component>
</Directory><!-- sbin_debug -->
- <?endif ?>
+ <?endif?>
</Directory><!-- sbin -->
</DirectoryRef><!-- INSTALLDIR -->
</Fragment>
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index 1237838e..a18b7a40 100644
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
+<!-- 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
@@ -16,143 +14,143 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->
<Fragment>
<!-- Configuration, licenses and documentation -->
<DirectoryRef Id="INSTALLDIR">
<Directory Id="bin" Name="bin" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release">
<Component Id="resolvertest.exe" Guid="{D381B6FA-2971-457B-804E-F08DD517866F}">
- <File KeyPath="yes" Checksum="yes" Name="resolvertest.exe" />
- <File KeyPath="no" Checksum="no" Name="resolvertest.pdb" />
+ <File Id="resolvertest.exe" KeyPath="yes" Checksum="yes" Name="resolvertest.exe" />
+ <File Id="resolvertest.pdb" KeyPath="no" Checksum="no" Name="resolvertest.pdb" />
</Component>
<Component Id="mdquery.exe" Guid="{5F322597-3B26-48E5-95BA-CF991CF6D6DB}">
- <File KeyPath="yes" Checksum="yes" Name="mdquery.exe" />
- <File KeyPath="no" Checksum="no" Name="mdquery.pdb" />
+ <File Id="mdquery.exe" KeyPath="yes" Checksum="yes" Name="mdquery.exe" />
+ <File Id="mdquery.pdb" KeyPath="no" Checksum="no" Name="mdquery.pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="bin_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug">
<Component Id="resolvertest.exe_debug" Guid="{4FA03A33-961A-42E5-8D7A-5F2E207757DD}">
<File KeyPath="yes" Checksum="yes" Id="resolvertest.exe_debug" Name="resolvertest.exe" />
- <File KeyPath="no" Checksum="no" Id="resolvertest.pdb_debug" Name="resolvertest.pdb" />
+ <File KeyPath="no" Checksum="no" Id="resolvertest.pdb_debug" Name="resolvertest.pdb" />
</Component>
<Component Id="mdquery.exe_debug" Guid="{C7A4A6A5-3DAF-4254-9C29-1511AB3ABC62}">
<File KeyPath="yes" Checksum="yes" Id="mdquery.exe_debug" Name="mdquery.exe" />
- <File KeyPath="no" Checksum="no" Id="mdquery.pdb_debug" Name="mdquery.pdb" />
+ <File KeyPath="no" Checksum="no" Id="mdquery.pdb_debug" Name="mdquery.pdb" />
</Component>
</Directory><!-- bin_debug -->
- <?endif ?>
+ <?endif?>
</Directory><!-- bin -->
<Directory Id="lib" Name="lib">
<Directory Id="lib_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release">
<Component Id="adfs.so" Guid="{9C92C803-E905-4B43-8723-05678DC73B88}">
- <File KeyPath="yes" Checksum="yes" Name="adfs.so" />
- <File KeyPath="no" Checksum="no" Name="adfs.pdb" />
+ <File Id="adfs.so" KeyPath="yes" Checksum="yes" Name="adfs.so" />
+ <File Id="adfs.pdb" KeyPath="no" Checksum="no" Name="adfs.pdb" />
</Component>
<Component Id="adfs_lite.so" Guid="{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}">
- <File KeyPath="yes" Checksum="yes" Name="adfs-lite.so" />
- <File KeyPath="no" Checksum="no" Name="adfs-lite.pdb" />
+ <File Id="adfs_lite.so" KeyPath="yes" Checksum="yes" Name="adfs-lite.so" />
+ <File Id="adfs_lite.pdb" KeyPath="no" Checksum="no" Name="adfs-lite.pdb" />
</Component>
<Component Id="isapi_shib.dll" Guid="{716D6F4F-4185-4219-B1BA-1D15F867926E}">
- <File KeyPath="yes" Checksum="yes" Name="isapi_shib.dll" />
- <File KeyPath="no" Checksum="no" Name="isapi_shib.pdb" />
+ <File Id="isapi_shib.dll" KeyPath="yes" Checksum="yes" Name="isapi_shib.dll" />
+ <File Id="isapi_shib.pdb" KeyPath="no" Checksum="no" Name="isapi_shib.pdb" />
</Component>
<Component Id="iis7_shib.dll" Guid="{2DC61347-E3C9-467c-8530-6A369B53C729}">
- <File KeyPath="yes" Checksum="yes" Name="iis7_shib.dll" />
- <File KeyPath="no" Checksum="no" Name="iis7_shib.pdb" />
+ <File Id="iis7_shib.dll" KeyPath="yes" Checksum="yes" Name="iis7_shib.dll" />
+ <File Id="iis7_shib.pdb" KeyPath="no" Checksum="no" Name="iis7_shib.pdb" />
</Component>
<Component Id="mod_shib_22.so" Guid="{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}">
- <File KeyPath="yes" Checksum="yes" Name="mod_shib_22.so" />
- <File KeyPath="no" Checksum="no" Name="mod_shib_22.pdb" />
+ <File Id="mod_shib_22.so" KeyPath="yes" Checksum="yes" Name="mod_shib_22.so" />
+ <File Id="mod_shib_22.pdb" KeyPath="no" Checksum="no" Name="mod_shib_22.pdb" />
</Component>
<Component Id="mod_shib_24.so" Guid="{8CAE4DF0-C8A8-4A48-A213-F4B3AFE6F439}">
- <File KeyPath="yes" Checksum="yes" Name="mod_shib_24.so" />
- <File KeyPath="no" Checksum="no" Name="mod_shib_24.pdb" />
+ <File Id="mod_shib_24.so" KeyPath="yes" Checksum="yes" Name="mod_shib_24.so" />
+ <File Id="mod_shib_24.pdb" KeyPath="no" Checksum="no" Name="mod_shib_24.pdb" />
</Component>
<?if $(var.NSApi) != "" ?>
<Component Id="nsapi_shib.dll" Guid="{F199DD8A-292F-4C7D-AACB-7283852D6335}">
- <File KeyPath="yes" Checksum="yes" Name="nsapi_shib.dll" />
- <File KeyPath="no" Checksum="no" Name="nsapi_shib.pdb" />
+ <File Id="nsapi_shib.dll" KeyPath="yes" Checksum="yes" Name="nsapi_shib.dll" />
+ <File Id="nsapi_shib.pdb" KeyPath="no" Checksum="no" Name="nsapi_shib.pdb" />
</Component>
- <?endif ?>
+ <?endif?>
<Component Id="odbc_store.so" Guid="{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}">
- <File KeyPath="yes" Checksum="yes" Name="odbc-store.so" />
- <File KeyPath="no" Checksum="no" Name="odbc-store.pdb" />
+ <File Id="odbc_store.so" KeyPath="yes" Checksum="yes" Name="odbc-store.so" />
+ <File Id="odbc_store.pdb" KeyPath="no" Checksum="no" Name="odbc-store.pdb" />
</Component>
<Component Id="plugins.so" Guid="{F738E29B-903B-4C86-BE27-4C72EC69915E}">
- <File KeyPath="yes" Checksum="yes" Name="plugins.so" />
- <File KeyPath="no" Checksum="no" Name="plugins.pdb" />
+ <File Id="plugins.so" KeyPath="yes" Checksum="yes" Name="plugins.so" />
+ <File Id="plugins.pdb" KeyPath="no" Checksum="no" Name="plugins.pdb" />
</Component>
<Component Id="plugins_lite.so" Guid="{FF18A6B4-EDC7-4A9A-8BFE-C166DCE5243E}">
- <File KeyPath="yes" Checksum="yes" Name="plugins-lite.so" />
- <File KeyPath="no" Checksum="no" Name="plugins-lite.pdb" />
+ <File Id="plugins_lite.so" KeyPath="yes" Checksum="yes" Name="plugins-lite.so" />
+ <File Id="plugins_lite.pdb" KeyPath="no" Checksum="no" Name="plugins-lite.pdb" />
</Component>
<?if $(var.FCGI) != "" ?>
<Component Id="shibauthorizer.exe" Guid="{7C7C1C24-902A-4003-AE59-599E79161782}">
- <File KeyPath="yes" Checksum="yes" Name="shibauthorizer.exe" />
- <File KeyPath="no" Checksum="no" Name="shibauthorizer.pdb" />
+ <File Id="shibauthorizer.exe" KeyPath="yes" Checksum="yes" Name="shibauthorizer.exe" />
+ <File Id="shibauthorizer.pdb" KeyPath="no" Checksum="no" Name="shibauthorizer.pdb" />
</Component>
<Component Id="shibresponder.exe" Guid="{510267D9-61F2-47EF-99D2-CB3D21CB14EB}">
- <File KeyPath="yes" Checksum="yes" Name="shibresponder.exe" />
- <File KeyPath="no" Checksum="no" Name="shibresponder.pdb" />
+ <File Id="shibresponder.exe" KeyPath="yes" Checksum="yes" Name="shibresponder.exe" />
+ <File Id="shibresponder.pdb" KeyPath="no" Checksum="no" Name="shibresponder.pdb" />
</Component>
- <?endif ?>
+ <?endif?>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_shibboleth_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug">
<Component Id="adfs.so_debug" Guid="{9B8E071F-B251-4373-A786-8966FD0D22EF}">
<File KeyPath="yes" Checksum="yes" Id="adfs.so_debug" Name="adfs.so" />
- <File KeyPath="no" Checksum="no" Id="adfs.pdb_debug" Name="adfs.pdb" />
+ <File KeyPath="no" Checksum="no" Id="adfs.pdb_debug" Name="adfs.pdb" />
</Component>
<Component Id="adfs_lite.so_debug" Guid="{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}">
<File KeyPath="yes" Checksum="yes" Id="adfs_lite.so_debug" Name="adfs-lite.so" />
- <File KeyPath="no" Checksum="no" Id="adfs_lite.pdb_debug" Name="adfs-lite.pdb" />
+ <File KeyPath="no" Checksum="no" Id="adfs_lite.pdb_debug" Name="adfs-lite.pdb" />
</Component>
<Component Id="isapi_shib.dll_debug" Guid="{F8212D30-0BA8-4F02-B595-E8E5D312342B}">
<File KeyPath="yes" Checksum="yes" Id="isapi_shib.dll_debug" Name="isapi_shib.dll" />
- <File KeyPath="no" Checksum="no" Id="isapi_shib.pdb_debug" Name="isapi_shib.pdb" />
+ <File KeyPath="no" Checksum="no" Id="isapi_shib.pdb_debug" Name="isapi_shib.pdb" />
</Component>
<Component Id="iis7_shib.dll_debug" Guid="{24FC91C7-1401-4ac1-BC14-E881E47D88BD}">
<File KeyPath="yes" Checksum="yes" Id="iis7_shib.dll_debug" Name="iis7_shib.dll" />
- <File KeyPath="no" Checksum="no" Id="iis7_shib.pdb_debug" Name="iis7_shib.pdb" />
+ <File KeyPath="no" Checksum="no" Id="iis7_shib.pdb_debug" Name="iis7_shib.pdb" />
</Component>
<Component Id="mod_shib_22.so_debug" Guid="{3DA4492F-C0EA-4286-9C37-13F82342FA67}">
<File KeyPath="yes" Checksum="yes" Id="mod_shib_22.so_debug" Name="mod_shib_22.so" />
- <File KeyPath="no" Checksum="no" Id="mod_shib_22.pdb_debug" Name="mod_shib_22.pdb" />
+ <File KeyPath="no" Checksum="no" Id="mod_shib_22.pdb_debug" Name="mod_shib_22.pdb" />
</Component>
<Component Id="mod_shib_24.so_debug" Guid="{E04003DF-8C61-4C9E-87AB-89223C5E65DC}">
<File KeyPath="yes" Checksum="yes" Id="mod_shib_24.so_debug" Name="mod_shib_24.so" />
- <File KeyPath="no" Checksum="no" Id="mod_shib_24.pdb_debug" Name="mod_shib_24.pdb" />
+ <File KeyPath="no" Checksum="no" Id="mod_shib_24.pdb_debug" Name="mod_shib_24.pdb" />
</Component>
<?if $(var.NSApi) != "" ?>
<Component Id="nsapi_shib.dll_debug" Guid="{492A5D72-4FE0-417E-9023-311E1BF34816}">
<File KeyPath="yes" Checksum="yes" Id="nsapi_shib.dll_debug" Name="nsapi_shib.dll" />
- <File KeyPath="no" Checksum="no" Id="nsapi_shib.pdb_debug" Name="nsapi_shib.pdb" />
+ <File KeyPath="no" Checksum="no" Id="nsapi_shib.pdb_debug" Name="nsapi_shib.pdb" />
</Component>
- <?endif ?>
+ <?endif?>
<Component Id="odbc_store.so_debug" Guid="{F217D7CF-91C1-4318-901D-709C710803C6}">
<File KeyPath="yes" Checksum="yes" Id="odbc_store.so_debug" Name="odbc-store.so" />
- <File KeyPath="no" Checksum="no" Id="odbc_store.pdb_debug" Name="odbc-store.pdb" />
+ <File KeyPath="no" Checksum="no" Id="odbc_store.pdb_debug" Name="odbc-store.pdb" />
</Component>
<Component Id="plugins.so_debug" Guid="{6D3F2ABC-EFD4-4BF7-889D-3FD0DBE3727C}">
<File KeyPath="yes" Checksum="yes" Id="plugins.so_debug" Name="plugins.so" />
- <File KeyPath="no" Checksum="no" Id="plugins.pdb_debug" Name="plugins.pdb" />
+ <File KeyPath="no" Checksum="no" Id="plugins.pdb_debug" Name="plugins.pdb" />
</Component>
<Component Id="plugins_lite.so_debug" Guid="{83A9DA0D-774C-4F96-9446-D5A1B61BB4A2}">
<File KeyPath="yes" Checksum="yes" Id="plugins_lite.so_debug" Name="plugins-lite.so" />
- <File KeyPath="no" Checksum="no" Id="plugins_lite.pdb_debug" Name="plugins-lite.pdb" />
+ <File KeyPath="no" Checksum="no" Id="plugins_lite.pdb_debug" Name="plugins-lite.pdb" />
</Component>
<?if $(var.FCGI) != "" ?>
<Component Id="shibauthorizer.exe_debug" Guid="{83360639-DDC0-4B76-8168-21FB77EE6CD6}">
<File KeyPath="yes" Checksum="yes" Id="shibauthorizer.exe_debug" Name="shibauthorizer.exe" />
- <File KeyPath="no" Checksum="no" Id="shibauthorizer.pdb_debug" Name="shibauthorizer.pdb" />
+ <File KeyPath="no" Checksum="no" Id="shibauthorizer.pdb_debug" Name="shibauthorizer.pdb" />
</Component>
<Component Id="shibresponder.exe_debug" Guid="{760124EA-67E5-4393-B3DF-657DCC92F04C}">
<File KeyPath="yes" Checksum="yes" Id="shibresponder.exe_debug" Name="shibresponder.exe" />
- <File KeyPath="no" Checksum="no" Id="shibresponder.pdb_debug" Name="shibresponder.pdb" />
+ <File KeyPath="no" Checksum="no" Id="shibresponder.pdb_debug" Name="shibresponder.pdb" />
</Component>
- <?endif ?>
+ <?endif?>
</Directory><!-- lib_shibboleth_debug -->
- <?endif ?>
+ <?endif?>
</Directory><!-- lib_shibboleth -->
</Directory><!-- lib -->
<!-- the service bin -->
@@ -162,10 +160,10 @@
<Directory Id="sbin_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug">
<Component Id="shibd.exe_debug" Guid="{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}">
<File KeyPath="yes" Checksum="yes" Id="shibd.exe_debug" Name="shibd.exe" />
- <File KeyPath="no" Checksum="no" Id="shibd.pdb_debug" Name="shibd.pdb" />
+ <File KeyPath="no" Checksum="no" Id="shibd.pdb_debug" Name="shibd.pdb" />
</Component>
</Directory><!-- sbin_debug -->
- <?endif ?>
+ <?endif?>
</Directory><!-- sbin -->
</DirectoryRef><!-- INSTALLDIR -->
</Fragment>
diff --git a/msi/WiX/ShibbolethSP-gui.wxs b/msi/WiX/ShibbolethSP-gui.wxs
index 042e54e9..f7d58b0f 100644
--- a/msi/WiX/ShibbolethSP-gui.wxs
+++ b/msi/WiX/ShibbolethSP-gui.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
+<!-- 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
@@ -16,7 +14,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- This file controls the dispaying of the GUI dialogs (both WiX and custom) -->
<Fragment>
@@ -76,46 +74,28 @@
<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<>"1"
- </Publish>
-
- <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlgShib">
- 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) AND (NOT ALREADYINSTALLED)
- </Publish>
- <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="UpdateDlgShib">
- (NOT Installed) AND ALREADYINSTALLED
- </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="InstallDirDlgShib">
- (NOT Installed) AND (NOT ALREADYINSTALLED)
- </Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="UpdateDlgShib">
- (NOT Installed) AND ALREADYINSTALLED
- </Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">
- Installed AND NOT PATCH
- </Publish>
+ <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(sys.BUILDARCHSHORT)" Order="3" />
+ <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4" Condition="WIXUI_INSTALLDIR_VALID<>"1"" />
+
+ <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlgShib" Condition="LicenseAccepted = "1"" />
+
+ <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
+ <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
+
+
+ <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
+
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg" Condition="(NOT Installed) AND (NOT ALREADYINSTALLED)" />
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="UpdateDlgShib" Condition="(NOT Installed) AND ALREADYINSTALLED" />
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" />
+
+ <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" />
+ <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" />
+ <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Condition="Installed AND PATCH" />
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlgShib" Condition="(NOT Installed) AND (NOT ALREADYINSTALLED)" />
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="UpdateDlgShib" Condition="(NOT Installed) AND ALREADYINSTALLED" />
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Condition="Installed AND NOT PATCH" />
</UI>
</Fragment>
diff --git a/msi/WiX/ShibbolethSP-install-dlg.wxs b/msi/WiX/ShibbolethSP-install-dlg.wxs
index e36f024a..db366f35 100644
--- a/msi/WiX/ShibbolethSP-install-dlg.wxs
+++ b/msi/WiX/ShibbolethSP-install-dlg.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
+<!-- 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
@@ -16,7 +14,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- This file contains the description of the dialog which captures installation
values for first time installs -->
<Fragment>
@@ -45,40 +43,31 @@
<!-- Where? -->
<Control Id="Dest" Type="Edit" X="25" Y="115" Width="228" Height="17" Property="INSTALLDIR" Text="[INSTALLDIR]" />
<Control Id="ChangeFolder" Type="PushButton" X="265" Y="115" Height="17" Width="56" Text="B&rowse...">
- <Publish Event="SpawnDialog" Value="BrowseDlg" Order="1">1</Publish>
- <Publish Event="[_BrowseProperty]" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+ <Publish Event="SpawnDialog" Value="BrowseDlg" Order="1" />
+ <Publish Event="[_BrowseProperty]" Value="[WIXUI_INSTALLDIR]" Order="1" />
</Control>
<!-- Service? -->
<Control Id="InstallShibd" Type="Text" X="25" Y="142" Height="17" Width="195" Text="The Shibboleth Daemon will be installed as a service." />
<!-- IIS7 Plugin -->
- <Control Id="InstallIIS7" Type="CheckBox" X="225" Y="140" Height="17" Width="120" Property="INSTALL_IIS7_PLUGIN" CheckBoxValue="TRUE" Text="Configure IIS support">
- <Condition Action="show">IISMAJORVERSION AND (IISMAJORVERSION <> "#6")</Condition>
- <Condition Action="hide">NOT IISMAJORVERSION OR (IISMAJORVERSION = "#6")</Condition>
- </Control>
+ <Control Id="InstallIIS7" Type="CheckBox" X="225" Y="140" Height="17" Width="120" Property="INSTALL_IIS7_PLUGIN" CheckBoxValue="TRUE" Text="Configure IIS support" ShowCondition="IISMAJORVERSION AND (IISMAJORVERSION <> "#6")" HideCondition="NOT IISMAJORVERSION OR (IISMAJORVERSION = "#6")" />
<!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+ <Publish Event="NewDialog" Value="LicenseAgreementDlg" />
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]">1</Publish>
- <Publish Event="DoAction" Value="WixUIValidatePath">
- NOT WIXUI_DONTVALIDATEPATH
- </Publish>
- <Publish Event="SpawnDialog" Value="InvalidDirDlg">
- NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"
- </Publish>
- <Publish Event="NewDialog" Value="VerifyReadyDlg">
- WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"
- </Publish>
+ <Publish Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" />
+ <Publish Event="DoAction" Value="WixUIValidatePath_$(sys.BUILDARCHSHORT)" Condition="NOT WIXUI_DONTVALIDATEPATH" />
+ <Publish Event="SpawnDialog" Value="InvalidDirDlg" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"" />
+ <Publish Event="NewDialog" Value="VerifyReadyDlg" Condition="WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"" />
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ <Publish Event="SpawnDialog" Value="CancelDlg" />
</Control>
</Dialog>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 04a4b1ac..9e2c7f7c 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
+<!-- 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
@@ -16,18 +14,17 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product Id="$(var.ShibbolethId64)" Language="1033" Manufacturer="Shibboleth Consortium" Name="Shibboleth Service Provider" UpgradeCode="$(var.ShibbolethUpgradeCode)" Version="$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)">
- <Package Description="Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)" Compressed="yes" Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+ <Package Language="1033" Manufacturer="Shibboleth Consortium" Name="Shibboleth Service Provider" UpgradeCode="$(var.ShibbolethUpgradeCode)" Version="$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)" InstallerVersion="400" ProductCode="$(var.ShibbolethId64)"><SummaryInformation Description="Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)" Manufacturer="Shibboleth Consortium" />
<MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." MigrateFeatures="yes" Schedule="afterInstallExecute" AllowSameVersionUpgrades="yes" />
<PropertyRef Id="SHIB_OLDVERSION_64" />
<PropertyRef Id="SHIB_OLDVERSION" />
- <Condition Message="Shibboleth requires Windows Vista or later.">NOT VersionNT OR (VersionNT >= 600)</Condition>
- <Condition Message="Shibboleth requires a Windows NT-based operating system.">NOT Version9X</Condition>
- <Condition Message="You must uninstall very old versions of Shibboleth before using this installer. To uninstall, use the "Change" option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.">(SHIB_OLDVERSION = "none") AND (SHIB_OLDVERSION_64 = "none")</Condition>
+ <Launch Condition="NOT VersionNT OR (VersionNT >= 600)" Message="Shibboleth requires Windows Vista or later." />
+ <Launch Condition="NOT Version9X" Message="Shibboleth requires a Windows NT-based operating system." />
+ <Launch Condition="(SHIB_OLDVERSION = "none") AND (SHIB_OLDVERSION_64 = "none")" Message="You must uninstall very old versions of Shibboleth before using this installer. To uninstall, use the "Change" option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems." />
<Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
@@ -39,66 +36,13 @@
<UIRef Id="ShibbolethInstallDir" />
<!-- Files -->
- <Directory Id="TARGETDIR" Name="SourceDir">
- <!-- The test bit -->
- <Directory Id="opt" Name="opt">
- <Directory Id="INSTALLDIR" Name="shibboleth-sp" />
- </Directory>
-
- <Directory Id="ProgramFilesFolder" Name="PFiles">
- <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
- <Merge Id="CurlMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Curl-x86.msm" DiskId="1" />
- <?if $(var.FCGI) != "" ?>
- <Merge Id="FastCGIMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\FastCGI-x86.msm" DiskId="1" />
- <?endif ?>
- <Merge Id="Log4ShibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Log4Shib-x86.msm" DiskId="1" />
- <Merge Id="OpenSAMLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-x86.msm" DiskId="1" />
- <Merge Id="OpenSAMLMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-schemas.msm" DiskId="1" />
- <Merge Id="OpenSSLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSSL-x86.msm" DiskId="1" />
- <Merge Id="ShibbolethMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-x86.msm" DiskId="1" />
- <Merge Id="ShibbolethMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-schemas.msm" DiskId="1" />
- <Merge Id="XercesMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm" DiskId="1" />
- <Merge Id="XmlSecMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm" DiskId="1" />
- <Merge Id="ZlibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm" DiskId="1" />
- <?if $(var.BuildDebug) != "" ?>
- <Merge Id="Microsoft_DebugCRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm" DiskId="1" />
- <?endif ?>
- <Merge Id="Microsoft_CRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x86.msm" DiskId="1" />
- </Directory><!--ProgramFilesFolder-->
-
- <Directory Id="ProgramFiles64Folder" Name="PFiles">
- <!-- 64 bit merge modules notionally go to "Program Files" -->
- <Merge Id="CurlMergeModule_x64" Language="1033" SourceFile="MergeModules\Curl-x64.msm" DiskId="1" />
- <?if $(var.FCGI) != "" ?>
- <Merge Id="FastCGIMergeModule_x64" Language="1033" SourceFile="MergeModules\FastCGI-x64.msm" DiskId="1" />
- <?endif ?>
- <Merge Id="Log4ShibMergeModule_x64" Language="1033" SourceFile="MergeModules\Log4Shib-x64.msm" DiskId="1" />
- <Merge Id="OpenSAMLMergeModule_x64" Language="1033" SourceFile="MergeModules\OpenSAML-x64.msm" DiskId="1" />
- <Merge Id="OpenSSLMergeModule_x64" Language="1033" SourceFile="MergeModules\OpenSSL-x64.msm" DiskId="1" />
- <Merge Id="ShibbolethMergeModule_x64" Language="1033" SourceFile="MergeModules\Shibboleth-x64.msm" DiskId="1" />
- <Merge Id="XercesMergeModule_x64" Language="1033" SourceFile="MergeModules\Xerces-x64.msm" DiskId="1" />
- <Merge Id="XmlSecMergeModule_x64" Language="1033" SourceFile="MergeModules\XmlSec-x64.msm" DiskId="1" />
- <Merge Id="ZlibMergeModule_x64" Language="1033" SourceFile="MergeModules\Zlib-x64.msm" DiskId="1" />
- <?if $(var.BuildDebug) != "" ?>
- <Merge Id="Microsoft_DebugCRT_x64" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x64.msm" DiskId="1" />
- <?endif ?>
- <Merge Id="Microsoft_CRT_x64" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x64.msm" DiskId="1" />
- </Directory><!--ProgramFiles64Folder-->
-
- <!-- PATH -->
- <Component Id="SetPath64" Guid="{D3BF9EF4-843A-4D48-BC6C-DC24B063FC35}" Win64="yes">
- <Environment Id="SetPath64" Name="PATH" Action="set" Part="last" System="yes" Value="[ProgramFiles64Folder]Shibboleth\SP\lib" />
- </Component>
- <Component Id="SetPath" Guid="{0E8BD571-3A26-4F61-979E-B5807A28634A}">
- <Environment Id="SetPath" Name="PATH" Action="set" Part="last" System="yes" Value="[ProgramFilesFolder]Shibboleth\SP\lib" />
- </Component>
- </Directory><!--TARGETDIR-->
+ <!--TARGETDIR-->
<Feature Id="Shibboleth" Title="Shibboleth" Level="1" Display="hidden" ConfigurableDirectory="INSTALLDIR">
<MergeRef Id="CurlMergeModule_x86" />
<?if $(var.FCGI) != "" ?>
<MergeRef Id="FastCGIMergeModule_x86" />
- <?endif ?>
+ <?endif?>
<MergeRef Id="Log4ShibMergeModule_x86" />
<MergeRef Id="OpenSAMLMergeModule_x86" />
<MergeRef Id="OpenSAMLMergeModule_schemas" />
@@ -111,13 +55,13 @@
<?if $(var.BuildDebug) != "" ?>
<MergeRef Id="Microsoft_DebugCRT_x86" />
- <?endif ?>
+ <?endif?>
<MergeRef Id="Microsoft_CRT_x86" />
<MergeRef Id="CurlMergeModule_x64" />
<?if $(var.FCGI) != "" ?>
<MergeRef Id="FastCGIMergeModule_x64" />
- <?endif ?>
+ <?endif?>
<MergeRef Id="Log4ShibMergeModule_x64" />
<MergeRef Id="OpenSAMLMergeModule_x64" />
<MergeRef Id="OpenSSLMergeModule_x64" />
@@ -128,7 +72,7 @@
<?if $(var.BuildDebug) != "" ?>
<MergeRef Id="Microsoft_DebugCRT_x64" />
- <?endif ?>
+ <?endif?>
<MergeRef Id="Microsoft_CRT_x64" />
<!-- ShibbolethSP-exe-x64-->
@@ -138,7 +82,7 @@
<?if $(var.BuildDebug) != "" ?>
<ComponentRef Id="resolvertest64.exe_debug" />
<ComponentRef Id="mdquery64.exe_debug" />
- <?endif ?>
+ <?endif?>
<ComponentRef Id="adfs64.so" />
<ComponentRef Id="adfs_lite64.so" />
@@ -152,7 +96,7 @@
<?if $(var.FCGI) != "" ?>
<ComponentRef Id="shibauthorizer64.exe" />
<ComponentRef Id="shibresponder64.exe" />
- <?endif ?>
+ <?endif?>
<?if $(var.BuildDebug) != "" ?>
<ComponentRef Id="adfs64.so_debug" />
@@ -167,10 +111,10 @@
<?if $(var.FCGI) != "" ?>
<ComponentRef Id="shibauthorizer64.exe_debug" />
<ComponentRef Id="shibresponder64.exe_debug" />
- <?endif ?>
+ <?endif?>
<ComponentRef Id="shibd64.exe_debug" />
- <?endif ?>
+ <?endif?>
<!-- ShibbolethSP-registry-x64 -->
<ComponentRef Id="TargetDir64" />
@@ -184,13 +128,13 @@
<?include ShibbolethSP-defs-x86.wxi ?>
<Component Id="shibd.exe" Guid="{2476BB80-9384-4026-86F5-E1569A685187}" Directory="sbin">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.exe" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.pdb" />
+ <File Id="shibd.exe" KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.exe" />
+ <File Id="shibd.pdb" KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.pdb" />
</Component>
- <Component Id="shibd64.exe" Guid="{707B57A2-CCA0-48A6-9F66-275EB04474AA}" Win64="yes" Directory="sbin64">
+ <Component Id="shibd64.exe" Guid="{707B57A2-CCA0-48A6-9F66-275EB04474AA}" Directory="sbin64" Bitness="always64">
<File KeyPath="yes" Checksum="yes" Id="shibd64.exe" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release\shibd.exe" />
- <File KeyPath="no" Checksum="no" Id="shibd64.pdb" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release\shibd.pdb" />
+ <File KeyPath="no" Checksum="no" Id="shibd64.pdb" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release\shibd.pdb" />
<!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
<ServiceInstall Id="shibd" Name="shibd_Default" DisplayName="Shibboleth Daemon (Default)" Description="Manages shared state and offloads SAML processing from Shibboleth web server modules." Arguments="-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"" Type="ownProcess" Start="auto" ErrorControl="ignore" />
<ServiceControl Id="shibd_Default" Name="shibd_Default" Stop="both" Remove="uninstall" Start="install" Wait="no" />
@@ -210,16 +154,16 @@
<CustomAction Id="SetQtInstallIIS32" Property="QtInstallIIS32" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" install module /name:ShibNative32 /image:"[#iis7_shib.dll]" /precondition:"bitness32"" />
<CustomAction Id="SetQtInstallIIS64" Property="QtInstallIIS64" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" install module /name:ShibNative /image:"[#iis7_shib64.dll]" /precondition:"bitness64"" />
- <CustomAction Id="QtInstallIIS32" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtInstallIIS64" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="QtInstallIIS32" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+ <CustomAction Id="QtInstallIIS64" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
<!-- Uninstall -->
<CustomAction Id="SetQtUninstallIIS32" Property="QtUninstallIIS32" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative32" />
<CustomAction Id="SetQtUninstallIIS64" Property="QtUninstallIIS64" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative" />
- <CustomAction Id="QtUninstallIIS32" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
- <CustomAction Id="QtUninstallIIS64" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
+ <CustomAction Id="QtUninstallIIS32" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" BinaryRef="Wix4UtilCA_X86" />
+ <CustomAction Id="QtUninstallIIS64" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" BinaryRef="Wix4UtilCA_X86" />
- <CustomAction Id="SetDisplayName" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" Return="ignore"/>
+ <CustomAction Id="SetDisplayName" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" BinaryRef="Wix4UtilCA_X86" />
<InstallExecuteSequence>
<!-- Install IIS if
@@ -227,35 +171,70 @@
- AND we were told to
- AND this is NOT an upgrade
-->
- <Custom Action="SetQtInstallIIS32" Before="InstallFiles">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </Custom>
- <Custom Action="SetQtInstallIIS64" After="InstallFiles">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </Custom>
- <Custom Action="QtInstallIIS32" After="SetQtInstallIIS32">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </Custom>
- <Custom Action="QtInstallIIS64" After="SetQtInstallIIS64">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </Custom>
-
- <Custom Action="SetQtUninstallIIS32" After="StopServices">
- Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
- </Custom>
- <Custom Action="SetQtUninstallIIS64" After="StopServices">
- Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
- </Custom>
- <Custom Action="QtUninstallIIS32" After="SetQtUninstallIIS32">
- Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
- </Custom>
- <Custom Action="QtUninstallIIS64" After="SetQtUninstallIIS64">
- Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
- </Custom>
-
- <ScheduleReboot Before="InstallFinalize">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </ScheduleReboot>
+ <Custom Action="SetQtInstallIIS32" Before="InstallFiles" Condition="(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN" />
+ <Custom Action="SetQtInstallIIS64" After="InstallFiles" Condition="(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN" />
+ <Custom Action="QtInstallIIS32" After="SetQtInstallIIS32" Condition="(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN" />
+ <Custom Action="QtInstallIIS64" After="SetQtInstallIIS64" Condition="(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN" />
+
+ <Custom Action="SetQtUninstallIIS32" After="StopServices" Condition="Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)" />
+ <Custom Action="SetQtUninstallIIS64" After="StopServices" Condition="Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)" />
+ <Custom Action="QtUninstallIIS32" After="SetQtUninstallIIS32" Condition="Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)" />
+ <Custom Action="QtUninstallIIS64" After="SetQtUninstallIIS64" Condition="Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)" />
+
+ <ScheduleReboot Before="InstallFinalize" Condition="(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN" />
</InstallExecuteSequence>
- </Product>
+
+ <!-- The test bit -->
+ <Directory Id="opt" Name="opt">
+ <Directory Id="INSTALLDIR" Name="shibboleth-sp" />
+ </Directory>
+
+ <StandardDirectory Id="ProgramFilesFolder">
+ <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
+ <Merge Id="CurlMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Curl-x86.msm" DiskId="1" />
+ <?if $(var.FCGI) != "" ?>
+ <Merge Id="FastCGIMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\FastCGI-x86.msm" DiskId="1" />
+ <?endif?>
+ <Merge Id="Log4ShibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Log4Shib-x86.msm" DiskId="1" />
+ <Merge Id="OpenSAMLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-x86.msm" DiskId="1" />
+ <Merge Id="OpenSAMLMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-schemas.msm" DiskId="1" />
+ <Merge Id="OpenSSLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSSL-x86.msm" DiskId="1" />
+ <Merge Id="ShibbolethMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-x86.msm" DiskId="1" />
+ <Merge Id="ShibbolethMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-schemas.msm" DiskId="1" />
+ <Merge Id="XercesMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm" DiskId="1" />
+ <Merge Id="XmlSecMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm" DiskId="1" />
+ <Merge Id="ZlibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm" DiskId="1" />
+ <?if $(var.BuildDebug) != "" ?>
+ <Merge Id="Microsoft_DebugCRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm" DiskId="1" />
+ <?endif?>
+ <Merge Id="Microsoft_CRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x86.msm" DiskId="1" />
+ </StandardDirectory><!--ProgramFilesFolder-->
+
+ <StandardDirectory Id="ProgramFiles64Folder">
+ <!-- 64 bit merge modules notionally go to "Program Files" -->
+ <Merge Id="CurlMergeModule_x64" Language="1033" SourceFile="MergeModules\Curl-x64.msm" DiskId="1" />
+ <?if $(var.FCGI) != "" ?>
+ <Merge Id="FastCGIMergeModule_x64" Language="1033" SourceFile="MergeModules\FastCGI-x64.msm" DiskId="1" />
+ <?endif?>
+ <Merge Id="Log4ShibMergeModule_x64" Language="1033" SourceFile="MergeModules\Log4Shib-x64.msm" DiskId="1" />
+ <Merge Id="OpenSAMLMergeModule_x64" Language="1033" SourceFile="MergeModules\OpenSAML-x64.msm" DiskId="1" />
+ <Merge Id="OpenSSLMergeModule_x64" Language="1033" SourceFile="MergeModules\OpenSSL-x64.msm" DiskId="1" />
+ <Merge Id="ShibbolethMergeModule_x64" Language="1033" SourceFile="MergeModules\Shibboleth-x64.msm" DiskId="1" />
+ <Merge Id="XercesMergeModule_x64" Language="1033" SourceFile="MergeModules\Xerces-x64.msm" DiskId="1" />
+ <Merge Id="XmlSecMergeModule_x64" Language="1033" SourceFile="MergeModules\XmlSec-x64.msm" DiskId="1" />
+ <Merge Id="ZlibMergeModule_x64" Language="1033" SourceFile="MergeModules\Zlib-x64.msm" DiskId="1" />
+ <?if $(var.BuildDebug) != "" ?>
+ <Merge Id="Microsoft_DebugCRT_x64" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x64.msm" DiskId="1" />
+ <?endif?>
+ <Merge Id="Microsoft_CRT_x64" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x64.msm" DiskId="1" />
+ </StandardDirectory><!--ProgramFiles64Folder-->
+
+ <!-- PATH -->
+ <Component Id="SetPath64" Guid="{D3BF9EF4-843A-4D48-BC6C-DC24B063FC35}" Directory="TARGETDIR" Bitness="always64">
+ <Environment Id="SetPath64" Name="PATH" Action="set" Part="last" System="yes" Value="[ProgramFiles64Folder]Shibboleth\SP\lib" />
+ </Component>
+ <Component Id="SetPath" Guid="{0E8BD571-3A26-4F61-979E-B5807A28634A}" Directory="TARGETDIR">
+ <Environment Id="SetPath" Name="PATH" Action="set" Part="last" System="yes" Value="[ProgramFilesFolder]Shibboleth\SP\lib" />
+ </Component>
+ </Package>
</Wix>
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index d28976e8..5e7c4b33 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
+<!-- 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
@@ -16,19 +14,18 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product Id="$(var.ShibbolethId32)" Language="1033" Manufacturer="Shibboleth Consortium" Name="Shibboleth Service Provider" UpgradeCode="$(var.ShibbolethUpgradeCode)" Version="$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)">
- <Package Description="Shibboleth SP (x86) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)" Compressed="yes" Manufacturer="Shibboleth Consortium" InstallerVersion="400" />
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+ <Package Language="1033" Manufacturer="Shibboleth Consortium" Name="Shibboleth Service Provider" UpgradeCode="$(var.ShibbolethUpgradeCode)" Version="$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)" InstallerVersion="400" ProductCode="$(var.ShibbolethId32)"><SummaryInformation Description="Shibboleth SP (x86) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)" Manufacturer="Shibboleth Consortium" />
<MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." MigrateFeatures="yes" Schedule="afterInstallExecute" AllowSameVersionUpgrades="yes" />
<PropertyRef Id="SHIB_OLDVERSION" />
- <Condition Message="Shibboleth requires Windows Vista or later.">NOT VersionNT OR (VersionNT >= 600)</Condition>
- <Condition Message="Shibboleth requires a Windows NT-based operating system.">NOT Version9X</Condition>
- <Condition Message="You must uninstall very old versions of Shibboleth before using this installer. To uninstall, use the "Change" option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.">(SHIB_OLDVERSION = "none")</Condition>
+ <Launch Condition="NOT VersionNT OR (VersionNT >= 600)" Message="Shibboleth requires Windows Vista or later." />
+ <Launch Condition="NOT Version9X" Message="Shibboleth requires a Windows NT-based operating system." />
+ <Launch Condition="(SHIB_OLDVERSION = "none")" Message="You must uninstall very old versions of Shibboleth before using this installer. To uninstall, use the "Change" option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems." />
- <Condition Message="For a 32-bit installation on a 64-bit architecture, install the 64-bit MSI but specify 32-bit defaults">NOT VersionNT64</Condition>
+ <Launch Condition="NOT VersionNT64" Message="For a 32-bit installation on a 64-bit architecture, install the 64-bit MSI but specify 32-bit defaults" />
<Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
@@ -40,43 +37,13 @@
<UIRef Id="ShibbolethInstallDir" />
<!-- Files -->
- <Directory Id="TARGETDIR" Name="SourceDir">
- <!-- The test bit -->
- <Directory Id="opt" Name="opt">
- <Directory Id="INSTALLDIR" Name="shibboleth-sp" />
- </Directory>
-
- <Directory Id="ProgramFilesFolder" Name="PFiles">
- <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
- <Merge Id="CurlMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Curl-x86.msm" DiskId="1" />
- <?if $(var.FCGI) != "" ?>
- <Merge Id="FastCGIMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\FastCGI-x86.msm" DiskId="1" />
- <?endif ?>
- <Merge Id="Log4ShibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Log4Shib-x86.msm" DiskId="1" />
- <Merge Id="OpenSAMLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-x86.msm" DiskId="1" />
- <Merge Id="OpenSAMLMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-schemas.msm" DiskId="1" />
- <Merge Id="OpenSSLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSSL-x86.msm" DiskId="1" />
- <Merge Id="ShibbolethMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-x86.msm" DiskId="1" />
- <Merge Id="ShibbolethMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-schemas.msm" DiskId="1" />
- <Merge Id="XercesMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm" DiskId="1" />
- <Merge Id="XmlSecMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm" DiskId="1" />
- <Merge Id="ZlibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm" DiskId="1" />
- <?if $(var.BuildDebug) != "" ?>
- <Merge Id="Microsoft_DebugCRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm" DiskId="1" />
- <?endif ?>
- <Merge Id="Microsoft_CRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x86.msm" DiskId="1" />
- </Directory><!--ProgramFilesFolder-->
-
- <Component Id="SetPath" Guid="{3300B9CD-67AF-4AAC-801D-8C56E5FB4AF5}">
- <Environment Id="SetPath" Name="PATH" Action="set" Part="last" System="yes" Value="[ProgramFilesFolder]Shibboleth\SP\lib" />
- </Component>
- </Directory><!--TARGETDIR-->
+ <!--TARGETDIR-->
<Feature Id="Shibboleth" Title="Shibboleth" Level="1" Display="hidden" ConfigurableDirectory="INSTALLDIR">
<MergeRef Id="CurlMergeModule_x86" />
<?if $(var.FCGI) != "" ?>
<MergeRef Id="FastCGIMergeModule_x86" />
- <?endif ?>
+ <?endif?>
<MergeRef Id="Log4ShibMergeModule_x86" />
<MergeRef Id="OpenSAMLMergeModule_x86" />
<MergeRef Id="OpenSAMLMergeModule_schemas" />
@@ -89,7 +56,7 @@
<?if $(var.BuildDebug) != "" ?>
<MergeRef Id="Microsoft_DebugCRT_x86" />
- <?endif ?>
+ <?endif?>
<MergeRef Id="Microsoft_CRT_x86" />
<!-- ShibbolethSP-main-x86 -->
@@ -98,8 +65,8 @@
<?include ShibbolethSP-defs-x86.wxi ?>
<Component Id="shibd.exe" Guid="{2476BB80-9384-4026-86F5-E1569A685187}" Directory="sbin">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.exe" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.pdb" />
+ <File Id="shibd.exe" KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.exe" />
+ <File Id="shibd.pdb" KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.pdb" />
<!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
<ServiceInstall Id="shibd" Name="shibd_Default" DisplayName="Shibboleth Daemon (Default)" Description="Manages shared state and offloads SAML processing from Shibboleth web server modules." Arguments="-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"" Type="ownProcess" Start="auto" ErrorControl="ignore" />
<ServiceControl Id="shibd_Default" Name="shibd_Default" Stop="both" Remove="uninstall" Start="install" Wait="no" />
@@ -117,12 +84,12 @@
between 32 and 64 bit registration -->
<CustomAction Id="SetQtInstallIIS" Property="QtInstallIIS" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" install module /name:ShibNative /image:"[#iis7_shib.dll]"" />
- <CustomAction Id="QtInstallIIS" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="QtInstallIIS" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
<CustomAction Id="SetQtUninstallIIS" Property="QtUninstallIIS" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative" />
- <CustomAction Id="QtUninstallIIS" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
+ <CustomAction Id="QtUninstallIIS" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" BinaryRef="Wix4UtilCA_X86" />
- <CustomAction Id="SetDisplayName" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore"/>
+ <CustomAction Id="SetDisplayName" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" BinaryRef="Wix4UtilCA_X86" />
<InstallExecuteSequence>
<!-- Install IIS if
@@ -130,24 +97,44 @@
- AND we were told to
- AND this is NOT an upgrade
-->
- <Custom Action="SetQtInstallIIS" Before="InstallFiles">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </Custom>
- <Custom Action="QtInstallIIS" After="SetQtInstallIIS">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </Custom>
-
- <Custom Action="SetQtUninstallIIS" After="StopServices">
- Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
- </Custom>
-
- <Custom Action="QtUninstallIIS" After="SetQtUninstallIIS">
- Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)
- </Custom>
-
- <ScheduleReboot Before="InstallFinalize">
- (NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN
- </ScheduleReboot>
+ <Custom Action="SetQtInstallIIS" Before="InstallFiles" Condition="(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN" />
+ <Custom Action="QtInstallIIS" After="SetQtInstallIIS" Condition="(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN" />
+
+ <Custom Action="SetQtUninstallIIS" After="StopServices" Condition="Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)" />
+
+ <Custom Action="QtUninstallIIS" After="SetQtUninstallIIS" Condition="Installed AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)" />
+
+ <ScheduleReboot Before="InstallFinalize" Condition="(NOT Installed) AND IISMAJORVERSION AND (IISMAJORVERSION <> "#6") AND INSTALL_IIS7_PLUGIN" />
</InstallExecuteSequence>
- </Product>
+
+ <!-- The test bit -->
+ <Directory Id="opt" Name="opt">
+ <Directory Id="INSTALLDIR" Name="shibboleth-sp" />
+ </Directory>
+
+ <StandardDirectory Id="ProgramFilesFolder">
+ <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
+ <Merge Id="CurlMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Curl-x86.msm" DiskId="1" />
+ <?if $(var.FCGI) != "" ?>
+ <Merge Id="FastCGIMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\FastCGI-x86.msm" DiskId="1" />
+ <?endif?>
+ <Merge Id="Log4ShibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Log4Shib-x86.msm" DiskId="1" />
+ <Merge Id="OpenSAMLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-x86.msm" DiskId="1" />
+ <Merge Id="OpenSAMLMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-schemas.msm" DiskId="1" />
+ <Merge Id="OpenSSLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSSL-x86.msm" DiskId="1" />
+ <Merge Id="ShibbolethMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-x86.msm" DiskId="1" />
+ <Merge Id="ShibbolethMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-schemas.msm" DiskId="1" />
+ <Merge Id="XercesMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm" DiskId="1" />
+ <Merge Id="XmlSecMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm" DiskId="1" />
+ <Merge Id="ZlibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm" DiskId="1" />
+ <?if $(var.BuildDebug) != "" ?>
+ <Merge Id="Microsoft_DebugCRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm" DiskId="1" />
+ <?endif?>
+ <Merge Id="Microsoft_CRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_CRT_x86.msm" DiskId="1" />
+ </StandardDirectory><!--ProgramFilesFolder-->
+
+ <Component Id="SetPath" Guid="{3300B9CD-67AF-4AAC-801D-8C56E5FB4AF5}" Directory="TARGETDIR">
+ <Environment Id="SetPath" Name="PATH" Action="set" Part="last" System="yes" Value="[ProgramFilesFolder]Shibboleth\SP\lib" />
+ </Component>
+ </Package>
</Wix>
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index c825ed4f..0ef958ef 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
+<!-- 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
@@ -15,7 +14,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<!--
This is where we put all the architecture neutral bits of the
Shibboleth install. It turns out that it may not be all the
@@ -23,16 +22,14 @@
-->
<Fragment>
<!-- SPCPP-985 -->
- <PropertyRef Id="WIX_ACCOUNT_ADMINISTRATORS" />
- <PropertyRef Id="WIX_ACCOUNT_LOCALSYSTEM" />
- <PropertyRef Id="WIX_ACCOUNT_USERS" />
+ <util:QueryWindowsWellKnownSIDs />
<!-- Files First -->
<!-- Configuration, licenses and documentation -->
<DirectoryRef Id="INSTALLDIR">
- <Component Id="ProtectInstallDir" Guid="{9F695B93-0575-4D91-9E22-35A8D6966F1B}">
- <Condition>NOT WIX_UPGRADE_DETECTED</Condition>
+ <Component Id="ProtectInstallDir" Guid="{9F695B93-0575-4D91-9E22-35A8D6966F1B}" Condition="NOT WIX_UPGRADE_DETECTED">
+
<CreateFolder>
<Permission User="[WIX_ACCOUNT_ADMINISTRATORS]" GenericAll="yes" />
<Permission User="[WIX_ACCOUNT_LOCALSYSTEM]" GenericAll="yes" />
@@ -43,111 +40,111 @@
<Directory Id="doc" Name="doc">
<Directory Id="doc_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\doc">
<Component Id="main.css" Guid="{EA1366EE-0FD1-42E7-9F3F-C19E6C0D12D6}">
- <File KeyPath="yes" Name="main.css" />
+ <File Id="main.css" KeyPath="yes" Name="main.css" />
</Component>
<Component Id="CREDITS.txt" Guid="{9A792E0C-61F1-4D08-9672-BE82FFB6B7F1}">
- <File KeyPath="yes" Name="CREDITS.txt" />
+ <File Id="CREDITS.txt" KeyPath="yes" Name="CREDITS.txt" />
</Component>
<Component Id="LICENSE.txt" Guid="{404E7A3C-22C2-4A02-8DC0-7D5C0B25DED1}">
- <File KeyPath="yes" Name="LICENSE.txt" />
+ <File Id="LICENSE.txt" KeyPath="yes" Name="LICENSE.txt" />
</Component>
<Component Id="NOTICE.txt" Guid="{80619251-6754-480A-AFAA-D7398482053C}">
- <File KeyPath="yes" Name="NOTICE.txt" />
+ <File Id="NOTICE.txt" KeyPath="yes" Name="NOTICE.txt" />
</Component>
<Component Id="README.txt" Guid="{2E5A28EE-B70B-402B-8E6F-72E8EC1EEF0D}">
- <File KeyPath="yes" Name="README.txt" />
+ <File Id="README.txt" KeyPath="yes" Name="README.txt" />
</Component>
<Component Id="RELEASE.txt" Guid="{5822AF4E-BE53-4952-B662-6BE2D3913D31}">
- <File KeyPath="yes" Name="RELEASE.txt" />
+ <File Id="RELEASE.txt" KeyPath="yes" Name="RELEASE.txt" />
</Component>
</Directory><!-- doc_shibboleth -->
</Directory><!-- doc -->
<Directory Id="etc" Name="etc">
<Directory Id="etc_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\configs">
<Component Id="example_metadata.xml" Guid="{D9852008-249D-405D-8059-5DAD307D2723}" Permanent="yes">
- <File KeyPath="yes" Name="example-metadata.xml" />
+ <File Id="example_metadata.xml" KeyPath="yes" Name="example-metadata.xml" />
</Component>
<Component Id="example_shibboleth2.xml" Guid="{85415A41-2B4E-406F-9CFC-63CFC360A9C7}" Permanent="yes">
- <File KeyPath="yes" Name="example-shibboleth2.xml" />
+ <File Id="example_shibboleth2.xml" KeyPath="yes" Name="example-shibboleth2.xml" />
</Component>
<Component Id="keygen.bat" Guid="{A5BBCB8B-42B3-4402-B66D-66D2971F509F}">
- <File KeyPath="yes" Name="keygen.bat" />
+ <File Id="keygen.bat" KeyPath="yes" Name="keygen.bat" />
</Component>
<Component Id="seckeygen.bat" Guid="{63B412FB-9761-47F4-B7E4-B69E11B831A9}">
- <File KeyPath="yes" Name="seckeygen.bat" />
+ <File Id="seckeygen.bat" KeyPath="yes" Name="seckeygen.bat" />
</Component>
<Directory Id="etc_shibboleth_dist" Name="dist" FileSource="$(var.SPBuildDirectory)\cpp-sp\configs">
<Component Id="apache.config.in" Guid="{AF4EB2B1-2489-4E39-A89E-1CA7AC2B7483}">
- <File KeyPath="yes" Name="apache.config.in" />
+ <File Id="apache.config.in" KeyPath="yes" Name="apache.config.in" />
</Component>
<Component Id="apache2.config.in" Guid="{85BF72A1-FBA8-4955-ACCF-ABC83B1292C9}">
- <File KeyPath="yes" Name="apache2.config.in" />
+ <File Id="apache2.config.in" KeyPath="yes" Name="apache2.config.in" />
</Component>
<Component Id="apache22.config.in" Guid="{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}">
- <File KeyPath="yes" Name="apache22.config.in" />
+ <File Id="apache22.config.in" KeyPath="yes" Name="apache22.config.in" />
</Component>
<Component Id="apache24.config.in" Guid="{3562B68A-E54A-4F1B-9F10-BDACB5FFE8CB}">
- <File KeyPath="yes" Name="apache24.config.in" />
+ <File Id="apache24.config.in" KeyPath="yes" Name="apache24.config.in" />
</Component>
<Component Id="sslError.html" Guid="{A74BA230-C49F-4151-BBF4-AA80D554D099}">
- <File KeyPath="yes" Name="sslError.html" />
+ <File Id="sslError.html" KeyPath="yes" Name="sslError.html" />
</Component>
<Component Id="bindingTemplate.html" Guid="{F5A3A434-9209-43EC-9314-1F705055DDEC}">
- <File KeyPath="yes" Name="bindingTemplate.html" />
+ <File Id="bindingTemplate.html" KeyPath="yes" Name="bindingTemplate.html" />
</Component>
<Component Id="globalLogout.html" Guid="{E65F580D-5489-4D79-A8FC-F9FFED666FC1}">
- <File KeyPath="yes" Name="globalLogout.html" />
+ <File Id="globalLogout.html" KeyPath="yes" Name="globalLogout.html" />
</Component>
<Component Id="localLogout.html" Guid="{70FA3A47-A950-4074-BC13-C56D94497BD9}">
- <File KeyPath="yes" Name="localLogout.html" />
+ <File Id="localLogout.html" KeyPath="yes" Name="localLogout.html" />
</Component>
<Component Id="attribute_map.xml" Guid="{878C9456-E65F-4541-A0FA-975379EAC6B6}">
- <File KeyPath="yes" Name="attribute-map.xml" />
+ <File Id="attribute_map.xml" KeyPath="yes" Name="attribute-map.xml" />
</Component>
<Component Id="attribute_policy.xml" Guid="{55B88F7B-E2EA-4B70-87B7-33C566B9F992}">
- <File KeyPath="yes" Name="attribute-policy.xml" />
+ <File Id="attribute_policy.xml" KeyPath="yes" Name="attribute-policy.xml" />
</Component>
<Component Id="shibboleth2.xml" Guid="{E520FEDE-3F0E-47C6-9345-47223B82825A}">
- <File KeyPath="yes" Name="shibboleth2.xml" Source="$(var.SPBuildDirectory)\cpp-sp\configs\win-shibboleth2.xml" />
+ <File Id="shibboleth2.xml" KeyPath="yes" Name="shibboleth2.xml" Source="$(var.SPBuildDirectory)\cpp-sp\configs\win-shibboleth2.xml" />
</Component>
<Component Id="console.logger" Guid="{8AC85980-32B9-4EA2-9245-167FB1AB2570}">
- <File KeyPath="yes" Name="console.logger" />
+ <File Id="console.logger" KeyPath="yes" Name="console.logger" />
</Component>
<Component Id="discoveryTemplate.html" Guid="{A9573113-4387-46DD-A636-84482AF2C672}">
- <File KeyPath="yes" Name="discoveryTemplate.html" />
+ <File Id="discoveryTemplate.html" KeyPath="yes" Name="discoveryTemplate.html" />
</Component>
<Component Id="postTemplate.html" Guid="{5B7111E8-8E04-42F1-AB02-E47AFB7C3D28}">
- <File KeyPath="yes" Name="postTemplate.html" />
+ <File Id="postTemplate.html" KeyPath="yes" Name="postTemplate.html" />
</Component>
<Component Id="partialLogout.html" Guid="{E1F6208B-3C70-4632-B84C-C7D141DC4192}">
- <File KeyPath="yes" Name="partialLogout.html" />
+ <File Id="partialLogout.html" KeyPath="yes" Name="partialLogout.html" />
</Component>
<Component Id="protocols.xml" Guid="{B226CAAC-2D18-411A-9FBF-3FE237EBEF4D}">
- <File KeyPath="yes" Name="protocols.xml" />
+ <File Id="protocols.xml" KeyPath="yes" Name="protocols.xml" />
</Component>
<Component Id="security_policy.xml" Guid="{0EC04525-FCCF-4B60-8797-9B0CEC222B8C}">
- <File KeyPath="yes" Name="security-policy.xml" />
+ <File Id="security_policy.xml" KeyPath="yes" Name="security-policy.xml" />
</Component>
<Component Id="attrChecker.html" Guid="{BDF4837C-A887-4F1C-841C-DC13DFF8A46E}">
- <File KeyPath="yes" Name="attrChecker.html" />
+ <File Id="attrChecker.html" KeyPath="yes" Name="attrChecker.html" />
</Component>
<Component Id="metadataError.html" Guid="{8C46D04A-A943-4FA4-AFCB-9B040306C2C0}">
- <File KeyPath="yes" Name="metadataError.html" />
+ <File Id="metadataError.html" KeyPath="yes" Name="metadataError.html" />
</Component>
<!-- native.logger used to be edited in place so this will never fire, but
removing this will cause it to go away. So we put it in two places and overwrite
this with the known good one (via the script) -->
<Component Id="win_native.logger" Guid="{B2EBC853-279B-4EA1-BC84-A0EC0E5F3676}">
- <File KeyPath="yes" Name="native.logger" Source="$(var.SPBuildDirectory)\cpp-sp\configs\win-native.logger" />
+ <File Id="native.logger" KeyPath="yes" Name="native.logger" Source="$(var.SPBuildDirectory)\cpp-sp\configs\win-native.logger" />
</Component>
<Component Id="win_native.logger_in" Guid="{B081C55E-8C30-4D5D-BAC0-CF0F24026E23}">
- <File KeyPath="yes" Name="win-native.logger" />
+ <File Id="win_native.logger" KeyPath="yes" Name="win-native.logger" />
</Component>
<Component Id="sessionError.html" Guid="{8AA240B3-DC5D-4687-B321-4F5E1BAEA820}">
- <File KeyPath="yes" Name="sessionError.html" />
+ <File Id="sessionError.html" KeyPath="yes" Name="sessionError.html" />
</Component>
<Component Id="shibd.logger.in" Guid="{D8DA3D14-F779-4691-A883-4995158D2A74}">
- <File KeyPath="yes" Name="shibd.logger.in" />
+ <File Id="shibd.logger.in" KeyPath="yes" Name="shibd.logger.in" />
</Component>
</Directory><!-- etc_shibboleth_dist -->
</Directory><!-- etc_shibboleth -->
@@ -184,23 +181,23 @@
<Binary Id="EditConfigFileSrc" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix" />
- <CustomAction Id="EditConfigFiles" BinaryKey="EditConfigFileSrc" VBScriptCall="" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="EditConfigFiles" VBScriptCall="" Execute="deferred" Impersonate="no" BinaryRef="EditConfigFileSrc" />
<CustomAction Id="SetEditConfigFiles" Property="EditConfigFiles" Value="[INSTALLDIR];@;[IS64BITINSTALL]" />
- <CustomAction Id="KeyGenSigning" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="KeyGenSigning" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
<CustomAction Id="SetKeyGenSigning" Property="KeyGenSigning" Value=""[INSTALLDIR]etc\shibboleth\keygen.bat" -n sp-signing [KEYGEN_EXTRA]" />
- <CustomAction Id="KeyGenEncrypt" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="KeyGenEncrypt" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
<CustomAction Id="SetKeyGenEncrypt" Property="KeyGenEncrypt" Value=""[INSTALLDIR]etc\shibboleth\keygen.bat" -n sp-encrypt [KEYGEN_EXTRA]" />
- <CustomAction Id="SetSetDisplayName" Property="SetDisplayName" Value=""[WindowsFolder]\System32\sc" config shibd_default DisplayName= "Shibboleth Daemon (Default)"" />
+ <CustomAction Id="SetSetDisplayName" Property="SetDisplayName" Value=""[WindowsFolder]\System32\sc" config shibd_default DisplayName= "Shibboleth Daemon (Default)"" />
<!-- Inherit the installation dir if one was set -->
<CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />
<CustomAction Id="InheritInstallDir64" Property="INSTALLDIR" Value="[OLD_INSTALLDIR64]" />
<!-- Identity to give Read access to -->
- <Property Id="WEBSERVER_USER"/>
+ <Property Id="WEBSERVER_USER" />
<CustomAction Id="DefaultWebServerUser" Property="WEBSERVER_USER" Value="[WIX_ACCOUNT_USERS]" />
@@ -208,45 +205,37 @@
<!-- All we need to sequence here is setting up inherited INSTALLDIR -->
<!-- inherit installationDir if there is something to inherit -->
- <Custom Action="InheritInstallDir" After="AppSearch">
- OLD_INSTALLDIR
- </Custom>
- <Custom Action="InheritInstallDir64" After="InheritInstallDir">
- (NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64
- </Custom>
+ <Custom Action="InheritInstallDir" After="AppSearch" Condition="OLD_INSTALLDIR" />
+ <Custom Action="InheritInstallDir64" After="InheritInstallDir" Condition="(NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64" />
</InstallUISequence>
<InstallExecuteSequence>
- <Custom Action="SetEditConfigFiles" Before="CostInitialize">NOT Installed</Custom>
- <Custom Action="EditConfigFiles" After="InstallFiles">NOT Installed</Custom>
+ <Custom Action="SetEditConfigFiles" Before="CostInitialize" Condition="NOT Installed" />
+ <Custom Action="EditConfigFiles" After="InstallFiles" Condition="NOT Installed" />
- <Custom Action="SetKeyGenSigning" Before="CostInitialize">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
- <Custom Action="SetKeyGenEncrypt" Before="CostInitialize">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
+ <Custom Action="SetKeyGenSigning" Before="CostInitialize" Condition="(NOT Installed) AND (NOT ALREADYINSTALLED)" />
+ <Custom Action="SetKeyGenEncrypt" Before="CostInitialize" Condition="(NOT Installed) AND (NOT ALREADYINSTALLED)" />
<!-- Run KeyGen after WriteEnvironmentStrings so the path is set -->
- <Custom Action="KeyGenSigning" After="WriteEnvironmentStrings">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
- <Custom Action="KeyGenEncrypt" After="WriteEnvironmentStrings">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
+ <Custom Action="KeyGenSigning" After="WriteEnvironmentStrings" Condition="(NOT Installed) AND (NOT ALREADYINSTALLED)" />
+ <Custom Action="KeyGenEncrypt" After="WriteEnvironmentStrings" Condition="(NOT Installed) AND (NOT ALREADYINSTALLED)" />
<!-- Set name only on upgrade and after ServiceInstall -->
- <Custom Action="SetSetDisplayName" Before="CostInitialize">ALREADYINSTALLED</Custom>
- <Custom Action="SetDisplayName" After="InstallServices">ALREADYINSTALLED</Custom>
+ <Custom Action="SetSetDisplayName" Before="CostInitialize" Condition="ALREADYINSTALLED" />
+ <Custom Action="SetDisplayName" After="InstallServices" Condition="ALREADYINSTALLED" />
<!-- Duplicate actions from the UI case -->
- <Custom Action="InheritInstallDir" After="AppSearch">
- OLD_INSTALLDIR
- </Custom>
- <Custom Action="InheritInstallDir64" After="InheritInstallDir">
- (NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64
- </Custom>
+ <Custom Action="InheritInstallDir" After="AppSearch" Condition="OLD_INSTALLDIR" />
+ <Custom Action="InheritInstallDir64" After="InheritInstallDir" Condition="(NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64" />
<!-- Do not mess with SCM if this is an upgrade -->
- <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED)</InstallServices>
- <StartServices>(NOT Installed) AND (ALWAYS_START_SERVICE = "TRUE")</StartServices>
- <DeleteServices>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</DeleteServices>
+ <InstallServices Condition="(NOT Installed) AND (NOT ALREADYINSTALLED)" />
+ <StartServices Condition="(NOT Installed) AND (ALWAYS_START_SERVICE = "TRUE")" />
+ <DeleteServices Condition="(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)" />
<!-- Setup the WEBUSER -->
- <Custom Action="DefaultWebServerUser" After="InstallInitialize">WEBSERVER_USER = ""</Custom>
+ <Custom Action="DefaultWebServerUser" After="InstallInitialize" Condition="WEBSERVER_USER = """ />
</InstallExecuteSequence>
</Fragment>
diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index 4b1f9bf4..76fc1850 100644
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
+<!-- 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
@@ -20,7 +18,7 @@
used to drive the install. The GUI will change them as required,
but the GUI is not required. -->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- Are we installing IIS, if so what extension to used -->
<Property Id="INSTALL_IIS_PLUGIN" Value="TRUE" Secure="yes" />
diff --git a/msi/WiX/ShibbolethSP-registry-x64.wxs b/msi/WiX/ShibbolethSP-registry-x64.wxs
index 634b6123..4d4ad451 100644
--- a/msi/WiX/ShibbolethSP-registry-x64.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x64.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
+<!-- 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
@@ -16,7 +14,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!--
This is where we put all the architecture neutral bits of the
Shibboleth install. It turns out that it may not be all the
@@ -26,37 +24,37 @@
<!-- Previous version search -->
<Property Id="SHIB_OLDVERSION_64" Value="none" Secure="yes">
- <RegistrySearch Id="SP_2_2_1_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_4_1_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_4_2_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP_2_4_3_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_3_0_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_4_0_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}" Name="DisplayName" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_1_0_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_2_0_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}" Name="DisplayVersion" Type="raw" Win64="yes" />
- <RegistrySearch Id="SP2_3_1_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}" Name="DisplayVersion" Type="raw" Win64="yes" />
+ <RegistrySearch Id="SP_2_2_1_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}" Name="DisplayVersion" Type="raw" Bitness="always64" />
+ <RegistrySearch Id="SP2_4_1_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}" Name="DisplayVersion" Type="raw" Bitness="always64" />
+ <RegistrySearch Id="SP2_4_2_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}" Name="DisplayVersion" Type="raw" Bitness="always64" />
+ <RegistrySearch Id="SP_2_4_3_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}" Name="DisplayVersion" Type="raw" Bitness="always64" />
+ <RegistrySearch Id="SP2_3_0_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}" Name="DisplayVersion" Type="raw" Bitness="always64" />
+ <RegistrySearch Id="SP2_4_0_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}" Name="DisplayName" Type="raw" Bitness="always64" />
+ <RegistrySearch Id="SP2_1_0_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}" Name="DisplayVersion" Type="raw" Bitness="always64" />
+ <RegistrySearch Id="SP2_2_0_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}" Name="DisplayVersion" Type="raw" Bitness="always64" />
+ <RegistrySearch Id="SP2_3_1_64" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}" Name="DisplayVersion" Type="raw" Bitness="always64" />
</Property>
<Property Id="OLD_INSTALLDIR64" Secure="yes">
- <RegistrySearch Id="OldInstallDir64" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="InstallDir" Type="directory" Win64="yes" />
+ <RegistrySearch Id="OldInstallDir64" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="InstallDir" Type="directory" Bitness="always64" />
</Property>
<!-- 64 bit only -->
<Property Id="OLD_INSTALL_32BIT" Secure="yes">
- <RegistrySearch Id="OldInstall32Bit" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="Install32Bit" Type="raw" Win64="yes" />
+ <RegistrySearch Id="OldInstall32Bit" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="Install32Bit" Type="raw" Bitness="always64" />
</Property>
<DirectoryRef Id="bin64">
<!-- Save the Captured parameters into the registry -->
- <Component Id="TargetDir64" Guid="{E89D3028-5415-4874-9CBC-806A2064C613}" Win64="yes">
+ <Component Id="TargetDir64" Guid="{E89D3028-5415-4874-9CBC-806A2064C613}" Bitness="always64">
<RegistryValue Id="TargetDir64" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="InstallDir" Value="[INSTALLDIR]" Type="string" KeyPath="yes" />
</Component>
- <Component Id="Install32Bit64" Guid="{9A0181FE-6252-4C2E-8828-70281DCC3825}" Win64="yes">
+ <Component Id="Install32Bit64" Guid="{9A0181FE-6252-4C2E-8828-70281DCC3825}" Bitness="always64">
<RegistryValue Id="Install32Bit64" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="Install32Bit" Value="[INSTALL_32BIT]" Type="string" KeyPath="yes" />
</Component>
- <Component Id="shib64.ico" Guid="{AB12F477-E49D-4E52-B130-AF0913AF9EC9}" Win64="yes" Permanent="yes">
+ <Component Id="shib64.ico" Guid="{AB12F477-E49D-4E52-B130-AF0913AF9EC9}" Permanent="yes" Bitness="always64">
<File Id="shib64.ico" KeyPath="yes" Source="$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico" />
<RegistryValue Id="DisplayIcon64" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayIcon" Value="[#shib64.ico],0" Type="string" />
</Component>
diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
index 617e03a8..1f64151b 100644
--- a/msi/WiX/ShibbolethSP-registry-x86.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x86.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
+<!-- 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
@@ -16,7 +14,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!--
This is where we put all the architecture neutral bits of the
Shibboleth install. It turns out that it may not be all the
@@ -56,7 +54,7 @@
<!-- pretty icon for the "install programs" page -->
<Component Id="shib.ico" Guid="{FA0F86A1-0731-4D66-8216-BC74D231B598}">
- <File KeyPath="yes" Source="$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico" />
+ <File Id="shib.ico" KeyPath="yes" Source="$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico" />
<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayIcon" Value="[#shib.ico],0" Type="string" />
</Component>
</DirectoryRef>
diff --git a/msi/WiX/ShibbolethSP-update-dlg.wxs b/msi/WiX/ShibbolethSP-update-dlg.wxs
index 2b023e55..a1926255 100644
--- a/msi/WiX/ShibbolethSP-update-dlg.wxs
+++ b/msi/WiX/ShibbolethSP-update-dlg.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
+<!-- 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
@@ -16,7 +14,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- The dialog to display if we sense an upgrade -->
<Fragment>
@@ -34,7 +32,7 @@
<!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="WelcomeDlg">1</Publish>
+ <Publish Event="NewDialog" Value="WelcomeDlg" />
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
@@ -42,7 +40,7 @@
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ <Publish Event="SpawnDialog" Value="CancelDlg" />
</Control>
</Dialog>
</UI>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list