implied. See the License for the specific language governing\r
permissions and limitations under the License. -->\r
\r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define OpenSSLDirVersion='1.0.0a' ?>\r
+<?include Versions.wxi ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<!-- This is where we put all the architecture neutral bits of the\r
<Directory Id='var_run_shibboleth' Name='shibboleth' />\r
</Directory><!-- var_run -->\r
</Directory><!-- var -->\r
+ <!-- Schemas -->\r
+ <Directory Id='CommonAppDataFolder' Name='CommonFiles' >\r
+ <Directory Id='common_shibboleth' Name='Shibboleth' >\r
+ <Directory Id='common_sp' Name='SP' >\r
+ <Directory Id='common_doc' Name='doc' \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><!--common_doc-->\r
+ </Directory><!--common_sp-->\r
+ </Directory><!--common_shibboleth-->\r
+ </Directory><!--CommonAppDataFolder-->\r
</DirectoryRef>\r
- <!-- Schemas -->\r
- <DirectoryRef Id='SHARE_DIR'><!-- \opt\shibboleth-sp\share -->\r
- <Directory Id='share_xml' Name='xml'>\r
- <Directory Id='share_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><!-- share_xml_shibboleth -->\r
- </Directory><!-- share_xml -->\r
- </DirectoryRef><!-- share -->\r
- <!-- Previous version search -->\r
- <Property Id='SHIB_OLDVERSION' Value='none' Secure='yes'>\r
- <!-- 32 bit -->\r
- <RegistrySearch Id='SP2_2_1' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2A19CDBC-E0DA-452C-8B38-1AA9DB4D579F}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_4_1_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A5D2DE8D-2A4A-4D74-98B5-BA448DD4DC39}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_4_2_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8280E58C-D290-42CD-9425-BCC0BA439649}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_4_3_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7B9F4513-3141-4270-B1F5-43A467235B6B}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_2_0_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EAAAD296-3942-4535-B39B-81A57E94FCF7}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_3_0_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{790EE9BA-BB63-43D3-9080-F9AF7AC43114}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_1_0_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E80BF81-72BC-4E9C-8A79-D7D7EA20AAE4}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='AppReg2' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A9A0D770-C658-4659-BC75-6F8289DDEAA3}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_4_0_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{56028A6A-D5A3-47C5-9494-092E1C840A8F}' \r
- Name='DisplayName' Type='raw' />\r
- <RegistrySearch Id='AppReg1' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{6E62498D-162E-45AA-87C7-157308552043}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_0_0_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D62F990B-2A8A-442B-BF85-7FE075B2CE0C}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_3_1' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E4FA3B6C-6347-4B58-A07D-F9E388B3944B}' \r
- Name='DisplayVersion' Type='raw' />\r
-\r
- <!-- 64 bit \r
- <RegistrySearch Id='SP_2_2_1_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_4_1_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_4_2_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP_2_4_3_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_3_0_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_4_0_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}' \r
- Name='DisplayName' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_1_0_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_2_0_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_3_1_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' /> -->\r
- </Property>\r
-\r
- <Property Id="SHIBD_PORT" Value="1600" Secure="yes" />\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"</Condition>\r
\r
<!-- The actions to perform after the files have been copied -->\r
<Binary Id='EditConfigFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix' />\r