[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: MergeModules/OpenSAML-schemas.wxs MergeModules/Shibboleth-schemas.wxs Ver...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Sep  6 12:33:28 2012
New Revision: 3762

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3762&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-498

Modified:
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs
    branches/REL_2/msi/WiX/Versions.wxi

Modified: branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs?rev=3762&r1=3761&r2=3762&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs Thu Sep  6 12:33:28 2012
@@ -225,13 +225,13 @@
     <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall=''
       Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog'
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />
     <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10'
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />
     <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11'
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />
     <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20'
-      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />
     <InstallExecuteSequence>
       <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>
       <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>

Modified: branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs?rev=3762&r1=3761&r2=3762&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs Thu Sep  6 12:33:28 2012
@@ -72,7 +72,7 @@
     <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
                   Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' 
-                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />
+                  Value='%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />
     <InstallExecuteSequence>
       <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>
       <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>

Modified: branches/REL_2/msi/WiX/Versions.wxi
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Versions.wxi?rev=3762&r1=3761&r2=3762&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Versions.wxi (original)
+++ branches/REL_2/msi/WiX/Versions.wxi Thu Sep  6 12:33:28 2012
@@ -50,7 +50,7 @@
   <?define XmlSecVersion='1.7.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->
   <?define XmlSecFileVersion='1_7' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
-  <?define XmlToolingVersion='1.5.0' ?>
+  <?define XmlToolingVersion='1.5.1' ?>
   <?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->
 
   <?define ZlibVersion='1.2.7' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Release\zlib$(var.ZlibFileVersion).dll'-->