Merge modules compile and install (with separate MM for schemas for now). Also trivi...

diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index 216d779..446fa74 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -17,10 +17,15 @@
      permissions and limitations under the License.  -->\r
 \r
 <?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define OpenSAMLVersion='2.4.3' ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Fragment>\r
-    <DirectoryRef Id='TARGETDIR'>\r
+  <Module Id='OpenSAMLMergeModule_schemas' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
+    <Package Id='{8567178A-EEA1-4798-9D20-C2E2F7247D0F}' Description='Merge Module for OpenSAML schemas'\r
+             Comments='This module is built by the Shibboleth Consortium'\r
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\r
+\r
+    <Directory Id='TARGETDIR' Name='SourceDir'>\r
       <Directory Id='CommonAppDataFolder' Name='CommonFiles' >\r
         <Directory Id='common_shibboleth' Name='Shibboleth' >\r
           <Directory Id='common_sp' Name='SP' >\r
@@ -102,6 +107,6 @@
           </Directory><!--common_sp-->\r
         </Directory><!--common_shibboleth-->\r
       </Directory><!--CommonAppDataFolder-->\r
-    </DirectoryRef><!--TargetDir-->\r
-  </Fragment>\r
+    </Directory><!--TargetDir-->\r
+  </Module>\r
 </Wix>\r

diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index d3a5d7d..363cd39 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -23,7 +23,7 @@
 <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
+             Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign'\r
              Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
 \r
     <Directory Id='TARGETDIR' Name='SourceDir'>\r
@@ -50,11 +50,6 @@
         </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

diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index 2b21427..6f644b5 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -50,11 +50,6 @@
         </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

diff --git a/msi/WiX/MergeModules/XmlTooling-schemas.wxs b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
index 780073b..49698e2 100644 (file)
--- a/msi/WiX/MergeModules/XmlTooling-schemas.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
@@ -16,10 +16,15 @@
    permissions and limitations under the License.  -->\r
 \r
 <?define BuildDirectory='G:\Downloads\shib\' ?>\r
+<?define XmlToolingVersion='1.4.2' ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Fragment>\r
-    <DirectoryRef Id='TARGETDIR'>\r
+  <Module Id='XmlTooling_schemas' Language='1033' Version='$(var.XmlToolingVersion)'>\r
+    <Package Id='{C4A8AAF1-D263-4361-9695-CE0F56B5D3C6}' Description='Merge Module for XmlTooling schemas'\r
+             Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign'\r
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\r
+\r
+    <Directory Id='TARGETDIR' Name='SourceDir'>\r
       <Directory Id='CommonAppDataFolder' Name='CommonFiles' >\r
         <Directory Id='common_shibboleth' Name='Shibboleth' >\r
           <Directory Id='common_sp' Name='SP' >\r
@@ -38,6 +43,6 @@
           </Directory><!--common_sp-->\r
         </Directory><!--common_shibboleth-->\r
       </Directory><!--CommonAppDataFolder-->\r
-    </DirectoryRef><!--TargetDir-->\r
-  </Fragment>\r
+    </Directory><!--TargetDir-->\r
+  </Module>\r
 </Wix>\r

diff --git a/msi/WiX/MergeModules/XmlTooling-x64.wxs b/msi/WiX/MergeModules/XmlTooling-x64.wxs
index d340492..2271e65 100644 (file)
--- a/msi/WiX/MergeModules/XmlTooling-x64.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-x64.wxs
@@ -54,6 +54,5 @@
         </Directory><!-- shibboleth -->\r
       </Directory><!-- ProgramFiles -->\r
     </Directory><!-- TARGETDIR -->\r
-    <ComponentRef Id='xmltoolingschema'/>\r
   </Module>\r
 </Wix>\r

