git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3735
cb58f699-b61c-0410-a6fe-
9272a202ed29
<Directory Id='shibboleth_SP' Name='SP'>\r
<Directory Id='lib' Name='lib' \r
FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan'>\r
<Directory Id='shibboleth_SP' Name='SP'>\r
<Directory Id='lib' Name='lib' \r
FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan'>\r
- <Component Id='xsec.dll' Guid='{3EB5B168-1FB1-476D-8E7C-2469D9B55162}' Win64='yes'>\r
+ <Component Id='xsec.dll' Guid='{DF5FEFC9-9B95-42B1-A6BD-053E0D0BD8E8}' Win64='yes'>\r
<File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\r
</Component>\r
<Component Id='c14n.exe' Guid='{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}' Win64='yes'>\r
<File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\r
</Component>\r
<Component Id='c14n.exe' Guid='{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}' Win64='yes'>\r
</Component>\r
<Directory Id='lib_debug' Name='debug' \r
FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Debug No Xalan'>\r
</Component>\r
<Directory Id='lib_debug' Name='debug' \r
FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Debug No Xalan'>\r
- <Component Id='xsecD.dll' Guid='{EC1CCD0D-028D-4C92-846D-88C1C24B66E6}' Win64='yes'>\r
+ <Component Id='xsecD.dll' Guid='{D97E1B5C-B020-4621-94CE-F10FCFF765C5}' Win64='yes'>\r
<File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
</Component>\r
<Component Id='c14n.exe_debug' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>\r
<File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
</Component>\r
<Component Id='c14n.exe_debug' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>\r
<Directory Id='shibboleth_SP' Name='SP'>\r
<Directory Id='lib' Name='lib' \r
FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan'>\r
<Directory Id='shibboleth_SP' Name='SP'>\r
<Directory Id='lib' Name='lib' \r
FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan'>\r
- <Component Id='xsec.dll' Guid='{8920023D-92CA-4012-8BF8-6D80D791375D}'>\r
+ <Component Id='xsec.dll' Guid='{761CE697-2701-4149-ACD5-A693EBB45B33}'>\r
<File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\r
</Component>\r
<Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>\r
<File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\r
</Component>\r
<Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>\r
</Component>\r
<Directory Id='lib_debug' Name='debug' \r
FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan'>\r
</Component>\r
<Directory Id='lib_debug' Name='debug' \r
FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan'>\r
- <Component Id='xsecD.dll' Guid='{9FF121C0-9C75-428E-A8A2-5DD0F499CA73}'>\r
+ <Component Id='xsecD.dll' Guid='{34D437A1-3008-433F-A86F-F69E4852069F}'>\r
<File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
</Component>\r
<Component Id='c14n.exe_debug' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>\r
<File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
</Component>\r
<Component Id='c14n.exe_debug' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>\r
<Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' Language='1033' \r
Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' \r
UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
<Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' Language='1033' \r
Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' \r
UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
- <Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) Beta 1' Compressed='yes'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
+ <Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) RC 1' Compressed='yes'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
- <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." \r
- MigrateFeatures="yes" Schedule="afterInstallExecute" />\r
+ <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'\r
+ AllowSameVersionUpgrades='yes' MigrateFeatures='yes' Schedule='afterInstallExecute' />\r
\r
<PropertyRef Id='SHIB_OLDVERSION_64'/>\r
<PropertyRef Id='SHIB_OLDVERSION'/>\r
\r
<PropertyRef Id='SHIB_OLDVERSION_64'/>\r
<PropertyRef Id='SHIB_OLDVERSION'/>\r
<Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' \r
Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' \r
UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
<Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' \r
Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' \r
UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
- <Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion) Beta 1' Compressed='yes'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>\r
+ <Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion) RC 1' Compressed='yes'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>\r
- <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." \r
- MigrateFeatures="yes" Schedule="afterInstallExecute" />\r
+ <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'\r
+ AllowSameVersionUpgrades='yes' MigrateFeatures='yes' Schedule='afterInstallExecute' />\r
\r
<PropertyRef Id='SHIB_OLDVERSION'/>\r
\r
\r
<PropertyRef Id='SHIB_OLDVERSION'/>\r
\r
permissions and limitations under the License. -->\r
\r
<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
permissions and limitations under the License. -->\r
\r
<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
- <?define BuildDirectory='C:\Users\scantor\Shibboleth\' ?>\r
- <?define SPBuildDirectory='C:\Users\scantor\Shibboleth\git\' ?>\r
+ <?define BuildDirectory='C:\Users\Administrator\Shibboleth\' ?>\r
+ <?define SPBuildDirectory='C:\Users\Administrator\Shibboleth\svn\2.5\' ?>\r
\r
<!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->\r
<?define ShibbolethVersion='2.5.0'?>\r
\r
<!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->\r
<?define ShibbolethVersion='2.5.0'?>\r
<?define XercesVersion='3.1.1' ?><!-- $(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll' -->\r
<?define XercesFileVersion='3_1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
\r
<?define XercesVersion='3.1.1' ?><!-- $(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll' -->\r
<?define XercesFileVersion='3_1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
\r
- <?define XmlSecVersion='1.6.1' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->\r
- <?define XmlSecFileVersion='1_6' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
+ <?define XmlSecVersion='1.7.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->\r
+ <?define XmlSecFileVersion='1_7' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
\r
<?define XmlToolingVersion='1.5.0' ?>\r
<?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r
\r
<?define XmlToolingVersion='1.5.0' ?>\r
<?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r