[cpp-sp COMMIT] in /branches/REL_2/msi/WiX/MergeModules: OpenSAML-schemas.wxs OpenSAML-x64.wxs OpenSAML-x86.wxs XmlTo...

[noreply at shibboleth.net]

Author: rdw
Date: Thu May  3 17:41:27 2012
New Revision: 3639

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3639&view=rev
Log:
Merge modules compile and install (with separate MM for schemas for now).  Also trivial batch script to build them all until I get VC integration done

Added:
    branches/REL_2/msi/WiX/MergeModules/compile.bat   (with props)
Modified:
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlTooling-schemas.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlTooling-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlTooling-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/te2.wxs
    branches/REL_2/msi/WiX/MergeModules/tes.wxs

Modified: branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs?rev=3639&r1=3638&r2=3639&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs Thu May  3 17:41:27 2012
@@ -17,10 +17,15 @@
      permissions and limitations under the License.  -->
 
 <?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define OpenSAMLVersion='2.4.3' ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Fragment>
-    <DirectoryRef Id='TARGETDIR'>
+  <Module Id='OpenSAMLMergeModule_schemas' Language='1033' Version='$(var.OpenSAMLVersion)'>
+    <Package Id='{8567178A-EEA1-4798-9D20-C2E2F7247D0F}' Description='Merge Module for OpenSAML schemas'
+             Comments='This module is built by the Shibboleth Consortium'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
         <Directory Id='common_shibboleth' Name='Shibboleth' >
           <Directory Id='common_sp' Name='SP' >
@@ -102,6 +107,6 @@
           </Directory><!--common_sp-->
         </Directory><!--common_shibboleth-->
       </Directory><!--CommonAppDataFolder-->
-    </DirectoryRef><!--TargetDir-->
-  </Fragment>
+    </Directory><!--TargetDir-->
+  </Module>
 </Wix>

Modified: branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs?rev=3639&r1=3638&r2=3639&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs Thu May  3 17:41:27 2012
@@ -23,7 +23,7 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='OpenSAMLMergeModule_x64' Language='1033' Version='$(var.OpenSAMLVersion)'>
     <Package Id='{C4A8AAF1-D263-4361-9695-CE0F56B5D3C6}' Description='Merge Module for OpenSAML (x64)'
-             Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign and Schema'
+             Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign'
              Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
@@ -50,11 +50,6 @@
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
     </Directory><!-- TARGETDIR -->
-    <ComponentRef Id='schema_assertion_01'/>
-    <ComponentRef Id='schema_assertion_1_1'/>
-    <ComponentRef Id='schema_protocol_01'/>
-    <ComponentRef Id='schema_protocol_1_1'/>
-    <ComponentRef Id='samlschema' />
   </Module>
 </Wix>
 

Modified: branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs?rev=3639&r1=3638&r2=3639&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs Thu May  3 17:41:27 2012
@@ -50,11 +50,6 @@
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
     </Directory><!-- TARGETDIR -->
-    <ComponentRef Id='schema_assertion_01'/>
-    <ComponentRef Id='schema_assertion_1_1'/>
-    <ComponentRef Id='schema_protocol_01'/>
-    <ComponentRef Id='schema_protocol_1_1'/>
-    <ComponentRef Id='samlschema' />
   </Module>
 </Wix>
 

Modified: branches/REL_2/msi/WiX/MergeModules/XmlTooling-schemas.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/XmlTooling-schemas.wxs?rev=3639&r1=3638&r2=3639&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/XmlTooling-schemas.wxs (original)

[... 150 lines stripped ...]