diff --git a/msi/WiX/MergeModules/XmlTooling-x86.wxs b/msi/WiX/MergeModules/XmlTooling-x86.wxs
index 38280ea..d892253 100644 (file)
--- a/msi/WiX/MergeModules/XmlTooling-x86.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-x86.wxs
@@ -50,6 +50,5 @@
         </Directory><!-- shibboleth -->\r
       </Directory><!-- ProgramFiles -->\r
     </Directory><!-- TARGETDIR -->\r
-    <ComponentRef Id='xmltoolingschema'/>\r
   </Module>\r
 </Wix>\r

diff --git a/msi/WiX/MergeModules/compile.bat b/msi/WiX/MergeModules/compile.bat
new file mode 100644 (file)
index 0000000..451ba8d
--- /dev/null
+++ b/msi/WiX/MergeModules/compile.bat
@@ -0,0 +1,118 @@
+goto current
+:current
+
+ wixcop -indent:2 Curl-x86.wxs
+ candle Curl-x86.wxs
+ light  Curl-x86.wixobj
+ smoke  Curl-x86.msm
+ wixcop -indent:2 Curl-x64.wxs
+ candle Curl-x64.wxs
+ light  Curl-x64.wixobj
+ smoke  Curl-x64.msm
+
+ wixcop -indent:2 FastCGI-x86.wxs
+ candle FastCGI-x86.wxs
+ light  FastCGI-x86.wixobj
+ smoke  FastCGI-x86.msm
+  wixcop -indent:2 FastCGI-x64.wxs
+ candle FastCGI-x64.wxs
+ light  FastCGI-x64.wixobj
+ smoke  FastCGI-x64.msm
+
+wixcop -indent:2 Log4Shib-x86.wxs
+ candle Log4Shib-x86.wxs
+ light  Log4Shib-x86.wixobj
+ smoke  Log4Shib-x86.msm
+wixcop -indent:2 Log4Shib-x64.wxs
+ candle Log4Shib-x64.wxs
+ light  Log4Shib-x64.wixobj
+ smoke  Log4Shib-x64.msm
+
+
+wixcop -indent:2 OpenSAML-x86.wxs
+ candle OpenSAML-x86.wxs
+ light  OpenSAML-x86.wixobj 
+ smoke  OpenSAML-x86.msm
+
+wixcop -indent:2 OpenSAML-schemas.wxs
+ candle OpenSAML-schemas.wxs
+ light  OpenSAML-schemas.wixobj
+ smoke  OpenSAML-schemas.msm
+
+wixcop -indent:2 OpenSAML-x64.wxs
+ candle OpenSAML-x64.wxs
+ light  OpenSAML-x64.wixobj 
+ smoke  OpenSAML-x64.msm
+goto continue
+wixcop -indent:2 OpenSSL-x86.wxs
+candle OpenSSL-x86.wxs
+light  OpenSSL-x86.wixobj
+rem smoke  OpenSSL-x86.msm
+wixcop -indent:2 OpenSSL-x64.wxs
+candle OpenSSL-x64.wxs
+light  OpenSSL-x64.wixobj
+rem smoke  OpenSSL-x64.msm
+
+ wixcop -indent:2 Shibboleth-x86.wxs
+ candle Shibboleth-x86.wxs
+ light  Shibboleth-x86.wixobj
+ smoke  Shibboleth-x86.msm
+
+ wixcop -indent:2 Shibboleth-x64.wxs
+ candle Shibboleth-x64.wxs
+ light  Shibboleth-x64.wixobj
+ smoke  Shibboleth-x64.msm
+
+ wixcop -indent:2  Xerces-x86.wxs
+ candle Xerces-x86.wxs
+ light  Xerces-x86.wixobj
+ smoke  Xerces-x86.msm
+
+ wixcop -indent:2  Xerces-x64.wxs
+ candle Xerces-x64.wxs
+ light  Xerces-x64.wixobj
+ smoke  Xerces-x64.msm
+
+ wixcop -indent:2 XmlSec-x86.wxs
+ candle XmlSec-x86.wxs
+ light  XmlSec-x86.wixobj
+ smoke  XmlSec-x86.msm
+
+ wixcop -indent:2 XmlSec-x64.wxs
+ candle XmlSec-x64.wxs
+ light  XmlSec-x64.wixobj
+ smoke  XmlSec-x64.msm
+
+:continue
+ wixcop -indent:2  XmlTooling-x86.wxs
+ candle XmlTooling-x86.wxs
+ wixcop -indent:2  XmlTooling-schemas.wxs
+ candle XmlTooling-schemas.wxs
+ light  XmlTooling-x86.wixobj 
+ smoke  XmlTooling-x86.msm
+
+ wixcop -indent:2  XmlTooling-schemas.wxs
+ candle XmlTooling-schemas.wxs
+ light  XmlTooling-schemas.wixobj
+ smoke  XmlTooling-schemas.msm
+
+ wixcop -indent:2  XmlTooling-x64.wxs
+ candle XmlTooling-x64.wxs
+ light  XmlTooling-x64.wixobj
+ smoke  XmlTooling-x64.msm
+
+ wixcop -indent:2  Zlib-x86.wxs
+ candle Zlib-x86.wxs
+ light  Zlib-x86.wixobj
+ smoke  Zlib-x86.msm
+
+ wixcop -indent:2  Zlib-x64.wxs
+ candle Zlib-x64.wxs
+ light  Zlib-x64.wixobj
+ smoke  Zlib-x64.msm
+
+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
index c0ed7c7..75d6af6 100644 (file)
--- a/msi/WiX/MergeModules/te2.wxs
+++ b/msi/WiX/MergeModules/te2.wxs
@@ -17,10 +17,10 @@
    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
