--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+<!-- Licensed to the University Corporation for Advanced Internet\r
+ Development, Inc. (UCAID) under one or more contributor license\r
+ agreements. See the NOTICE file distributed with this work for\r
+ additional information regarding copyright ownership. The UCAID\r
+ licenses this file to You under the Apache License, Version 2.0\r
+ (the "License"); you may not use this file except in compliance\r
+ with the License. You may obtain a copy of the License at\r
+ \r
+ http://www.apache.org/licenses/LICENSE-2.0\r
+ \r
+ Unless required by applicable law or agreed to in writing, software\r
+ distributed under the License is distributed on an "AS IS" BASIS,\r
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+ implied. See the License for the specific language governing\r
+ permissions and limitations under the License. -->\r
+\r
+<?include ..\Versions.wxi ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='Shibboleth_schemas' Language='1033' Version='$(var.ShibbolethDllVersion)'>\r
+ <Package Id='{5AC5161D-114D-4BFB-AF7C-4E8E7F964965}' Description='Merge Module for Shibboleth schemas'\r
+ Comments='This module is built by the Shibboleth Consortium.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='CommonAppDataFolder' Name='CommonFiles' >\r
+ <Directory Id='Shibboleth' Name='Shibboleth' >\r
+ <Directory Id='SP' Name='SP' >\r
+ <Directory Id='xml' Name='xml' >\r
+ <Directory Id='xml_shibboleth' Name='shibboleth'\r
+ FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas' >\r
+ <Component Id='share_xml_shibboleth' Guid='{E2740531-4A6C-43C8-9E1A-9F7CA87862B7}'>\r
+ <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />\r
+ </Component>\r
+ <Component Id='catalog.xml' Guid='{C6EA59A2-0A86-4F5F-B5F8-E37A2310A793}'>\r
+ <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />\r
+ </Component>\r
+ <Component Id='attributemap.xsd' Guid='{58A966DC-94E0-45FF-9A31-C67BAE0AB1C1}'>\r
+ <File Name='shibboleth-2.0-attribute-map.xsd' />\r
+ </Component>\r
+ <Component Id='afp.xsd' Guid='{9672ADDF-8053-41C3-A58A-C8B99C710336}'>\r
+ <File Name='shibboleth-2.0-afp.xsd' />\r
+ </Component>\r
+ <Component Id='afpmfsaml.xsd' Guid='{40B8AEF3-0A31-4204-95E7-F8079CB55979}'>\r
+ <File Name='shibboleth-2.0-afp-mf-saml.xsd' />\r
+ </Component>\r
+ <Component Id='WSTrust.xsd' Guid='{91EA82B5-A19C-40C0-8D1C-40FA020A484E}'>\r
+ <File Name='WS-Trust.xsd' />\r
+ </Component>\r
+ <Component Id='spnotify.xsd' Guid='{65EBC9F1-C958-4B17-9554-7F86186A15C1}'>\r
+ <File Name='shibboleth-2.0-sp-notify.xsd' />\r
+ </Component>\r
+ <Component Id='nativespconfig.xsd' Guid='{5514B435-94AB-4A92-9737-0BEB78C146C8}'>\r
+ <File Name='shibboleth-2.0-native-sp-config.xsd' />\r
+ </Component>\r
+ <Component Id='afpmfbasic.xsd' Guid='{D1C32485-D3DF-414C-B2FF-721F169CAC05}'>\r
+ <File Name='shibboleth-2.0-afp-mf-basic.xsd' />\r
+ </Component>\r
+ <Component Id='nativespprotocols' Guid='{AE42FFFB-1A59-4F1D-9935-15D727B99929}'>\r
+ <File Id='nativespprotocols' Name='shibboleth-2.0-native-sp-protocols.xsd' />\r
+ </Component>\r
+ <Component Id='shibboleth.xsd' Guid='{18F3DD83-0C0A-480E-8C87-043C9296DFE5}'>\r
+ <File Name='shibboleth.xsd' KeyPath='yes' />\r
+ </Component>\r
+ </Directory><!--xml_shibboleth-->\r
+ </Directory><!--xml-->\r
+ </Directory><!--SP-->\r
+ </Directory><!--Shibboleth-->\r
+ </Directory><!--CommonAppDataFolder-->\r
+ </Directory><!--TargetDir-->\r
+\r
+ <Binary Id='EditCatalogFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />\r
+ <CustomAction Id='EditCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
+ Execute='deferred' Impersonate='no' />\r
+ <CustomAction Id='SetEditCatalog' Property='EditCatalog' \r
+ Value='[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />\r
+\r
+ <InstallExecuteSequence>\r
+ <Custom Action='SetEditCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
+ <Custom Action='EditCatalog' After='InstallFiles'>NOT Installed</Custom>\r
+ </InstallExecuteSequence>\r
+\r
+\r
+\r
+ </Module>\r
+</Wix>\r
Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' \r
UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
<Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
\r
<PropertyRef Id='SHIB_OLDVERSION_64'/>\r
<PropertyRef Id='SHIB_OLDVERSION'/>\r
SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />\r
<Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />\r
<Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />\r
+ <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />\r
<Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />\r
<Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />\r
<Merge Id='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />\r
<MergeRef Id='OpenSAMLMergeModule_schemas'/>\r
<MergeRef Id='OpenSSLMergeModule_x86'/>\r
<MergeRef Id='ShibbolethMergeModule_x86'/>\r
+ <MergeRef Id='ShibbolethMergeModule_schemas'/>\r
<MergeRef Id='XercesMergeModule_x86'/>\r
<MergeRef Id='XmlSecMergeModule_x86'/>\r
<MergeRef Id='XmlToolingMergeModule_x86'/>\r
Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' \r
UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
<Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='405'/>\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>\r
\r
<PropertyRef Id='SHIB_OLDVERSION'/>\r
\r
<Condition Message='Shibboleth requires Windows XP SP2 or later.'>NOT VersionNT OR (VersionNT >= 501)</Condition>\r
<Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>\r
- <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the "Change" option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>(SHIB_OLDVERSION = "none") AND (SHIB_OLDVERSION_64 = "none")</Condition>\r
+ <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the "Change" option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>SHIB_OLDVERSION = "none"</Condition>\r
\r
- <Condition Message='For a 32 installation on a 64 target, install the 64 msi and specify a 32 bit shibd'>NOT VersionNT64</Condition>\r
+ <Condition Message='For a 32 installation on a 64 architecture, install the 64bit msi but specify a 32 bit shibd'>NOT VersionNT64</Condition>\r
\r
<Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
\r
SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />\r
<Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />\r
<Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />\r
+ <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />\r
<Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />\r
<Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />\r
<Merge Id='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />\r
<MergeRef Id='OpenSAMLMergeModule_schemas'/>\r
<MergeRef Id='OpenSSLMergeModule_x86'/>\r
<MergeRef Id='ShibbolethMergeModule_x86'/>\r
+ <MergeRef Id='ShibbolethMergeModule_schemas'/>\r
<MergeRef Id='XercesMergeModule_x86'/>\r
<MergeRef Id='XmlSecMergeModule_x86'/>\r
<MergeRef Id='XmlToolingMergeModule_x86'/>\r
<Directory Id='doc' Name='doc' >\r
<Directory Id='doc_shibboleth' Name='shibboleth' \r
FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc' >\r
+ <!-- TODO seperate components -->\r
<Component Id='doc_shibboleth' Guid='{8239E994-8295-4E26-8708-DDF240B486BF}'>\r
<File Name='main.css' KeyPath='yes'/>\r
<File Name='logo.jpg' />\r
<Directory Id='etc' Name='etc' >\r
<Directory Id='etc_shibboleth' Name='shibboleth' \r
FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs' >\r
+ <!-- TODO seperate components -->\r
<Component Id='etc_shibboleth_perm' Guid='{1F1B9F9B-6437-46F1-ACE8-8D135612336C}' Permanent='yes'>\r
<File KeyPath='yes' \r
Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\apps\openssl.cnf' />\r
<Directory Id='var_run_shibboleth' Name='shibboleth' />\r
</Directory><!-- var_run -->\r
</Directory><!-- var -->\r
- <!-- Schemas -->\r
- <!-- TODO Move to a merge module -->\r
- <Directory Id='CommonAppDataFolder' Name='CommonFiles' >\r
- <Directory Id='Shibboleth' Name='Shibboleth' >\r
- <Directory Id='SP' Name='SP' >\r
- <Directory Id='xml' Name='xml' >\r
- <Directory Id='xml_shibboleth' Name='shibboleth'\r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas' >\r
- <Component Id='share_xml_shibboleth' Guid='{69FCD385-B31D-43FB-B8A7-6F8D30391661}'>\r
- <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />\r
- <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />\r
- <File Name='shibboleth-2.0-attribute-map.xsd' />\r
- <File Name='shibboleth-2.0-afp.xsd' />\r
- <File Name='shibboleth-2.0-afp-mf-saml.xsd' />\r
- <File Name='WS-Trust.xsd' />\r
- <File Name='shibboleth-2.0-sp-notify.xsd' />\r
- <File Name='shibboleth-2.0-native-sp-config.xsd' />\r
- <File Name='shibboleth-2.0-afp-mf-basic.xsd' />\r
- <File Name='shibboleth-2.0-native-sp-protocols.xsd' />\r
- </Component>\r
- <Component Id='share_xml_shibboleth_xsd' Guid='{8C5B6416-5BE3-4D4D-BF8B-B677365DA58C}'>\r
- <File Name='shibboleth.xsd' KeyPath='yes' />\r
- </Component>\r
- </Directory><!--xml_shibboleth-->\r
- </Directory><!--xml-->\r
- </Directory><!--SP-->\r
- </Directory><!--Shibboleth-->\r
- </Directory><!--CommonAppDataFolder-->\r
</DirectoryRef>\r
\r
<!-- The actions to perform after the files have been copied\r
\r
<?define FastCGIVersion='2.4.0' ?>\r
\r
- <?define LogForShibVersion='1.0.5' ?>\r
+ <?define LogForShibVersion='1.0.5' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
\r
<?define LogForShibFileVersion='1_0' ?> <!-- '$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'> -->\r
\r
- <?define OpenSAMLVersion='2.4.3' ?> \r
+ <?define OpenSAMLVersion='2.4.3' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
<?define OpenSAMLFileVersion='2_4' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->\r
\r
<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->\r
<?define OpenSSLDirVersion='1.0.0a' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->\r
- <?define OpenSSLFileVersion='1_0_0' ?><!-- 'libeay32_$(var.OpenSSLFileVersion)D.dll' -->\r
+ <?define OpenSSLFileVersion='1_0_0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
\r
<!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->\r
- <?define ShibbolethDllFileVersion='1_4' ?><!-- 'shibsp-lite$(var.ShibbolethSPFileVersion).dll' -->\r
+ <?define ShibbolethDllFileVersion='1_4' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
<?define ShibbolethDllVersion='1.4.2' ?>\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' ?>\r
+ <?define XercesFileVersion='3_1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
\r
<?define XmlSecVersion='1.6.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->\r
- <?define XmlSecFileVersion='1_6' ?><!--'xsec_$(var.XmlSecFileVersion).dll'-->\r
+ <?define XmlSecFileVersion='1_6' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
\r
<?define XmlToolingVersion='1.4.2' ?>\r
<?define XmlToolingFileVersion='1_4' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r
\r
<?define ZlibVersion='1.2.5' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'-->\r
- <?define ZlibFileVersion='1' ?>\r
+ <?define ZlibFileVersion='1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
</Include>\r
projects / shibboleth / cpp-sp.git / commitdiff