--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define CurlVersion='7.21.2' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='CurlMergeModule_x64' Language='1033' Version='$(var.CurlVersion)'>\r
+ <Package Id='{DB1A5E0D-0052-40F3-9D7B-469CCD0CEB2D}' Description='Merge Module for CURL (x64)'\r
+ Comments='This module is built by the Shibboleth Consortium.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+ <Component Id='libcurl.dll' Guid='{14BDB19A-B7F1-4038-B114-8388F3FF07F0}' Win64='yes'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll'/>\r
+ </Component>\r
+ <Component Id='curl.exe' Guid='{52103377-AEF6-4533-B0CE-D3A786D2D17E}' Win64='yes'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release.x64\curl.exe'/>\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='libcurld.dll' Guid='{6F225F9F-25CD-4F6D-8A8F-01C6DD0F0959}' Win64='yes'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll'/>\r
+ </Component>\r
+ <Component Id='curl.exe_debug' Guid='{F363D42B-8CB6-4ED8-B2D3-3637B6110E38}' Win64='yes'>\r
+ <File Id='curl.exe_debug' KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug.x64\curl.exe'/>\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ </Directory><!-- shibboleth_SP -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix>\r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define CurlVersion='7.21.2' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>\r
+ <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL'\r
+ Comments='This module is built by the Shibboleth Consortium.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+\r
+ <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
+ At a a later date, we may chose to make this a placed module -->\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+\r
+ <Component Id='libcurl.dll' Guid='{8F72A198-4D90-47DC-BBAC-123D51DE4192}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll'/>\r
+ </Component>\r
+ <Component Id='curl.exe' Guid='{67A6F011-9715-43C2-92F1-70FE53E935AD}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release\curl.exe'/>\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='libcurld.dll' Guid='{EFAEA264-C49A-4A91-816F-DD151F094892}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll'/>\r
+ </Component>\r
+ <Component Id='curl.exe1' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>\r
+ <File Id='curl.exe_debug' KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug\curl.exe'/>\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ </Directory><!-- shibboleth_SP -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>\r
- <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL'\r
+ <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'\r
Comments='This module is built by the Shibboleth Consortium.'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
-\r
- <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
- At a a later date, we may chose to make this a placed module -->\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x64'/>\r
\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define FastCGIVersion='2.4.0' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='FastCGIMergeModule_x64' Language='1033' Version='$(var.FastCGIVersion)'>\r
+ <Package Id='{4820855A-68B9-4EBB-94CD-4C1F9DA6EB02}' Description='Merge Module for FastCGI (x64)'\r
+ Comments='This module is built by the Shibboleth Consortium.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_SP' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+ <Component Id='libfcgi.dll21' Guid='{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}' Win64='yes'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='libfcgi.dll' Guid='{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}' Win64='yes'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ <Directory Id='doc' Name='doc'>\r
+ <Component Id='FASTCGI.LICENSE' Guid='{FC00E9B5-72B1-4E87-A5C4-26EE6A7BA509}' Win64='yes'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\FASTCGI.LICENSE' />\r
+ </Component>\r
+ </Directory><!-- doc -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- shibboleth_SP -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix>\r
+\r
+\r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define FastCGIVersion='2.4.0' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='FastCGIMergeModule_x86' Language='1033' Version='$(var.FastCGIVersion)'>\r
+ <Package Id='{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}' Description='Merge Module for FastCGI'\r
+ Comments='This module is built by the Shibboleth Consortium.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+\r
+ <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
+ At a a later date, we may chose to make this a placed module -->\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_SP' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+ <Component Id='libfcgi.dll21' Guid='{FD6F8E32-CBDF-4662-A39C-8EC713483C51}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Release\libfcgi.dll' />\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='libfcgi.dll' Guid='{682FFA3A-D517-4332-BCC5-EF24252C3528}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll' />\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ <Directory Id='doc' Name='doc'>\r
+ <Component Id='FASTCGI.LICENSE' Guid='{3FB61369-D8A7-4076-B659-DEDA2558A1AF}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\FASTCGI.LICENSE' />\r
+ </Component>\r
+ </Directory><!-- doc -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- shibboleth_SP -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix>\r
+\r
+\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Module Id='FastCGIMergeModule_x86' Language='1033' Version='$(var.FastCGIVersion)'>\r
- <Package Id='{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}' Description='Merge Module for FastCGI'\r
+ <Package Id='{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}' Description='Merge Module for FastCGI (x86)'\r
Comments='This module is built by the Shibboleth Consortium.'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
-\r
- <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
- At a a later date, we may chose to make this a placed module -->\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\r
\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
</Directory><!-- lib_debug-->\r
</Directory><!-- lib -->\r
<Directory Id='doc' Name='doc'>\r
- <Directory Id='doc_shibboleth' Name='shibboleth'>\r
- <Component Id='FASTCGI.LICENSE' Guid='{3FB61369-D8A7-4076-B659-DEDA2558A1AF}'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\FASTCGI.LICENSE' />\r
- </Component>\r
- </Directory><!-- doc_shibboleth-->\r
+ <Component Id='FASTCGI.LICENSE' Guid='{3FB61369-D8A7-4076-B659-DEDA2558A1AF}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\FASTCGI.LICENSE' />\r
+ </Component>\r
</Directory><!-- doc -->\r
</Directory><!-- shibboleth -->\r
</Directory><!-- shibboleth_SP -->\r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define LogForShibVersion='1.0.5' ?>\r
+<?define LogForShibFileVersion='1_0' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>\r
+ <Package Id='{A2D51A0D-847A-4941-80FC-C8C8E697565F}' Description='Merge Module for Log4Shib (x64)'\r
+ Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_SP' Name='SP'>\r
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'>\r
+ <Component Id='log4shib.dll' Guid='{DA7E5213-363E-4E13-B05D-90905BE9FB94}' Win64='yes'>\r
+ <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>\r
+ </Component>\r
+ <Component Id='NTEventLogAppender.dll' Guid='{1A559035-DCA4-4297-AE94-C3E6ABB37662}' Win64='yes'>\r
+ <File KeyPath='yes' Name='NTEventLogAppender.dll'/>\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Debug\'>\r
+ <Component Id='log4shibD.dll' Guid='{792E6762-70FE-418A-9336-39DDF1A6BAE7}' Win64='yes'>\r
+ <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>\r
+ </Component>\r
+ <Component Id='NTEventLogAppender.dll_debug' Guid='{6C23C432-EA11-4313-9F5F-DBB09A8752E8}' Win64='yes'>\r
+ <File Id='NTEventLogAppenderD.dll' KeyPath='yes' Name='NTEventLogAppender.dll'/>\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ <Directory Id='doc' Name='doc'>\r
+ <Component Id='LOG4CPP.LICENSE' Guid='{6332D7BE-90A0-4698-B1E9-06AE8163F5A8}' Win64='yes'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />\r
+ </Component>\r
+ </Directory><!-- doc -->\r
+ </Directory><!-- shibboleth_SP -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix>\r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define LogForShibVersion='1.0.5' ?>\r
+<?define LogForShibFileVersion='1_0' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>\r
+ <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib'\r
+ Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+\r
+ <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
+ At a a later date, we may chose to make this a placed module -->\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_SP' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+ <Component Id='log4shib.dll' Guid='{2FDE8ED0-774A-4F44-88D5-C7089350D895}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\log4shib$(var.LogForShibFileVersion).dll'/>\r
+ </Component>\r
+ <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\NTEventLogAppender.dll'/>\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='log4shibD.dll' Guid='{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\log4shib$(var.LogForShibFileVersion)D.dll'/>\r
+ </Component>\r
+ <Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>\r
+ <File Id='NTEventLogAppenderD.dll' KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\NTEventLogAppender.dll'/>\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ <Directory Id='doc' Name='doc'>\r
+ <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />\r
+ </Component>\r
+ </Directory><!-- doc -->\r
+ </Directory><!-- shibboleth_SP -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>\r
- <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib'\r
+ <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib (x86)'\r
Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
-\r
- <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
- At a a later date, we may chose to make this a placed module -->\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\r
\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
<Directory Id='shibboleth' Name='Shibboleth'>\r
<Directory Id='shibboleth_SP' Name='SP'>\r
- <Directory Id='lib' Name='lib'>\r
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\'>\r
<Component Id='log4shib.dll' Guid='{2FDE8ED0-774A-4F44-88D5-C7089350D895}'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\log4shib$(var.LogForShibFileVersion).dll'/>\r
+ <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>\r
</Component>\r
<Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\NTEventLogAppender.dll'/>\r
+ <File KeyPath='yes' Name='NTEventLogAppender.dll'/>\r
</Component>\r
- <Directory Id='lib_debug' Name='debug'>\r
+ <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\'>\r
<Component Id='log4shibD.dll' Guid='{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\log4shib$(var.LogForShibFileVersion)D.dll'/>\r
+ <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>\r
</Component>\r
<Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>\r
- <File Id='NTEventLogAppenderD.dll' KeyPath='yes' \r
- Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\NTEventLogAppender.dll'/>\r
+ <File Id='NTEventLogAppenderD.dll' KeyPath='yes' Name='NTEventLogAppender.dll'/>\r
</Component>\r
</Directory><!-- lib_debug-->\r
</Directory><!-- lib -->\r
<Directory Id='doc' Name='doc'>\r
- <Directory Id='doc_shibboleth' Name='shibboleth'>\r
- <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />\r
- </Component>\r
- </Directory><!-- doc_shibboleth-->\r
+ <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />\r
+ </Component>\r
</Directory><!-- doc -->\r
</Directory><!-- shibboleth_SP -->\r
</Directory><!-- shibboleth -->\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Fragment>\r
- <DirectoryRef Id='share_xml_opensaml'\r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\' >\r
- <Component Id='schema_assertion_01' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>\r
- <File Name='cs-sstc-schema-assertion-01.xsd' KeyPath='yes' />\r
- </Component>\r
- <Component Id='schema_assertion_1_1' Guid='{71ED2BC0-50EE-48D5-9649-5F7C5A8388F3}'>\r
- <File Name='cs-sstc-schema-assertion-1.1.xsd' KeyPath='yes' />\r
- </Component>\r
- <Component Id='schema_protocol_1_1' Guid='{DD3829CB-F91A-4291-85F8-771E0930E9F1}'>\r
- <File Name="cs-sstc-schema-protocol-01.xsd" KeyPath="yes" />\r
- </Component>\r
- <Component Id='schema_protocol_01' Guid='{E0CD8123-B42F-4F15-B4B4-A4F99DE68F8E}'>\r
- <File Name='cs-sstc-schema-protocol-1.1.xsd'/>\r
- </Component>\r
- <Component Id='samlschema' Guid='{355CA6A9-57F9-491D-8D1A-33161CDE6DF1}' >\r
- <File Name='saml10-catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml10-catalog.xml.in' />\r
- <File Name='saml11-catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml11-catalog.xml.in' />\r
- <File Name='saml20-catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml20-catalog.xml.in' />\r
+ <DirectoryRef Id='TARGETDIR'>\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-opensaml\schemas\' >\r
+ <Component Id='schema_assertion_01' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>\r
+ <File Name='cs-sstc-schema-assertion-01.xsd' KeyPath='yes' />\r
+ </Component>\r
+ <Component Id='schema_assertion_1_1' Guid='{71ED2BC0-50EE-48D5-9649-5F7C5A8388F3}'>\r
+ <File Name='cs-sstc-schema-assertion-1.1.xsd' KeyPath='yes' />\r
+ </Component>\r
+ <Component Id='schema_protocol_1_1' Guid='{DD3829CB-F91A-4291-85F8-771E0930E9F1}'>\r
+ <File Name="cs-sstc-schema-protocol-01.xsd" KeyPath="yes" />\r
+ </Component>\r
+ <Component Id='schema_protocol_01' Guid='{E0CD8123-B42F-4F15-B4B4-A4F99DE68F8E}'>\r
+ <File Name='cs-sstc-schema-protocol-1.1.xsd'/>\r
+ </Component>\r
+ <Component Id='samlschema' Guid='{355CA6A9-57F9-491D-8D1A-33161CDE6DF1}' >\r
+ <File Name='saml10-catalog.xml' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml10-catalog.xml.in' />\r
+ <File Name='saml11-catalog.xml' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml11-catalog.xml.in' />\r
+ <File Name='saml20-catalog.xml' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml20-catalog.xml.in' />\r
+ <File Name='saml-schema-assertion-2.0.xsd'/>\r
+ <File Name='saml-schema-authn-context-2.0.xsd'/>\r
+ <File Id='a_c_auth_telephony2.0.xsd' \r
+ Name='saml-schema-authn-context-auth-telephony-2.0.xsd'/>\r
+ <File Id='a_c_ip2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd'/>\r
+ <File Id='a_c_ippword2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd'/>\r
+ <File Id='a_c_kerberos2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd'/>\r
+ <File Id='a_c_mobileonefactorreg2.0.xsd' \r
+ Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd'/>\r
+ <File Id='a_c_mobileonefactorunreg2.0.xsd' \r
+ Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd'/>\r
+ <File Id='a_c_mobiletwofactorreg2.0.xsd' \r
+ Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd'/>\r
+ <File Id='a_c_mobiletwofactorunreg2.0.xsd' \r
+ Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd'/>\r
+ <File Id='a_c_nomadtelephony2.0.xsd' \r
+ Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' KeyPath='yes' />\r
+ <File Id='a_c_personaltelephony2.0.xsd' \r
+ Name='saml-schema-authn-context-personal-telephony-2.0.xsd'/>\r
+ <File Id='a_c_pgp2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd'/>\r
+ <File Id='a_c_ppt2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd'/>\r
+ <File Id='a_c_pword2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd'/>\r
+ <File Id='a_c_session2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd'/>\r
+ <File Id='a_c_smartcard2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd'/>\r
+ <File Id='a_c_smartcardpki2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd'/>\r
+ <File Id='a_c_softwarepki2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd'/>\r
+ <File Id='a_c_spki2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd'/>\r
+ <File Id='a_c_srp2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd'/>\r
+ <File Id='a_c_sslcert2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd'/>\r
+ <File Id='a_c_telephony2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd'/>\r
+ <File Id='a_c_timesync2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd'/>\r
+ <File Id='a_c_types2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd'/>\r
+ <File Id='a_c_x5092.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd'/>\r
+ <File Id='a_c_xmldsig2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd'/>\r
\r
- <File Name='saml-schema-assertion-2.0.xsd'/>\r
- <File Name='saml-schema-authn-context-2.0.xsd'/>\r
- <File Id='a_c_auth_telephony2.0.xsd' Name='saml-schema-authn-context-auth-telephony-2.0.xsd'/>\r
- <File Id='a_c_ip2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd'/>\r
- <File Id='a_c_ippword2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd'/>\r
- <File Id='a_c_kerberos2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd'/>\r
- <File Id='a_c_mobileonefactorreg2.0.xsd' Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd'/>\r
- <File Id='a_c_mobileonefactorunreg2.0.xsd' Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd'/>\r
- <File Id='a_c_mobiletwofactorreg2.0.xsd' Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd'/>\r
- <File Id='a_c_mobiletwofactorunreg2.0.xsd' Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd'/>\r
- <File Id='a_c_nomadtelephony2.0.xsd' Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' KeyPath='yes' />\r
- <File Id='a_c_personaltelephony2.0.xsd' Name='saml-schema-authn-context-personal-telephony-2.0.xsd'/>\r
- <File Id='a_c_pgp2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd'/>\r
- <File Id='a_c_ppt2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd'/>\r
- <File Id='a_c_pword2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd'/>\r
- <File Id='a_c_session2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd'/>\r
- <File Id='a_c_smartcard2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd'/>\r
- <File Id='a_c_smartcardpki2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd'/>\r
- <File Id='a_c_softwarepki2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd'/>\r
- <File Id='a_c_spki2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd'/>\r
- <File Id='a_c_srp2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd'/>\r
- <File Id='a_c_sslcert2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd'/>\r
- <File Id='a_c_telephony2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd'/>\r
- <File Id='a_c_timesync2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd'/>\r
- <File Id='a_c_types2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd'/>\r
- <File Id='a_c_x5092.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd'/>\r
- <File Id='a_c_xmldsig2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd'/>\r
+ <File Name='saml-schema-dce-2.0.xsd'/>\r
+ <File Name='saml-schema-ecp-2.0.xsd'/>\r
+ <File Name='saml-schema-metadata-2.0.xsd'/>\r
+ <File Name='saml-schema-protocol-2.0.xsd'/>\r
+ <File Name='saml-schema-x500-2.0.xsd'/>\r
+ <File Name='saml-schema-xacml-2.0.xsd'/>\r
\r
- <File Name='saml-schema-dce-2.0.xsd'/>\r
- <File Name='saml-schema-ecp-2.0.xsd'/>\r
- <File Name='saml-schema-metadata-2.0.xsd'/>\r
- <File Name='saml-schema-protocol-2.0.xsd'/>\r
- <File Name='saml-schema-x500-2.0.xsd'/>\r
- <File Name='saml-schema-xacml-2.0.xsd'/>\r
-\r
- <File Name='sstc-metadata-attr.xsd'/>\r
- <File Name='sstc-request-initiation.xsd'/>\r
- <File Name='sstc-saml1x-metadata.xsd'/>\r
- <File Name='sstc-saml-attribute-ext.xsd'/>\r
- <File Name='sstc-saml-delegation.xsd'/>\r
- <File Name='sstc-saml-idp-discovery.xsd' />\r
- <File Id='metadata_algsupportv1.0' Name='sstc-saml-metadata-algsupport-v1.0.xsd'/>\r
- <File Name='sstc-saml-metadata-ext-query.xsd'/>\r
- <File Name='sstc-saml-metadata-ui-v1.0.xsd'/>\r
- <File Id='protoco_ext_thirdpaty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd'/>\r
- </Component>\r
- </DirectoryRef>\r
+ <File Name='sstc-metadata-attr.xsd'/>\r
+ <File Name='sstc-request-initiation.xsd'/>\r
+ <File Name='sstc-saml1x-metadata.xsd'/>\r
+ <File Name='sstc-saml-attribute-ext.xsd'/>\r
+ <File Name='sstc-saml-delegation.xsd'/>\r
+ <File Name='sstc-saml-idp-discovery.xsd' />\r
+ <File Id='metadata_algsupportv1.0' Name='sstc-saml-metadata-algsupport-v1.0.xsd'/>\r
+ <File Name='sstc-saml-metadata-ext-query.xsd'/>\r
+ <File Name='sstc-saml-metadata-ui-v1.0.xsd'/>\r
+ <File Id='protoco_ext_thirdpaty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd'/>\r
+ </Component>\r
+ </Directory><!--common_doc-->\r
+ </Directory><!--common_sp-->\r
+ </Directory><!--common_shibboleth-->\r
+ </Directory><!--CommonAppDataFolder-->\r
+ </DirectoryRef><!--TargetDir-->\r
</Fragment>\r
</Wix>\r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define OpenSAMLVersion='2.4.3' ?> \r
+<?define OpenSAMLFileVersion='2_4' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='OpenSAMLMergeModule_x64' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
+ <Package Id='{C4A8AAF1-D263-4361-9695-CE0F56B5D3C6}' Description='Merge Module for OpenSAML (x64)'\r
+ Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign and Schema'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_SP' Name='SP'>\r
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\x64\Release\' >\r
+ <Component Id='saml2_0.dll' Guid='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' Win64='yes'>\r
+ <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='samlsign.exe' Guid='{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}' Win64='yes'>\r
+ <File KeyPath='yes' Name='samlsign.exe' />\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\x64\Debug\'>\r
+ <Component Id='saml2_0D.dll' Guid='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' Win64='yes'>\r
+ <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='samlsign.exe_Debug' Guid='{A6588914-93E1-4FAF-B237-39C0240EECB1}' Win64='yes'>\r
+ <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ </Directory><!-- shibboleth_SP -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ <ComponentRef Id='schema_assertion_01'/>\r
+ <ComponentRef Id='schema_assertion_1_1'/>\r
+ <ComponentRef Id='schema_protocol_01'/>\r
+ <ComponentRef Id='schema_protocol_1_1'/>\r
+ <ComponentRef Id='samlschema' />\r
+ </Module>\r
+</Wix>\r
+\r
+ \r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define OpenSAMLVersion='2.4.3' ?> \r
+<?define OpenSAMLFileVersion='2_4' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='OpenSAMLMergeModule_x86' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
+ <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML'\r
+ Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign and Schema'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+\r
+ <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
+ At a a later date, we may chose to make this a placed module -->\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_SP' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+\r
+ <Component Id='saml2_0.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\saml$(var.OpenSAMLFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\samlsign.exe' />\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='saml2_0D.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\saml$(var.OpenSAMLFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='samlsign.exe_Debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>\r
+ <File Id='samlsign.exe_Debug' KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\samlsign.exe' />\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ <Directory Id='share' Name='share'>\r
+ <Directory Id='share_xml' Name='xml'>\r
+ <Directory Id='share_xml_opensaml' Name='opensaml' />\r
+ </Directory><!-- xml-->\r
+ </Directory><!-- share -->\r
+ </Directory><!-- shibboleth_SP -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ <ComponentRef Id='schema_assertion_01'/>\r
+ <ComponentRef Id='schema_assertion_1_1'/>\r
+ <ComponentRef Id='schema_protocol_01'/>\r
+ <ComponentRef Id='schema_protocol_1_1'/>\r
+ <ComponentRef Id='samlschema' />\r
+ </Module>\r
+</Wix>\r
+\r
+ \r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Module Id='OpenSAMLMergeModule_x86' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
- <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML'\r
+ <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML (x86)'\r
Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign and Schema'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
-\r
- <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
- At a a later date, we may chose to make this a placed module -->\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\r
\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
<Directory Id='shibboleth' Name='Shibboleth'>\r
<Directory Id='shibboleth_SP' Name='SP'>\r
- <Directory Id='lib' Name='lib'>\r
-\r
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\'>\r
<Component Id='saml2_0.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>\r
- <File KeyPath='yes'\r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\saml$(var.OpenSAMLFileVersion).dll' />\r
+ <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
</Component>\r
<Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>\r
- <File KeyPath='yes'\r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\samlsign.exe' />\r
+ <File KeyPath='yes' Name='samlsign.exe' />\r
</Component>\r
- <Directory Id='lib_debug' Name='debug'>\r
+ <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug'>\r
<Component Id='saml2_0D.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>\r
- <File KeyPath='yes'\r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\saml$(var.OpenSAMLFileVersion)D.dll' />\r
+ <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
</Component>\r
<Component Id='samlsign.exe_Debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>\r
- <File Id='samlsign.exe_Debug' KeyPath='yes'\r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\samlsign.exe' />\r
+ <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />\r
</Component>\r
</Directory><!-- lib_debug-->\r
</Directory><!-- lib -->\r
- <Directory Id='share' Name='share'>\r
- <Directory Id='share_xml' Name='xml'>\r
- <Directory Id='share_xml_opensaml' Name='opensaml' />\r
- </Directory><!-- xml-->\r
- </Directory><!-- share -->\r
</Directory><!-- shibboleth_SP -->\r
</Directory><!-- shibboleth -->\r
</Directory><!-- ProgramFilesFolder -->\r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->\r
+<?define OpenSSLDirVersion='1.0.0a' ?>\r
+<?define OpenSSLFileVersion='1_0_0' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>\r
+ <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL'\r
+ Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+\r
+ <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
+ At a a later date, we may chose to make this a placed module -->\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+ <Component Id='libeay32.dll' Guid='{F1C1CE98-D583-44A3-B30E-8F1998C833EC}' Win64='Yes'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\libeay32_$(var.OpenSSLFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='ssleay32.dll' Guid='{649A8C33-1F00-40BD-BBA4-0D8FD7C258CD'} Win64='Yes'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\ssleay32_$(var.OpenSSLFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='Yes'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\openssl.exe' />\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='libeay32.dll_debug' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='Yes'>\r
+ <File Id='libeay32.dll_debug' KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='ssleay32.dll_debug' Guid='{52C30BD0-3769-4021-85F7-4AE539DCED41}' Win64='Yes'>\r
+ <File Id='ssleay32.dll_debug' KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='openssl.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='Yes'>\r
+ <File Id='openssl.exe_debug'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\openssl.exe' />\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ <Directory Id='doc' Name='doc'>\r
+ <Directory Id='doc_shibboleth' Name='shibboleth'>\r
+ <Component Id='OPENSSL.LICENSE' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='Yes'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />\r
+ </Component>\r
+ </Directory><!-- doc_shibboleth-->\r
+ </Directory><!-- doc -->\r
+ </Directory><!-- shibboleth_sp -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix> \r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->\r
+<?define OpenSSLDirVersion='1.0.0a' ?>\r
+<?define OpenSSLFileVersion='1_0_0' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='OpenSSLMergeModule_x64' Language='1033' Version='$(var.OpenSSLVersion)'>\r
+ <Package Id='{EEB21422-347C-4AFA-A347-DCA0E5D61572}' Description='Merge Module for OpenSSL (x64)'\r
+ Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x64'/>\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFiles64Folder' >\r
+ <Directory Id='shibboleth64' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp64' Name='SP'>\r
+ <Directory Id='lib64' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\' >\r
+ <Component Id='libeay64.dll' Guid='{49ED7AFD-EB3D-4296-84BC-E40C0E40DE5D}' Win64='yes'>\r
+ <File KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='ssleay64.dll' Guid='{649A8C33-1F00-40BD-BBA4-0D8FD7C258CD}' Win64='yes'>\r
+ <File KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='openssl64.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>\r
+ <File KeyPath='yes' Name='openssl.exe' />\r
+ </Component>\r
+ <Directory Id='lib_debug64' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'>\r
+ <Component Id='libeay64.dll_debug' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='yes'>\r
+ <File Id='libeay64.dll_debug' KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='ssleay64.dll_debug' Guid='{52C30BD0-3769-4021-85F7-4AE539DCED41}' Win64='yes'>\r
+ <File Id='ssleay64.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='openssl64.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='yes'>\r
+ <File Id='openssl64.exe_debug' Name='openssl.exe' />\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ <Directory Id='doc64' Name='doc'>\r
+ <Component Id='OPENSSL.LICENSE_64' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='yes'>\r
+ <File KeyPath='yes' Id='OPENSSL.LICENSE_64'\r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />\r
+ </Component>\r
+ </Directory><!-- doc -->\r
+ </Directory><!-- shibboleth_sp -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory>\r
+ </Module>\r
+</Wix> \r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->\r
+<?define OpenSSLDirVersion='1.0.0a' ?>\r
+<?define OpenSSLFileVersion='1_0_0' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>\r
+ <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL'\r
+ Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+\r
+ <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
+ At a a later date, we may chose to make this a placed module -->\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+ <Component Id='libeay32.dll' Guid='{F1C1CE98-D583-44A3-B30E-8F1998C833EC}' Win64='Yes'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\libeay32_$(var.OpenSSLFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='ssleay32.dll' Guid='{649A8C33-1F00-40BD-BBA4-0D8FD7C258CD'} Win64='Yes'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\ssleay32_$(var.OpenSSLFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='Yes'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\openssl.exe' />\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='libeay32.dll_debug' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='Yes'>\r
+ <File Id='libeay32.dll_debug' KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='ssleay32.dll_debug' Guid='{52C30BD0-3769-4021-85F7-4AE539DCED41}' Win64='Yes'>\r
+ <File Id='ssleay32.dll_debug' KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='openssl.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='Yes'>\r
+ <File Id='openssl.exe_debug'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\openssl.exe' />\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ <Directory Id='doc' Name='doc'>\r
+ <Directory Id='doc_shibboleth' Name='shibboleth'>\r
+ <Component Id='OPENSSL.LICENSE' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='Yes'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />\r
+ </Component>\r
+ </Directory><!-- doc_shibboleth-->\r
+ </Directory><!-- doc -->\r
+ </Directory><!-- shibboleth_sp -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix> \r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->\r
+<?define OpenSSLDirVersion='1.0.0a' ?>\r
+<?define OpenSSLFileVersion='1_0_0' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>\r
+ <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL'\r
+ Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+\r
+ <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
+ At a a later date, we may chose to make this a placed module -->\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+ <Component Id='libeay32.dll' Guid='{38378D46-4CF2-4DE5-A30D-79F92AD6DD06}'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\libeay32_$(var.OpenSSLFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='ssleay32.dll' Guid='{9C1CAE5E-F8E9-4EBA-961B-1DD149097702}'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\ssleay32_$(var.OpenSSLFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\openssl.exe' />\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='libeay32.dll_debug' Guid='{86C4099A-1E75-4676-8F6D-BF5748F657B6}'>\r
+ <File Id='libeay32.dll_debug' KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='ssleay32.dll_debug' Guid='{2097A37D-650E-45F4-96C0-94C748DEA49C}'>\r
+ <File Id='ssleay32.dll_debug' KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>\r
+ <File Id='openssl.exe_debug'\r
+ Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\openssl.exe' />\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ <Directory Id='doc' Name='doc'>\r
+ <Directory Id='doc_shibboleth' Name='shibboleth'>\r
+ <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />\r
+ </Component>\r
+ </Directory><!-- doc_shibboleth-->\r
+ </Directory><!-- doc -->\r
+ </Directory><!-- shibboleth_sp -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix> \r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>\r
- <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL'\r
+ <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL (x86)'\r
Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'\r
Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
-\r
- <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
- At a a later date, we may chose to make this a placed module -->\r
-\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
<Directory Id='shibboleth' Name='Shibboleth'>\r
<Directory Id='shibboleth_sp' Name='SP'>\r
- <Directory Id='lib' Name='lib'>\r
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\'>\r
<Component Id='libeay32.dll' Guid='{38378D46-4CF2-4DE5-A30D-79F92AD6DD06}'>\r
- <File KeyPath='yes'\r
- Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\libeay32_$(var.OpenSSLFileVersion).dll' />\r
+ <File KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
</Component>\r
<Component Id='ssleay32.dll' Guid='{9C1CAE5E-F8E9-4EBA-961B-1DD149097702}'>\r
- <File KeyPath='yes'\r
- Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\ssleay32_$(var.OpenSSLFileVersion).dll' />\r
+ <File KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\r
</Component>\r
<Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>\r
- <File KeyPath='yes'\r
- Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\openssl.exe' />\r
+ <File KeyPath='yes' Name='openssl.exe' />\r
</Component>\r
- <Directory Id='lib_debug' Name='debug'>\r
+ <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\' >\r
<Component Id='libeay32.dll_debug' Guid='{86C4099A-1E75-4676-8F6D-BF5748F657B6}'>\r
- <File Id='libeay32.dll_debug' KeyPath='yes'\r
- Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ <File Id='libeay32.dll_debug' KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
</Component>\r
<Component Id='ssleay32.dll_debug' Guid='{2097A37D-650E-45F4-96C0-94C748DEA49C}'>\r
- <File Id='ssleay32.dll_debug' KeyPath='yes'\r
- Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ <File Id='ssleay32.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
</Component>\r
<Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>\r
- <File Id='openssl.exe_debug'\r
- Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\openssl.exe' />\r
+ <File Id='openssl.exe_debug' Name='openssl.exe' />\r
</Component>\r
</Directory><!-- lib_debug-->\r
</Directory><!-- lib -->\r
<Directory Id='doc' Name='doc'>\r
- <Directory Id='doc_shibboleth' Name='shibboleth'>\r
- <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />\r
- </Component>\r
- </Directory><!-- doc_shibboleth-->\r
+ <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>\r
+ <File KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />\r
+ </Component>\r
</Directory><!-- doc -->\r
</Directory><!-- shibboleth_sp -->\r
</Directory><!-- shibboleth -->\r
--- /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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define ShibbolethSPFileVersion='1_4' ?>\r
+<?define ShibbolethVersion='1.4.2' ?>\r
+\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethVersion)'>\r
+ <Package Id='{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}' Description='Merge Module for Shibboleth DLLs (x64)'\r
+ Comments='This module is built by the Shibboleth Consortium.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib' \r
+ FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release'>\r
+ <Component Id='shibsplite.dll' Guid='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' Win64='yes'>\r
+ <File Name='shibsp-lite$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />\r
+ </Component>\r
+ <Component Id='shibsp.dll' Guid='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' Win64='yes'>\r
+ <File Name='shibsp$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug' \r
+ FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >\r
+ <Component Id='shibspliteD.dll' Guid='{5EF6FF17-0510-484B-9F24-523B29EB416C}' Win64='yes'>\r
+ <File Name='shibsp-lite$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />\r
+ </Component>\r
+ <Component Id='shibspD.dll' Guid='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' Win64='yes'>\r
+ <File Name='shibsp$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />\r
+ </Component>\r
+ </Directory><!-- lib_debug -->\r
+ </Directory><!-- lib -->\r
+ <Directory Id='doc' Name='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>\r
+ <Component Id='doc_shibboleth' Guid='{F858AC39-4C24-4255-A86E-4747FE45624E}' Win64='yes'>\r
+ <File Name='CREDITS.txt' KeyPath='yes'/>\r
+ <File Name='LICENSE.txt' />\r
+ <File Name='NOTICE.txt' />\r
+ <File Name='README.txt'/>\r
+ <File Name='RELEASE.txt' />\r
+ </Component>\r
+ </Directory><!-- doc -->\r
+ </Directory><!-- shibboleth_sp -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix>\r
+\r
+ \r
--- /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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define ShibbolethSPFileVersion='1_4' ?>\r
+<?define ShibbolethVersion='1.4.2' ?>\r
+\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethVersion)'>\r
+ <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs'\r
+ Comments='This module is built by the Shibboleth Consortium.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib' \r
+ FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release'>\r
+ <Component Id="shibsplite.dll" Guid="{10475E33-434D-4805-B983-195092549BED}">\r
+ <File Name="shibsp-lite$(var.ShibbolethSPFileVersion).dll" KeyPath="yes" />\r
+ </Component>\r
+ <Component Id="shibsp.dll" Guid="{9DE384BF-C286-4A72-AED9-AA34384005C0}">\r
+ <File Name="shibsp$(var.ShibbolethSPFileVersion).dll" KeyPath="yes" />\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug' \r
+ FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >\r
+ <Component Id="shibspliteD.dll" Guid="{8E070220-2992-4D45-BF98-459022CD268F}">\r
+ <File Name="shibsp-lite$(var.ShibbolethSPFileVersion)D.dll" KeyPath="yes" />\r
+ </Component>\r
+ <Component Id="shibspD.dll" Guid="{4196D799-1162-4D62-9F7A-1F59E90F19F1}">\r
+ <File Name="shibsp$(var.ShibbolethSPFileVersion)D.dll" KeyPath="yes" />\r
+ </Component>\r
+ </Directory><!-- lib_debug -->\r
+ </Directory><!-- lib -->\r
+ <Directory Id='doc' Name='doc'>\r
+ <Component Id='doc_shibboleth' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>\r
+ <File Name='CREDITS.txt' KeyPath='yes'/>\r
+ <File Name='LICENSE.txt' />\r
+ <File Name='NOTICE.txt' />\r
+ <File Name='README.txt'/>\r
+ <File Name='RELEASE.txt' />\r
+ </Component>\r
+ </Directory><!-- doc --> </Directory><!-- shibboleth_sp -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix>\r
+\r
+ \r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethVersion)'>\r
- <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs'\r
+ <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs (x86)'\r
Comments='This module is built by the Shibboleth Consortium.'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\r
\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
<Directory Id='shibboleth_sp' Name='SP'>\r
<Directory Id='lib' Name='lib' \r
FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release'>\r
- <Component Id="shibsplite.dll" Guid="{10475E33-434D-4805-B983-195092549BED}">\r
- <File Name="shibsp-lite$(var.ShibbolethSPFileVersion).dll" KeyPath="yes" />\r
+ <Component Id='shibsplite.dll' Guid='{10475E33-434D-4805-B983-195092549BED}'>\r
+ <File Name='shibsp-lite$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />\r
</Component>\r
- <Component Id="shibsp.dll" Guid="{9DE384BF-C286-4A72-AED9-AA34384005C0}">\r
- <File Name="shibsp$(var.ShibbolethSPFileVersion).dll" KeyPath="yes" />\r
+ <Component Id='shibsp.dll' Guid='{9DE384BF-C286-4A72-AED9-AA34384005C0}'>\r
+ <File Name='shibsp$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />\r
</Component>\r
<Directory Id='lib_debug' Name='debug' \r
FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >\r
- <Component Id="shibspliteD.dll" Guid="{8E070220-2992-4D45-BF98-459022CD268F}">\r
- <File Name="shibsp-lite$(var.ShibbolethSPFileVersion)D.dll" KeyPath="yes" />\r
+ <Component Id='shibspliteD.dll' Guid='{8E070220-2992-4D45-BF98-459022CD268F}'>\r
+ <File Name='shibsp-lite$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />\r
</Component>\r
- <Component Id="shibspD.dll" Guid="{4196D799-1162-4D62-9F7A-1F59E90F19F1}">\r
- <File Name="shibsp$(var.ShibbolethSPFileVersion)D.dll" KeyPath="yes" />\r
+ <Component Id='shibspD.dll' Guid='{4196D799-1162-4D62-9F7A-1F59E90F19F1}'>\r
+ <File Name='shibsp$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />\r
</Component>\r
</Directory><!-- lib_debug -->\r
</Directory><!-- lib -->\r
- </Directory><!-- shibboleth_sp -->\r
+ <Directory Id='doc' Name='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>\r
+ <Component Id='doc_shibboleth' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>\r
+ <File Name='CREDITS.txt' KeyPath='yes'/>\r
+ <File Name='LICENSE.txt' />\r
+ <File Name='NOTICE.txt' />\r
+ <File Name='README.txt'/>\r
+ <File Name='RELEASE.txt' />\r
+ </Component>\r
+ </Directory><!-- doc --> </Directory><!-- shibboleth_sp -->\r
</Directory><!-- shibboleth -->\r
</Directory><!-- ProgramFilesFolder -->\r
</Directory><!-- TARGETDIR -->\r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define XercesVersion='3.1.1' ?>\r
+<?define XercesFileVersion='3_1' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>\r
+ <Package Id='{72CA15B1-CEB8-4C9B-A5CB-5254759E4B3A}' Description='Merge Module for Xerces (x64)'\r
+ Comments='This module is built by the Shibboleth Consortium.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+ <Component Id='xercesc.dll' Guid='{5C2BA2C6-36EC-4EB3-A343-8C1C9D499B9C}' Win64='yes'>\r
+ <File Id='xercesc.dll' KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='xercescD.dll' Guid='{236B6A7F-73C0-4EBF-9C06-90C1BE160ACE}' Win64='yes'>\r
+ <File Id='xercescd.dll' KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ </Directory><!-- shibboleth_SP -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix>\r
+\r
+ \r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define XercesVersion='3.1.1' ?>\r
+<?define XercesFileVersion='3_1' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>\r
+ <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces'\r
+ Comments='This module is built by the Shibboleth Consortium.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+\r
+ <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
+ At a a later date, we may chose to make this a placed module -->\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+ <Component Id='xercesc.dll' Guid='{64C16FA9-685C-4612-B9C2-0B56C84A69E1}'>\r
+ <File Id='xercesc.dll' KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='xercescD.dll' Guid='{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}'>\r
+ <File Id='xercescd.dll' KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ </Directory><!-- shibboleth_SP -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix>\r
+\r
+ \r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>\r
- <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces'\r
+ <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces (x86)'\r
Comments='This module is built by the Shibboleth Consortium.'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
-\r
- <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
- At a a later date, we may chose to make this a placed module -->\r
-\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
<Directory Id='shibboleth' Name='Shibboleth'>\r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define XmlSecVersion='1.6.0' ?> <!-- 1.0.0a -->\r
+<?define XmlSecFileVersion='1_6' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='XmlSecmergemodule_x64' Language='1033' Version='$(var.XmlSecVersion)'>\r
+ <Package Id='{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}' Description='Merge Module for XmlSec (x64)'\r
+ Comments='This module is built by the Shibboleth Consortium. Includes Several excutables.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\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
+ <!-- GUID taken from 2.4.3 installer -->\r
+ <Component Id='xsec_1_4_0.dll' Guid='{3EB5B168-1FB1-476D-8E7C-2469D9B55162}' Win64='yes'>\r
+ <File KeyPath='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' Name='c14n.exe'/>\r
+ </Component>\r
+ <Component Id='checksig.exe' Guid='{D2145F4D-95FA-4A24-B06C-D37AF36ADDD2}' Win64='yes'>\r
+ <File KeyPath='yes' Name='checksig.exe'/>\r
+ </Component>\r
+ <Component Id='cipher.exe' Guid='{192AEEF7-3AE2-4570-AA30-1A2046646A84}' Win64='yes'>\r
+ <File KeyPath='yes' Name='cipher.exe'/>\r
+ </Component>\r
+ <Component Id='siginf.exe' Guid='{7C15D545-DDB9-4D02-AE9C-4C9E0229FC72}' Win64='yes'>\r
+ <File KeyPath='yes' Name='siginf.exe'/>\r
+ </Component>\r
+ <Component Id='templatesign.exe' Guid='{71B603E6-A54B-4843-A4F8-826AD4CA6A04}' Win64='yes'>\r
+ <File KeyPath='yes' Name='templatesign.exe'/>\r
+ </Component>\r
+ <Component Id='txfmout.exe' Guid='{2D9025EE-D95F-4D3C-B0E7-86D742749D39}' Win64='yes'>\r
+ <File KeyPath='yes' Name='txfmout.exe'/>\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='xsec_1_4_0D.dll' Guid='{EC1CCD0D-028D-4C92-846D-88C1C24B66E6}' Win64='yes'>\r
+ <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
+ </Component>\r
+ <Component Id='c14n.exe2' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>\r
+ <File Id='c14n.exe_debug' KeyPath='yes' Name='c14n.exe'/>\r
+ </Component>\r
+ <Component Id='checksig.exe6' Guid='{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}' Win64='yes'>\r
+ <File Id='checksig.exe_debug' KeyPath='yes' Name='checksig.exe'/>\r
+ </Component>\r
+ <Component Id='cipher.exe4' Guid='{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}' Win64='yes'>\r
+ <File Id='cipher.exe_debug' KeyPath='yes' Name='cipher.exe'/>\r
+ </Component>\r
+ <Component Id='siginf.exe5' Guid='{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}' Win64='yes'>\r
+ <File Id='siginf.exe_debug' KeyPath='yes' Name='siginf.exe'/>\r
+ </Component>\r
+ <Component Id='templatesign.exe3' Guid='{5AE22CDB-625E-4DC7-9586-77C3DD835100}' Win64='yes'>\r
+ <File Id='templatesign.exe_debug' KeyPath='yes' Name='templatesign.exe'/>\r
+ </Component>\r
+ <Component Id='txfmout.exe1' Guid='{373B4E3D-6643-4884-8D0C-324DEF910230}' Win64='yes'>\r
+ <File Id='txfmout.exe_debug' KeyPath='yes' Name='txfmout.exe'/>\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ </Directory><!-- shibboleth_sp -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix> \r
+\r
+ \r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Module Id='XmlSecMergeModule_x86' Language='1033' Version='$(var.XmlSecVersion)'>\r
- <Package Id='{D1678DAE-81D9-4756-ABE6-7D1218F0D350}' Description='Merge Module for XmlSec'\r
+ <Package Id='{D1678DAE-81D9-4756-ABE6-7D1218F0D350}' Description='Merge Module for XmlSec (x64)'\r
Comments='This module is built by the Shibboleth Consortium. Includes Several excutables.'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
-\r
- <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
- At a a later date, we may chose to make this a placed module -->\r
-\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
<Directory Id='shibboleth' Name='Shibboleth'>\r
<Directory Id='shibboleth_SP' Name='SP'>\r
- <Directory Id='lib' Name='lib'>\r
+ <Directory Id='lib' Name='lib' \r
+ FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan'>\r
<!-- GUID taken from 2.4.3 installer -->\r
<Component Id='xsec_1_4_0.dll' Guid='{8920023D-92CA-4012-8BF8-6D80D791375D}'>\r
- <File KeyPath='yes'\r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\xsec_$(var.XmlSecFileVersion).dll'/>\r
+ <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\r
</Component>\r
<Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\c14n.exe'/>\r
+ <File KeyPath='yes' Name='c14n.exe'/>\r
</Component>\r
<Component Id='checksig.exe' Guid='{F0C2B97A-7B93-4CD3-9432-E5904D337815}'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\checksig.exe'/>\r
+ <File KeyPath='yes' Name='checksig.exe'/>\r
</Component>\r
<Component Id='cipher.exe' Guid='{654BB761-7B9D-4766-AC5F-DC174E7B94AE}'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\cipher.exe'/>\r
+ <File KeyPath='yes' Name='cipher.exe'/>\r
</Component>\r
<Component Id='siginf.exe' Guid='{1B278BD9-6507-4613-9315-8D47CAEBC3D8}'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\siginf.exe'/>\r
+ <File KeyPath='yes' Name='siginf.exe'/>\r
</Component>\r
<Component Id='templatesign.exe' Guid='{A24CD56C-F615-406E-B4E2-4AC5EAE99206}'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\templatesign.exe'/>\r
+ <File KeyPath='yes' Name='templatesign.exe'/>\r
</Component>\r
<Component Id='txfmout.exe' Guid='{667DD190-335B-4AB7-BBA5-25B5F847F363}'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\txfmout.exe'/>\r
+ <File KeyPath='yes' Name='txfmout.exe'/>\r
</Component>\r
- <Directory Id='lib_debug' Name='debug'>\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='xsec_1_4_0D.dll' Guid='{9FF121C0-9C75-428E-A8A2-5DD0F499CA73}'>\r
- <File KeyPath='yes'\r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\xsec_$(var.XmlSecFileVersion)D.dll'/>\r
+ <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
</Component>\r
<Component Id='c14n.exe2' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>\r
- <File Id='c14n.exe_debug' KeyPath='yes'\r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\c14n.exe'/>\r
+ <File Id='c14n.exe_debug' KeyPath='yes' Name='c14n.exe'/>\r
</Component>\r
<Component Id='checksig.exe6' Guid='{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}'>\r
- <File Id='checksig.exe_debug' KeyPath='yes'\r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\checksig.exe'/>\r
+ <File Id='checksig.exe_debug' KeyPath='yes' Name='checksig.exe'/>\r
</Component>\r
<Component Id='cipher.exe4' Guid='{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}'>\r
- <File Id='cipher.exe_debug' KeyPath='yes'\r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\cipher.exe'/>\r
+ <File Id='cipher.exe_debug' KeyPath='yes' Name='cipher.exe'/>\r
</Component>\r
<Component Id='siginf.exe5' Guid='{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}'>\r
- <File Id='siginf.exe_debug' KeyPath='yes'\r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\siginf.exe'/>\r
+ <File Id='siginf.exe_debug' KeyPath='yes' Name='siginf.exe'/>\r
</Component>\r
<Component Id='templatesign.exe3' Guid='{5E8264B4-D759-4502-B989-5A5C56FBD875}'>\r
- <File Id='templatesign.exe_debug' KeyPath='yes'\r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\templatesign.exe'/>\r
+ <File Id='templatesign.exe_debug' KeyPath='yes' Name='templatesign.exe'/>\r
</Component>\r
<Component Id='txfmout.exe1' Guid='{FCBFBCAA-5C39-470A-BD58-E558C384898D}'>\r
- <File Id='txfmout.exe_debug' KeyPath='yes'\r
- Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\txfmout.exe'/>\r
+ <File Id='txfmout.exe_debug' KeyPath='yes' Name='txfmout.exe'/>\r
</Component>\r
</Directory><!-- lib_debug-->\r
</Directory><!-- lib -->\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Fragment>\r
- <DirectoryRef Id='share_xml_xmltooling'\r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\' >\r
-\r
- <Component Id='xmltoolingschema' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>\r
- <File Name='xenc-schema.xsd'/>\r
- <File Name='xmldsig-core-schema.xsd' />\r
- <File Name='soap-envelope.xsd' />\r
- <File Name='xml.xsd' />\r
- <File Name='xmltooling.xsd' />\r
- <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\catalog.xml.in' />\r
- <File Name='xmldsig11-schema.xsd' />\r
- </Component>\r
- </DirectoryRef>\r
+ <DirectoryRef Id='TARGETDIR'>\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-xmltooling\schemas\' >\r
+ <Component Id='xmltoolingschema' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>\r
+ <File Name='xenc-schema.xsd'/>\r
+ <File Name='xmldsig-core-schema.xsd' />\r
+ <File Name='soap-envelope.xsd' />\r
+ <File Name='xml.xsd' />\r
+ <File Name='xmltooling.xsd' />\r
+ <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\catalog.xml.in' />\r
+ <File Name='xmldsig11-schema.xsd' />\r
+ </Component>\r
+ </Directory><!--common_doc-->\r
+ </Directory><!--common_sp-->\r
+ </Directory><!--common_shibboleth-->\r
+ </Directory><!--CommonAppDataFolder-->\r
+ </DirectoryRef><!--TargetDir-->\r
</Fragment>\r
</Wix>\r
--- /dev/null
+<?xml version='1.0' encoding='utf-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define XmlToolingVersion='1.4.2' ?> \r
+<?define XmlToolingFileVersion='1_4' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='XmlToolingMergeModule_x64' Language='1033' Version='$(var.XmlToolingVersion)'>\r
+ <Package Id='{F944F719-7138-484D-A5B3-753411741B40}' Description='Merge Module for XMLTooling (x64)'\r
+ Comments='This module is built by the Shibboleth Consortium. Includes DDLs and Schema'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+\r
+ <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
+ At a a later date, we may chose to make this a placed module -->\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\x64\Release'>\r
+ <Component Id='xmltooling.dll' Guid='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' Win64='yes'>\r
+ <File Id='xmltooling.dll' Name='xmltooling$(var.XmlToolingFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='xmltoolinglite.dll' Guid='{060F61B9-36E9-4F33-9B5B-C59A43709052}' Win64='yes'>\r
+ <File Id='xmltoolinglite.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug' \r
+ FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\x64\Debug'>\r
+ <Component Id='xmltoolingD.dll' Guid='{C380627F-9D45-4626-A249-3831FC7C83FC}' Win64='yes'>\r
+ <File Id='xmltoolingD.dll' Name='xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='xmltoolingliteD.dll' Guid='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' Win64='yes'>\r
+ <File Id='xmltoolingliteD.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ </Directory><!-- shibboleth_sp -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFiles -->\r
+ </Directory><!-- TARGETDIR -->\r
+ <ComponentRef Id='xmltoolingschema'/>\r
+ </Module>\r
+</Wix>\r
--- /dev/null
+<?xml version='1.0' encoding='utf-8'?>\r
+\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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define XmlToolingVersion='1.4.2' ?> \r
+<?define XmlToolingFileVersion='1_4' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='XmlToolingMergeModule_x86' Language='1033' Version='$(var.XmlToolingVersion)'>\r
+ <Package Id='{29A047F2-DECA-45A7-97D8-801217B3C632}' Description='Merge Module for XMLTooling'\r
+ Comments='This module is built by the Shibboleth Consortium. Includes DDLs and Schema'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+\r
+ <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
+ At a a later date, we may chose to make this a placed module -->\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+ <Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>\r
+ <File Id='xmltooling.dll'\r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>\r
+ <File Id='xmltoolinglite.dll'\r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>\r
+ <File Id='xmltoolingD.dll'\r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>\r
+ <File Id='xmltoolingliteD.dll'\r
+ Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ <Directory Id='share' Name='share'>\r
+ <Directory Id='share_xml' Name='xml'>\r
+ <Directory Id='share_xml_xmltooling' Name='xmltooling' />\r
+ </Directory><!-- xml-->\r
+ </Directory><!-- share -->\r
+ </Directory><!-- shibboleth_sp -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFiles -->\r
+ </Directory><!-- TARGETDIR -->\r
+ <ComponentRef Id='xmltoolingschema'/>\r
+ </Module>\r
+</Wix>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Module Id='XmlToolingMergeModule_x86' Language='1033' Version='$(var.XmlToolingVersion)'>\r
- <Package Id='{29A047F2-DECA-45A7-97D8-801217B3C632}' Description='Merge Module for XMLTooling'\r
+ <Package Id='{29A047F2-DECA-45A7-97D8-801217B3C632}' Description='Merge Module for XMLTooling (x86)'\r
Comments='This module is built by the Shibboleth Consortium. Includes DDLs and Schema'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
-\r
- <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
- At a a later date, we may chose to make this a placed module -->\r
-\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
<Directory Id='shibboleth' Name='Shibboleth'>\r
<Directory Id='shibboleth_sp' Name='SP'>\r
- <Directory Id='lib' Name='lib'>\r
+ <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release'>\r
<Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>\r
- <File Id='xmltooling.dll'\r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
+ <File Id='xmltooling.dll' Name='xmltooling$(var.XmlToolingFileVersion).dll' />\r
</Component>\r
<Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>\r
- <File Id='xmltoolinglite.dll'\r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
+ <File Id='xmltoolinglite.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
</Component>\r
- <Directory Id='lib_debug' Name='debug'>\r
+ <Directory Id='lib_debug' Name='debug' \r
+ FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug'>\r
<Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>\r
- <File Id='xmltoolingD.dll'\r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
+ <File Id='xmltoolingD.dll' Name='xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
</Component>\r
<Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>\r
- <File Id='xmltoolingliteD.dll'\r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
+ <File Id='xmltoolingliteD.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
</Component>\r
</Directory><!-- lib_debug-->\r
</Directory><!-- lib -->\r
- <Directory Id='share' Name='share'>\r
- <Directory Id='share_xml' Name='xml'>\r
- <Directory Id='share_xml_xmltooling' Name='xmltooling' />\r
- </Directory><!-- xml-->\r
- </Directory><!-- share -->\r
</Directory><!-- shibboleth_sp -->\r
</Directory><!-- shibboleth -->\r
</Directory><!-- ProgramFiles -->\r
--- /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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define ZlibVersion='1.2.5' ?>\r
+<?define ZlibFileVersion='1' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>\r
+ <Package Id='{68821F70-8952-4778-8149-85A93E4BF426}' Description='Merge Module for Zlib (x64)'\r
+ Comments='This module is built by the Shibboleth Consortium.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x64'/>\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+ <Component Id='zlib1.dll' Guid='{792D44C3-3DCE-465D-AAFF-520AB2F20DA2}' Win64='yes'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'/>\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='zlib1d.dll' Guid='{74D67C6F-655E-4E4D-A147-39F32DB6E796}' Win64='yes'>\r
+ <File Id='zlib1d.dll' KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ </Directory><!-- shibboleth_sp -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix>\r
+\r
+ \r
--- /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
+<?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define ZlibVersion='1.2.5' ?>\r
+<?define ZlibFileVersion='1' ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>\r
+ <Package Id='{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}' Description='Merge Module for Zlib'\r
+ Comments='This module is built by the Shibboleth Consortium.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
+ <Directory Id='shibboleth' Name='Shibboleth'>\r
+ <Directory Id='shibboleth_sp' Name='SP'>\r
+ <Directory Id='lib' Name='lib'>\r
+ <Component Id='zlib1.dll' Guid='{059557A8-7311-47BB-8A5F-CC85F72AE495}'>\r
+ <File KeyPath='yes'\r
+ Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'/>\r
+ </Component>\r
+ <Directory Id='lib_debug' Name='debug'>\r
+ <Component Id='zlib1d.dll' Guid='{3DA71CD4-F204-49D5-A689-7B1B4C2D395A}'>\r
+ <File Id='zlib1d.dll' KeyPath='yes' \r
+ Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
+ </Component>\r
+ </Directory><!-- lib_debug-->\r
+ </Directory><!-- lib -->\r
+ </Directory><!-- shibboleth_sp -->\r
+ </Directory><!-- shibboleth -->\r
+ </Directory><!-- ProgramFilesFolder -->\r
+ </Directory><!-- TARGETDIR -->\r
+ </Module>\r
+</Wix>\r
+\r
+ \r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>\r
- <Package Id='{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}' Description='Merge Module for Zlib'\r
+ <Package Id='{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}' Description='Merge Module for Zlib (x86)'\r
Comments='This module is built by the Shibboleth Consortium.'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\r
\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
--- /dev/null
+<?xml version='1.0' encoding='utf-8'?>\r
+\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
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033' UpgradeCode='{948E0C71-CC50-48C0-83F6-4D261A7521CA}'\r
+ Version='1.0.0.0' Manufacturer='Shibboleth Consortium' >\r
+ <Package Description='TEST Windows Installer package'\r
+ Comments='Ignore Ignore Ignore Ignore' Platform='x64'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Compressed='yes' />\r
+\r
+ <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
+ <!-- Files -->\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' >\r
+ <Merge Id='XmlTooling-32' Language='1033' SourceFile='.\XmlTooling-x86.msm' DiskId='1' />\r
+ <Merge Id='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.msm' DiskId='1' />\r
+<!--\r
+ <Merge Id='OpenSSL-32' Language='1033' SourceFile='.\OpenSSL-x86.msm' DiskId='1' />\r
+ <Merge Id='Curl-32' Language='1033' SourceFile='.\Curl-x86.msm' DiskId='1' />\r
+ <Merge Id='FastCGI-32' Language='1033' SourceFile='.\FastCGI-x86.msm' DiskId='1' />\r
+ <Merge Id='Log4Shib-32' Language='1033' SourceFile='.\Log4Shib-x86.msm' DiskId='1' />\r
+ <Merge Id='Shibboleth-32' Language='1033' SourceFile='.\Shibboleth-x86.msm' DiskId='1' />\r
+ <Merge Id='Xerces-32' Language='1033' SourceFile='.\Xerces-x86.msm' DiskId='1' />\r
+ <Merge Id='XmlSec-32' Language='1033' SourceFile='.\XmlSec-x86.msm' DiskId='1' />\r
+ <Merge Id='Zlib-32' Language='1033' SourceFile='.\Zlib-x86.msm' DiskId='1' /> -->\r
+ </Directory>\r
+ <Directory Id='ProgramFiles64Folder' > \r
+ <Merge Id='XmlTooling-64' Language='1033' SourceFile='.\XmlTooling-x64.msm' DiskId='1' />\r
+ <Merge Id='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' /> \r
+\r
+<!--\r
+ <Merge Id='OpenSSL-64' Language='1033' SourceFile='.\OpenSSL-x64.msm' DiskId='1' />\r
+ <Merge Id='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' />\r
+ <Merge Id='Curl-64' Language='1033' SourceFile='.\Curl-x64.msm' DiskId='1' FileCompression='true' />\r
+ <Merge Id='FastCGI-64' Language='1033' SourceFile='.\FastCGI-x64.msm' DiskId='1' />\r
+ <Merge Id='Log4Shib-64' Language='1033' SourceFile='.\Log4Shib-x64.msm' DiskId='1' />\r
+ <Merge Id='Shibboleth-64' Language='1033' SourceFile='.\Shibboleth-x64.msm' DiskId='1' />\r
+ <Merge Id='Xerces-64' Language='1033' SourceFile='.\Xerces-x64.msm' DiskId='1' />\r
+ <Merge Id='XmlSec-64' Language='1033' SourceFile='.\XmlSec-x64.msm' DiskId='1' />\r
+ <Merge Id='XmlTooling-64' Language='1033' SourceFile='.\XmlTooling-x64.msm' DiskId='1' />\r
+ <Merge Id='Zlib-64' Language='1033' SourceFile='.\Zlib-x64.msm' DiskId='1' />\r
+-->\r
+ </Directory> \r
+ </Directory>\r
+\r
+ <!-- Feature -->\r
+ <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>\r
+ <MergeRef Id='XmlTooling-32'/> \r
+ <MergeRef Id='OpenSAML-32'/>\r
+ <MergeRef Id='XmlTooling-64'/> \r
+ <MergeRef Id='OpenSAML-64'/>\r
+ </Feature>\r
+ </Product>\r
+</Wix>\r
--- /dev/null
+<?xml version='1.0' encoding='utf-8'?>\r
+\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
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033' UpgradeCode='{948E0C71-CC50-48C0-83F6-4D261A7521CA}'\r
+ Version='1.0.0.0' Manufacturer='Shibboleth Consortium' >\r
+ <Package Description='TEST Windows Installer package'\r
+ Comments='Ignore Ignore Ignore Ignore' Platform='x64'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Compressed='yes' />\r
+\r
+ <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
+ <!-- Files -->\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' >\r
+ <Merge Id='XmlTooling-32' Language='1033' SourceFile='.\XmlTooling-x86.msm' DiskId='1' />\r
+ <Merge Id='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.msm' DiskId='1' />\r
+<!--\r
+ <Merge Id='OpenSSL-32' Language='1033' SourceFile='.\OpenSSL-x86.msm' DiskId='1' />\r
+ <Merge Id='Curl-32' Language='1033' SourceFile='.\Curl-x86.msm' DiskId='1' />\r
+ <Merge Id='FastCGI-32' Language='1033' SourceFile='.\FastCGI-x86.msm' DiskId='1' />\r
+ <Merge Id='Log4Shib-32' Language='1033' SourceFile='.\Log4Shib-x86.msm' DiskId='1' />\r
+ <Merge Id='Shibboleth-32' Language='1033' SourceFile='.\Shibboleth-x86.msm' DiskId='1' />\r
+ <Merge Id='Xerces-32' Language='1033' SourceFile='.\Xerces-x86.msm' DiskId='1' />\r
+ <Merge Id='XmlSec-32' Language='1033' SourceFile='.\XmlSec-x86.msm' DiskId='1' />\r
+ <Merge Id='Zlib-32' Language='1033' SourceFile='.\Zlib-x86.msm' DiskId='1' /> \r
+ </Directory>\r
+ <Directory Id='ProgramFiles64Folder' >\r
+ <Merge Id='OpenSSL-64' Language='1033' SourceFile='.\OpenSSL-x64.msm' DiskId='1' />\r
+ <Merge Id='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' />\r
+ <Merge Id='Curl-64' Language='1033' SourceFile='.\Curl-x64.msm' DiskId='1' FileCompression='true' />\r
+ <Merge Id='FastCGI-64' Language='1033' SourceFile='.\FastCGI-x64.msm' DiskId='1' />\r
+ <Merge Id='Log4Shib-64' Language='1033' SourceFile='.\Log4Shib-x64.msm' DiskId='1' />\r
+ <Merge Id='Shibboleth-64' Language='1033' SourceFile='.\Shibboleth-x64.msm' DiskId='1' />\r
+ <Merge Id='Xerces-64' Language='1033' SourceFile='.\Xerces-x64.msm' DiskId='1' />\r
+ <Merge Id='XmlSec-64' Language='1033' SourceFile='.\XmlSec-x64.msm' DiskId='1' />\r
+ <Merge Id='XmlTooling-64' Language='1033' SourceFile='.\XmlTooling-x64.msm' DiskId='1' />\r
+ <Merge Id='Zlib-64' Language='1033' SourceFile='.\Zlib-x64.msm' DiskId='1' />\r
+ <Merge Id='XmlTooling-64' Language='1033' SourceFile='.\XmlTooling-x64.msm' DiskId='1' />\r
+ <Merge Id='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' /> -->\r
+ </Directory> \r
+ </Directory>\r
+\r
+ <!-- Feature -->\r
+ <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>\r
+ <MergeRef Id='XmlTooling-32'/> \r
+ <MergeRef Id='OpenSAML-32'/>\r
+ </Feature>\r
+ </Product>\r
+</Wix>\r
--- /dev/null
+<?xml version='1.0' encoding='utf-8'?>\r
+\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
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033' UpgradeCode='{948E0C71-CC50-48C0-83F6-4D261A7521CA}'\r
+ Version='1.0.0.0' Manufacturer='Shibboleth Consortium' >\r
+ <Package Description='TEST Windows Installer package'\r
+ Comments='Ignore Ignore Ignore Ignore' Platform='x64'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Compressed='yes' />\r
+\r
+ <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
+ <!-- Files -->\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' >\r
+ <Merge Id='OpenSSL-32' Language='1033' SourceFile='.\OpenSSL-x86.msm' DiskId='1' />\r
+<!--\r
+ <Merge Id='XmlTooling-32' Language='1033' SourceFile='.\XmlTooling-x86.msm' DiskId='1' />\r
+ <Merge Id='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.msm' DiskId='1' /> -->\r
+ <Merge Id='Curl-32' Language='1033' SourceFile='.\Curl-x86.msm' DiskId='1' />\r
+ <Merge Id='FastCGI-32' Language='1033' SourceFile='.\FastCGI-x86.msm' DiskId='1' />\r
+ <Merge Id='Log4Shib-32' Language='1033' SourceFile='.\Log4Shib-x86.msm' DiskId='1' />\r
+ <Merge Id='Shibboleth-32' Language='1033' SourceFile='.\Shibboleth-x86.msm' DiskId='1' />\r
+ <Merge Id='Xerces-32' Language='1033' SourceFile='.\Xerces-x86.msm' DiskId='1' />\r
+ <Merge Id='XmlSec-32' Language='1033' SourceFile='.\XmlSec-x86.msm' DiskId='1' />\r
+ <Merge Id='Zlib-32' Language='1033' SourceFile='.\Zlib-x86.msm' DiskId='1' />\r
+ </Directory>\r
+ <Directory Id='ProgramFiles64Folder' >\r
+ <Merge Id='OpenSSL-64' Language='1033' SourceFile='.\OpenSSL-x64.msm' DiskId='1' />\r
+ <Merge Id='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' />\r
+ <Merge Id='Curl-64' Language='1033' SourceFile='.\Curl-x64.msm' DiskId='1' />\r
+ <Merge Id='FastCGI-64' Language='1033' SourceFile='.\FastCGI-x64.msm' DiskId='1' />\r
+ <Merge Id='Log4Shib-64' Language='1033' SourceFile='.\Log4Shib-x64.msm' DiskId='1' />\r
+ <Merge Id='Shibboleth-64' Language='1033' SourceFile='.\Shibboleth-x64.msm' DiskId='1' />\r
+ <Merge Id='Xerces-64' Language='1033' SourceFile='.\Xerces-x64.msm' DiskId='1' />\r
+ <Merge Id='XmlSec-64' Language='1033' SourceFile='.\XmlSec-x64.msm' DiskId='1' />\r
+ <Merge Id='XmlTooling-64' Language='1033' SourceFile='.\XmlTooling-x64.msm' DiskId='1' />\r
+ <Merge Id='Zlib-64' Language='1033' SourceFile='.\Zlib-x64.msm' DiskId='1' />\r
+ </Directory>\r
+ </Directory>\r
+\r
+ <!-- Feature -->\r
+ <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>\r
+ <MergeRef Id='OpenSSL-32'/>\r
+ <MergeRef Id='OpenSSL-64'/>\r
+ <MergeRef Id='OpenSAML-64'/>\r
+ <MergeRef Id='Curl-32'/>\r
+ <MergeRef Id='Curl-64'/>\r
+ <MergeRef Id='FastCGI-32'/>\r
+ <MergeRef Id='FastCGI-64'/>\r
+ <MergeRef Id='FastCGI-32'/>\r
+ <MergeRef Id='FastCGI-64'/>\r
+ <MergeRef Id='Log4Shib-32'/>\r
+ <MergeRef Id='Log4Shib-64'/>\r
+ <MergeRef Id='Shibboleth-32'/>\r
+ <MergeRef Id='Shibboleth-64'/>\r
+ <MergeRef Id='Xerces-32'/>\r
+ <MergeRef Id='Xerces-64'/>\r
+ <MergeRef Id='XmlSec-32'/>\r
+ <MergeRef Id='XmlSec-64'/>\r
+<!-- <MergeRef Id='XmlTooling-32'/> -->\r
+ <MergeRef Id='XmlTooling-64'/>\r
+ <MergeRef Id='Zlib-32'/>\r
+ <MergeRef Id='Zlib-64'/>\r
+ </Feature>\r
+ </Product>\r
+</Wix>\r
--- /dev/null
+<?xml version='1.0' encoding='utf-8'?>\r
+\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
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033' UpgradeCode='{948E0C71-CC50-48C0-83F6-4D261A7521CA}'\r
+ Version='1.0.0.0' Manufacturer='Shibboleth Consortium' >\r
+ <Package Description='TEST Windows Installer package'\r
+ Comments='Ignore Ignore Ignore Ignore' Platform='x64'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Compressed='yes' />\r
+\r
+ <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
+ <!-- Files -->\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='ProgramFilesFolder' >\r
+ <Merge Id='OpenSSL-32' Language='1033' SourceFile='.\OpenSSL-x86.msm' DiskId='1' />\r
+<!--\r
+ <Merge Id='XmlTooling-32' Language='1033' SourceFile='.\XmlTooling-x86.msm' DiskId='1' />\r
+ <Merge Id='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.msm' DiskId='1' /> -->\r
+ <Merge Id='Curl-32' Language='1033' SourceFile='.\Curl-x86.msm' DiskId='1' />\r
+ <Merge Id='FastCGI-32' Language='1033' SourceFile='.\FastCGI-x86.msm' DiskId='1' />\r
+ <Merge Id='Log4Shib-32' Language='1033' SourceFile='.\Log4Shib-x86.msm' DiskId='1' />\r
+ <Merge Id='Shibboleth-32' Language='1033' SourceFile='.\Shibboleth-x86.msm' DiskId='1' />\r
+ <Merge Id='Xerces-32' Language='1033' SourceFile='.\Xerces-x86.msm' DiskId='1' />\r
+ <Merge Id='XmlSec-32' Language='1033' SourceFile='.\XmlSec-x86.msm' DiskId='1' />\r
+ <Merge Id='Zlib-32' Language='1033' SourceFile='.\Zlib-x86.msm' DiskId='1' />\r
+ </Directory>\r
+ <Directory Id='ProgramFiles64Folder' >\r
+ <Merge Id='OpenSSL-64' Language='1033' SourceFile='.\OpenSSL-x64.msm' DiskId='1' />\r
+ <Merge Id='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' />\r
+ <Merge Id='Curl-64' Language='1033' SourceFile='.\Curl-x64.msm' DiskId='1' FileCompression='true' />\r
+ <Merge Id='FastCGI-64' Language='1033' SourceFile='.\FastCGI-x64.msm' DiskId='1' />\r
+ <Merge Id='Log4Shib-64' Language='1033' SourceFile='.\Log4Shib-x64.msm' DiskId='1' />\r
+ <Merge Id='Shibboleth-64' Language='1033' SourceFile='.\Shibboleth-x64.msm' DiskId='1' />\r
+ <Merge Id='Xerces-64' Language='1033' SourceFile='.\Xerces-x64.msm' DiskId='1' />\r
+ <Merge Id='XmlSec-64' Language='1033' SourceFile='.\XmlSec-x64.msm' DiskId='1' />\r
+ <Merge Id='XmlTooling-64' Language='1033' SourceFile='.\XmlTooling-x64.msm' DiskId='1' />\r
+ <Merge Id='Zlib-64' Language='1033' SourceFile='.\Zlib-x64.msm' DiskId='1' />\r
+ </Directory>\r
+ </Directory>\r
+\r
+ <!-- Feature -->\r
+ <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>\r
+ <MergeRef Id='OpenSSL-32'/>\r
+ <MergeRef Id='OpenSSL-64'/>\r
+ <MergeRef Id='OpenSAML-64'/>\r
+ <MergeRef Id='Curl-32'/>\r
+ <MergeRef Id='Curl-64'/>\r
+ <MergeRef Id='FastCGI-32'/>\r
+ <MergeRef Id='FastCGI-64'/>\r
+ <MergeRef Id='FastCGI-32'/>\r
+ <MergeRef Id='FastCGI-64'/>\r
+ <MergeRef Id='Log4Shib-32'/>\r
+ <MergeRef Id='Log4Shib-64'/>\r
+ <MergeRef Id='Shibboleth-32'/>\r
+ <MergeRef Id='Shibboleth-64'/>\r
+ <MergeRef Id='Xerces-32'/>\r
+ <MergeRef Id='Xerces-64'/>\r
+ <MergeRef Id='XmlSec-32'/>\r
+ <MergeRef Id='XmlSec-64'/>\r
+<!-- <MergeRef Id='XmlTooling-32'/> -->\r
+ <MergeRef Id='XmlTooling-64'/>\r
+ <MergeRef Id='Zlib-32'/>\r
+ <MergeRef Id='Zlib-64'/>\r
+ </Feature>\r
+ </Product>\r
+</Wix>\r
projects / shibboleth / cpp-sp.git / commitdiff