+  <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='TEST Windows Installer package'\r
-             Comments='Ignore Ignore Ignore Ignore' Platform='x64'\r
+    <Package Description='TEST2 Windows Installer package'\r
+             Comments='Ignore Ignore Ignore Ignore' Platform='x86'\r
              Manufacturer='Shibboleth Consortium' InstallerVersion='405' Compressed='yes' />\r
 \r
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
@@ -29,6 +29,8 @@
       <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
@@ -37,13 +39,13 @@
         <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
+        <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
+\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
@@ -62,8 +64,8 @@
     <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
+      <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
index cfe5a89..e7faecb 100644 (file)
--- a/msi/WiX/MergeModules/tes.wxs
+++ b/msi/WiX/MergeModules/tes.wxs
@@ -28,9 +28,10 @@
     <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='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.msm' DiskId='1' />  -->\r
+        <Merge Id='OpenSAML-schemas' Language='1033' SourceFile='.\OpenSAML-schemas.msm' DiskId='1' />\r
+<!--        <Merge Id='XmlTooling-32' Language='1033' SourceFile='.\XmlTooling-x86.msm' DiskId='1' /> -->\r
+        <Merge Id='XmlTooling-Schemas' Language='1033' SourceFile='.\XmlTooling-schemas.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
@@ -57,6 +58,8 @@
     <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>\r
       <MergeRef Id='OpenSSL-32'/>\r
       <MergeRef Id='OpenSSL-64'/>\r
+<!--      <MergeRef Id='OpenSAML-32'/> -->\r
+      <MergeRef Id='OpenSAML-schemas'/>\r
       <MergeRef Id='OpenSAML-64'/>\r
       <MergeRef Id='Curl-32'/>\r
       <MergeRef Id='Curl-64'/>\r
@@ -72,7 +75,8 @@
       <MergeRef Id='Xerces-64'/>\r
       <MergeRef Id='XmlSec-32'/>\r
       <MergeRef Id='XmlSec-64'/>\r
-<!--      <MergeRef Id='XmlTooling-32'/> -->\r
+<!--      <MergeRef Id='XmlTooling-32'/>  -->\r
+      <MergeRef Id='XmlTooling-Schemas'/> \r
       <MergeRef Id='XmlTooling-64'/>\r
       <MergeRef Id='Zlib-32'/>\r
       <MergeRef Id='Zlib-64'/>\r