[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: ShibbolethSP-noarch.wxs ShibbolethSP-registry-x64.wxs

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jun 11 01:47:41 2012
New Revision: 3708

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3708&view=rev
Log:
Remove SHIBSP_SCHEMAS on any type of 2.5 install

Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x64.wxs

Modified: branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs?rev=3708&r1=3707&r2=3708&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs Mon Jun 11 01:47:41 2012
@@ -148,6 +148,9 @@
           <Directory Id='var_cache_shibboleth' Name='shibboleth'>
             <Component Id='var_cache_shibboleth_folder' Guid='{6C978639-DDCF-40BD-90F8-690B3E05586C}'>
               <CreateFolder />
+              <!-- Kill off old env variable from pre 2.5 install.
+                   Do it here so it is in the correct tables -->
+              <Environment Id='SHIBSP_SCHEMAS' Action='remove' Name='SHIBSP_SCHEMAS'/>
             </Component>
           </Directory><!-- var_cache_shibboleth -->
         </Directory><!-- var_cache -->

Modified: branches/REL_2/msi/WiX/ShibbolethSP-registry-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-registry-x64.wxs?rev=3708&r1=3707&r2=3708&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-registry-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-registry-x64.wxs Mon Jun 11 01:47:41 2012
@@ -107,7 +107,7 @@
                        Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />
       </Component>
 
-      <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'>
+      <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'  Permanent='yes'>
         <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' />