[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: MergeModules/Shibboleth-schemas.wxs ShibbolethSP-main-x64.wxs ShibbolethS...

[noreply at shibboleth.net]

Author: rdw
Date: Tue May  8 16:09:02 2012
New Revision: 3649

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3649&view=rev
Log:
Part 2 of Add a Shibboleth-schemas merge modules

Added:
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs
Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
    branches/REL_2/msi/WiX/Versions.wxi

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs?rev=3649&r1=3648&r2=3649&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Tue May  8 16:09:02 2012
@@ -23,7 +23,7 @@
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
     <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <PropertyRef Id='SHIB_OLDVERSION_64'/>
     <PropertyRef Id='SHIB_OLDVERSION'/>
@@ -53,6 +53,7 @@
                SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />
         <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />
         <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />
         <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />
         <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />
         <Merge Id='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />
@@ -108,6 +109,7 @@
       <MergeRef Id='OpenSAMLMergeModule_schemas'/>
       <MergeRef Id='OpenSSLMergeModule_x86'/>
       <MergeRef Id='ShibbolethMergeModule_x86'/>
+      <MergeRef Id='ShibbolethMergeModule_schemas'/>
       <MergeRef Id='XercesMergeModule_x86'/>
       <MergeRef Id='XmlSecMergeModule_x86'/>
       <MergeRef Id='XmlToolingMergeModule_x86'/>

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs?rev=3649&r1=3648&r2=3649&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs Tue May  8 16:09:02 2012
@@ -23,15 +23,15 @@
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
     <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
 
     <PropertyRef Id='SHIB_OLDVERSION'/>
 
     <Condition Message='Shibboleth requires Windows XP SP2 or later.'>NOT VersionNT OR (VersionNT &gt;= 501)</Condition>
     <Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>
-    <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the &quot;Change&quot; option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>(SHIB_OLDVERSION = "none") AND (SHIB_OLDVERSION_64 = "none")</Condition>
+    <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the &quot;Change&quot; option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>SHIB_OLDVERSION = "none"</Condition>
 
-    <Condition Message='For a 32 installation on a 64 target, install the 64 msi and specify a 32 bit shibd'>NOT VersionNT64</Condition>
+    <Condition Message='For a 32 installation on a 64 architecture, install the 64bit msi but specify a 32 bit shibd'>NOT VersionNT64</Condition>
 
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
 
@@ -54,6 +54,7 @@
                SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />
         <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />
         <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />

[... 114 lines stripped ...]