[cpp-sp] 01/03: SSPCPP-976 Drop Win32/x86 out of process builds
Rod Widdowson
rdw at steadingsoftware.com
Wed Jun 14 15:39:59 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/SSPCPP-976
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=b7a41e3c0f3e473bd58d9b069fa4824434e3e7e4
commit b7a41e3c0f3e473bd58d9b069fa4824434e3e7e4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jun 13 15:20:36 2023 +0100
SSPCPP-976 Drop Win32/x86 out of process builds
https://shibboleth.atlassian.net/browse/SSPCPP-976
Stage 1, stop building the x86 msi and remove the 32 bit bin and sbin folder.
---
msi/WiX/Installer.make | 9 +-
msi/WiX/ShibbolethSP-defs-x86.wxi | 12 ---
msi/WiX/ShibbolethSP-exe-x86.wxs | 34 --------
msi/WiX/ShibbolethSP-main-x64.wxs | 5 --
msi/WiX/ShibbolethSP-main-x86.wxs | 153 ----------------------------------
msi/WiX/ShibbolethSP-registry-x86.wxs | 12 ---
6 files changed, 1 insertion(+), 224 deletions(-)
diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make
index c6209755..bc3768d7 100644
--- a/msi/WiX/Installer.make
+++ b/msi/WiX/Installer.make
@@ -23,7 +23,7 @@ CppMmDir=C:\Program Files (x86)\Common Files\Merge Modules
all: all32 all64
-all32: shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi
+all32:
all64: shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win64.msi
@@ -42,10 +42,6 @@ rebuild64: clean64 all64
#
# MSI
#
-shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi: ShibbolethSP-main-x86.wixobj Shibboleth.wixlib
- light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win32.msi ShibbolethSP-main-x86.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
- del shibboleth-sp-$(ShibbolethVersion)-win64.msi
-
shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win64.msi: ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj Shibboleth.wixlib
light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion).$(ShibbolethPatchVersion)-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
@@ -94,6 +90,3 @@ ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs ShibbolethSP-properties.
wixcop -indent:2 ShibbolethSP-main-x64.wxs
candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)" -dCppVCVersion=$(CppVCVersion) -dBuildDebug=$(DebugInstaller)
-ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm $(FCGI86) MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm
- wixcop -indent:2 ShibbolethSP-main-x86.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x86.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)" -dCppVCVersion=$(CppVCVersion) -dBuildDebug=$(DebugInstaller)
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index d4865152..f9867ffc 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -42,14 +42,6 @@
<ComponentRef Id="var_run_shibboleth_folder" />
<!-- ShibbolethSP-exe-x86-->
-
- <ComponentRef Id="resolvertest.exe" />
- <ComponentRef Id="mdquery.exe" />
- <?if $(var.BuildDebug) != "" ?>
- <ComponentRef Id="resolvertest.exe_debug" />
- <ComponentRef Id="mdquery.exe_debug" />
- <?endif ?>
-
<ComponentRef Id="adfs.so" />
<ComponentRef Id="adfs_lite.so" />
<ComponentRef Id="isapi_shib.dll" />
@@ -85,10 +77,6 @@
<ComponentRef Id="shibresponder.exe_debug" />
<?endif ?>
- <ComponentRef Id="shibd.exe_debug" />
<?endif ?>
- <!-- ShibbolethSP-registry-x32 -->
- <ComponentRef Id="TargetDir" />
- <ComponentRef Id="shib.ico" />
</Include>
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index 1237838e..d8a17601 100644
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -21,28 +21,6 @@
<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" />
- </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" />
- </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" />
- </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" />
- </Component>
- </Directory><!-- bin_debug -->
- <?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}">
@@ -155,18 +133,6 @@
<?endif ?>
</Directory><!-- lib_shibboleth -->
</Directory><!-- lib -->
- <!-- the service bin -->
- <Directory Id="sbin" Name="sbin" FileSource="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release">
- <!-- Service bin is installed in main-x86 (with service) and main-64 (without) -->
- <?if $(var.BuildDebug) != "" ?>
- <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" />
- </Component>
- </Directory><!-- sbin_debug -->
- <?endif ?>
- </Directory><!-- sbin -->
</DirectoryRef><!-- INSTALLDIR -->
</Fragment>
</Wix>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 04a4b1ac..f48102df 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -183,11 +183,6 @@
<?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" />
- </Component>
-
<Component Id="shibd64.exe" Guid="{707B57A2-CCA0-48A6-9F66-275EB04474AA}" Win64="yes" Directory="sbin64">
<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" />
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
deleted file mode 100644
index d28976e8..00000000
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You under the Apache License, Version 2.0
- (the 'License'); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an 'AS IS' BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. -->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <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" />
-
- <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>
-
- <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>
-
- <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
-
- <?include ShibbolethSP-properties.wxi?>
-
- <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
- <Property Id="IS64BITINSTALL" Value="FALSE" />
-
- <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-->
-
- <Feature Id="Shibboleth" Title="Shibboleth" Level="1" Display="hidden" ConfigurableDirectory="INSTALLDIR">
- <MergeRef Id="CurlMergeModule_x86" />
- <?if $(var.FCGI) != "" ?>
- <MergeRef Id="FastCGIMergeModule_x86" />
- <?endif ?>
- <MergeRef Id="Log4ShibMergeModule_x86" />
- <MergeRef Id="OpenSAMLMergeModule_x86" />
- <MergeRef Id="OpenSAMLMergeModule_schemas" />
- <MergeRef Id="OpenSSLMergeModule_x86" />
- <MergeRef Id="ShibbolethMergeModule_x86" />
- <MergeRef Id="ShibbolethMergeModule_schemas" />
- <MergeRef Id="XercesMergeModule_x86" />
- <MergeRef Id="XmlSecMergeModule_x86" />
- <MergeRef Id="ZlibMergeModule_x86" />
-
- <?if $(var.BuildDebug) != "" ?>
- <MergeRef Id="Microsoft_DebugCRT_x86" />
- <?endif ?>
- <MergeRef Id="Microsoft_CRT_x86" />
-
- <!-- ShibbolethSP-main-x86 -->
- <ComponentRef Id="SetPath" />
-
- <?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" />
- <!-- 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" />
- <!-- We put in the messages for Isapi and Shibd in this module since all others are shared with x64 -->
- <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Shibboleth\Shibboleth Service Provider">
- <RegistryValue Name="CategoryCount" Type="integer" Value="8" />
- <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
- <RegistryValue Name="CategoryMessageFile" Type="string" Value="[ProgramFilesFolder]Shibboleth\SP\lib\NTEventLogAppender.dll" />
- <RegistryValue Name="EventMessageFile" Type="string" Value="[ProgramFilesFolder]Shibboleth\SP\lib\NTEventLogAppender.dll" />
- </RegistryKey>
- </Component>
- </Feature>
-
- <!-- Also put in the configuration for IIS7 - There is a difference between 32 and 64 bit dlls and
- 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="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="SetDisplayName" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore"/>
-
- <InstallExecuteSequence>
- <!-- Install IIS if
- - this is an install
- - 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>
- </InstallExecuteSequence>
- </Product>
-</Wix>
diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
index 617e03a8..299260be 100644
--- a/msi/WiX/ShibbolethSP-registry-x86.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x86.wxs
@@ -48,17 +48,5 @@
<RegistrySearch Id="OldServiceInstalled" Root="HKLM" Key="SYSTEM\CurrentControlSet\services\shibd_Default" Name="ImagePath" Type="raw" />
</Property>
- <DirectoryRef Id="bin">
- <!-- Save the Captured parameters into the registry -->
- <Component Id="TargetDir" Guid="{F02FB6E5-1146-4EC5-9D59-07BA6732C4DD}">
- <RegistryValue Id="TargetDir" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="InstallDir" Value="[INSTALLDIR]" Type="string" KeyPath="yes" />
- </Component>
-
- <!-- 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" />
- <RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayIcon" Value="[#shib.ico],0" Type="string" />
- </Component>
- </DirectoryRef>
</Fragment>
</Wix>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list