[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: Installer.make ShibbolethSP-properties.wxi

Fri Nov 2 05:50:22 EDT 2012

Author: rdw
Date: Fri Nov  2 05:50:22 2012
New Revision: 3815

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3815&view=rev
Log:
Better dependencies on the VB, tidy up comments

Modified:
    branches/REL_2/msi/WiX/Installer.make
    branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi

Modified: branches/REL_2/msi/WiX/Installer.make
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Installer.make?rev=3815&r1=3814&r2=3815&view=diff
==============================================================================

--- branches/REL_2/msi/WiX/Installer.make (original)
+++ branches/REL_2/msi/WiX/Installer.make Fri Nov  2 05:50:22 2012
@@ -43,7 +43,7 @@
 	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
 

Modified: branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi?rev=3815&r1=3814&r2=3815&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi Fri Nov  2 05:50:22 2012
@@ -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 at shibboleth.net' />
   <Property Id='ARPHELPLINK' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/Installation+and+Configuration' />

