[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: ShibbolethSP-main-x64.wxs ShibbolethSP-main-x86.wxs ShibbolethSP-properti...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Aug  3 10:18:55 2012
New Revision: 3748

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3748&view=rev
Log:
SSPCPP-489:  Hardwire the INSATLL_32BIT property's value by architecture

Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs?rev=3748&r1=3747&r2=3748&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Fri Aug  3 10:18:55 2012
@@ -41,6 +41,7 @@
 
     <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
     <Property Id='IS64BITINSTALL' Value='TRUE'/>
+    <Property Id='INSTALL_32BIT' Secure='yes' />
     <UIRef Id='ShibbolethInstallDir'/>
 
 

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs?rev=3748&r1=3747&r2=3748&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs Fri Aug  3 10:18:55 2012
@@ -42,6 +42,7 @@
 
     <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
     <Property Id='IS64BITINSTALL' Value='FALSE'/>
+    <Property Id='INSTALL_32BIT' Secure='yes' Value='TRUE' />
 
     <UIRef Id='ShibbolethInstallDir'/>
 

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=3748&r1=3747&r2=3748&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi Fri Aug  3 10:18:55 2012
@@ -29,7 +29,6 @@
   </Property>
   
   <!-- On 64 bit systems: 64 bit or 32bit service and DLLS, also used to swap in the 64 bit service -->
-  <Property Id='INSTALL_32BIT' Secure='yes' />
 
   <Property Id='ARPCONTACT' Value='contact at shibboleth.net' />
   <Property Id='ARPHELPLINK' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/Installation+and+Configuration' />