From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Fri, 2 Nov 2012 09:50:22 +0000 (+0000)
Subject: Better dependencies on the VB, tidy up comments
X-Git-Tag: 2.5.1~20
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=9d53e6016d02c9612e92cbdfa7c7cf0ab5564822

Better dependencies on the VB, tidy up comments
---

diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make
index 1c412d2..58f2c68 100644
--- a/msi/WiX/Installer.make
+++ b/msi/WiX/Installer.make
@@ -43,7 +43,7 @@ ShibbolethSP-registry-x64.wixobj: ShibbolethSP-registry-x64.wxs
 	wixcop -indent:2 ShibbolethSP-registry-x64.wxs
 	candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-registry-x64.wxs
 
-ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs
+ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs ..\scripts\shib_install_isapi_filter.vbs-wix ..\scripts\shib_uninstall_isapi_filter.vbs-wix ..\scripts\shib_edit_config_files.vbs-wix
 	wixcop -indent:2 ShibbolethSP-noarch.wxs
 	candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-noarch.wxs
 
diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index 552cd65..07f8027 100644
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -27,8 +27,8 @@
   <Property Id='SHIB_FILE_EXTENSION' Value='.sso' Secure='yes'>
     <RegistrySearch Id='AppReg' Root='HKLM' Key='SOFTWARE\Shibboleth' Name='FileExtension' Type='raw' />
   </Property>
-  
-  <!-- On 64 bit systems: 64 bit or 32bit service and DLLS, also used to swap in the 64 bit service -->
+
+  <!-- Information for the properties page of the msi -->
 
   <Property Id='ARPCONTACT' Value='contact@shibboleth.net' />
   <Property Id='ARPHELPLINK' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/Installation+and+Configuration' />