Removing backup files
authorScott Cantor <cantor.2@osu.edu>
Fri, 18 May 2012 21:08:33 +0000 (21:08 +0000)
committerScott Cantor <cantor.2@osu.edu>
Fri, 18 May 2012 21:08:33 +0000 (21:08 +0000)
13 files changed:
msi/WiX/MergeModules/Curl-x64.wxs~ [deleted file]
msi/WiX/MergeModules/FastCGI-x64.wxs~ [deleted file]
msi/WiX/MergeModules/Log4Shib-x64.wxs~ [deleted file]
msi/WiX/MergeModules/OpenSAML-x64.wxs~ [deleted file]
msi/WiX/MergeModules/OpenSSL-x64-files.wxs~ [deleted file]
msi/WiX/MergeModules/OpenSSL-x64.wxs~ [deleted file]
msi/WiX/MergeModules/OpenSSL-x86-files.wxs~ [deleted file]
msi/WiX/MergeModules/Shibboleth-x64.wxs~ [deleted file]
msi/WiX/MergeModules/Xerces-x64.wxs~ [deleted file]
msi/WiX/MergeModules/XmlTooling-x64.wxs~ [deleted file]
msi/WiX/MergeModules/Zlib-x64.wxs~ [deleted file]
msi/WiX/MergeModules/te2.wxs~ [deleted file]
msi/WiX/MergeModules/tes.wxs~ [deleted file]

diff --git a/msi/WiX/MergeModules/Curl-x64.wxs~ b/msi/WiX/MergeModules/Curl-x64.wxs~
deleted file mode 100644 (file)
index 23e2ead..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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
diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs~ b/msi/WiX/MergeModules/FastCGI-x64.wxs~
deleted file mode 100644 (file)
index 8a9a753..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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
diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs~ b/msi/WiX/MergeModules/Log4Shib-x64.wxs~
deleted file mode 100644 (file)
index 7668b52..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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
diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs~ b/msi/WiX/MergeModules/OpenSAML-x64.wxs~
deleted file mode 100644 (file)
index 6bf80dd..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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
diff --git a/msi/WiX/MergeModules/OpenSSL-x64-files.wxs~ b/msi/WiX/MergeModules/OpenSSL-x64-files.wxs~
deleted file mode 100644 (file)
index d826f73..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs~ b/msi/WiX/MergeModules/OpenSSL-x64.wxs~
deleted file mode 100644 (file)
index d826f73..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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
diff --git a/msi/WiX/MergeModules/OpenSSL-x86-files.wxs~ b/msi/WiX/MergeModules/OpenSSL-x86-files.wxs~
deleted file mode 100644 (file)
index 6e2a674..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs~ b/msi/WiX/MergeModules/Shibboleth-x64.wxs~
deleted file mode 100644 (file)
index a4b58d6..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs~ b/msi/WiX/MergeModules/Xerces-x64.wxs~
deleted file mode 100644 (file)
index a4928d4..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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
diff --git a/msi/WiX/MergeModules/XmlTooling-x64.wxs~ b/msi/WiX/MergeModules/XmlTooling-x64.wxs~
deleted file mode 100644 (file)
index add03b7..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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
diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs~ b/msi/WiX/MergeModules/Zlib-x64.wxs~
deleted file mode 100644 (file)
index 3f62a2a..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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
diff --git a/msi/WiX/MergeModules/te2.wxs~ b/msi/WiX/MergeModules/te2.wxs~
deleted file mode 100644 (file)
index 992f261..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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
diff --git a/msi/WiX/MergeModules/tes.wxs~ b/msi/WiX/MergeModules/tes.wxs~
deleted file mode 100644 (file)
index b31e74b..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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