No need for a test build of the merge modules any more

diff --git a/msi/WiX/MergeModules/compile.bat b/msi/WiX/MergeModules/compile.bat
index d69a0fb..f29df08 100644 (file)
--- a/msi/WiX/MergeModules/compile.bat
+++ b/msi/WiX/MergeModules/compile.bat
@@ -102,6 +102,4 @@ wixcop -indent:2 OpenSSL-x64.wxs
 
 goto done
 :done
-candle tes.wxs
-light tes.wixobj
-smoke tes.msi
+

diff --git a/msi/WiX/MergeModules/te2.wxs b/msi/WiX/MergeModules/te2.wxs
deleted file mode 100644 (file)
index c7ed339..0000000
--- a/msi/WiX/MergeModules/te2.wxs
+++ /dev/null
@@ -1,71 +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-E7227D295DD9' Name='Test Package21' Language='1033' UpgradeCode='{948E0C71-CC50-48C0-83F6-4D261A7521CD}'\r
-           Version='1.0.0.0' Manufacturer='Shibboleth Consortium' >\r
-    <Package Description='TEST2 Windows Installer package'\r
-             Comments='Ignore Ignore Ignore Ignore' Platform='x86'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' 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
-        <Merge Id='XmlTooling-Schemas' Language='1033' SourceFile='.\XmlTooling-Schemas.msm' DiskId='1' />\r
-        <Merge Id='OpenSAML-Schemas' Language='1033' SourceFile='.\OpenSAML-Schemas.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-Schemas'/> \r
-      <MergeRef Id='OpenSAML-Schemas'/>\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 79f7a96..0000000
--- a/msi/WiX/MergeModules/tes.wxs
+++ /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='300' 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='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='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.msm' DiskId='1' /> \r
-        <Merge Id='OpenSSL-32' Language='1033' SourceFile='.\OpenSSL-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='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='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' />\r
-        <Merge Id='OpenSSL-64' Language='1033' SourceFile='.\OpenSSL-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='Zlib-64' Language='1033' SourceFile='.\Zlib-x64.msm' DiskId='1' />\r
-      </Directory>\r
-      <Directory Id='CommonAppDataFolder'>\r
-        <Merge Id='OpenSAML-schemas' Language='1033' SourceFile='.\OpenSAML-schemas.msm' DiskId='1' />\r
-        <Merge Id='Shibboleth-schemas' Language='1033' SourceFile='.\Shibboleth-schemas.msm' DiskId='1' />\r
-      </Directory>\r
-    </Directory>\r
-\r
-    <!-- Feature -->\r
-    <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>\r
-      <MergeRef Id='Curl-32'/>\r
-      <MergeRef Id='Curl-64'/>\r
-      <MergeRef Id='FastCGI-32'/>\r
-      <MergeRef Id='FastCGI-64'/>\r
-      <MergeRef Id='Log4Shib-32'/>\r
-      <MergeRef Id='Log4Shib-64'/>\r
-      <MergeRef Id='OpenSAML-schemas'/>\r
-      <MergeRef Id='OpenSAML-32'/> \r
-      <MergeRef Id='OpenSAML-64'/>\r
-      <MergeRef Id='OpenSSL-32'/>\r
-      <MergeRef Id='OpenSSL-64'/>\r
-      <MergeRef Id='Shibboleth-schemas'/>\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='Zlib-32'/>\r
-      <MergeRef Id='Zlib-64'/>\r
-    </Feature>\r
-  </Product>\r
-</Wix>\r