Patch files for two architectures

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3837 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/msi/WiX/Patch-x64.wxs b/msi/WiX/Patch-x64.wxs
new file mode 100644 (file)
index 0000000..49f3a4e
--- /dev/null
+++ b/msi/WiX/Patch-x64.wxs
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
+    <PatchCreation\r
+        Id="{5BCA9365-B963-4B1A-BD7A-C1558BDE79EE}"\r
+        CleanWorkingFolder="yes"\r
+        OutputPath="patch.pcp"\r
+        WholeFilesOnly="yes"\r
+        >\r
+\r
+    <!-- Information oput into the summary (Details) field -->\r
+ \r
+        <PatchInformation \r
+            Description="Security Patch for Shibboleth SP 2.5.1 (x64)"\r
+            Comments="OpenSAML version to 2.5.2" \r
+            ShortNames="no" \r
+            Languages="1033" \r
+            Compressed="yes" \r
+            Manufacturer="Shibboleth Consortium"/>\r
+ \r
+    <!-- Recommended values for 'Classification' are\r
+         Critical Update, Hotfix, Security Rollup, Security Update, Service Pack, Update, Update Rollup. \r
+\r
+         DisplayName goes into the Name Column for "View installed updates" in control panel's "Porgram and Feature".\r
+      -->\r
+\r
+        <PatchMetadata\r
+            AllowRemoval="yes"\r
+            Description="Security Patch for Shibboleth SP 2.5.1 (x64)"\r
+            ManufacturerName="Shibboleth Consortium"\r
+            TargetProductName="Shibboleth SP"\r
+            MoreInfoURL="http://www.shibboleth.net/"\r
+            Classification="Update"\r
+            DisplayName="Security Patch for Shibboleth SP 2.5.1 10-Jan-2013"/>\r
+ \r
+    <!-- Note:\r
+         That SequenceStart must be greater than the last\r
+         sequence in the File table in the target package or the patch\r
+         will not install. -->\r
+\r
+\r
+        <Family DiskId="5000"\r
+            MediaSrcProp="Sample" \r
+            Name="Sample"\r
+            SequenceStart="5000">\r
+            <UpgradeImage SourceFile="C:\foo\PatchSp\x64\new\new.msi" Id="Upgrade">\r
+                <TargetImage SourceFile="C:\foo\PatchSp\x64\old\old.msi" Order="2"      \r
+                    Id="Target" IgnoreMissingFiles="no" />\r
+            </UpgradeImage>\r
+        </Family> \r
+    <!-- Supersede:  Set this value to 'yes' to indicate that this patch will\r
+         supersede all previous patches in this patch family.  The\r
+         default value is 'no'. \r
+         \r
+         PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed\r
+      -->\r
+\r
+        <PatchSequence PatchFamily="ShibbolethSPPatchFamily"\r
+            Sequence="1.0.0.0"\r
+            Supersede="yes" />\r
+ \r
+    </PatchCreation>\r
+</Wix>\r

diff --git a/msi/WiX/Patch-x86.wxs b/msi/WiX/Patch-x86.wxs
new file mode 100644 (file)
index 0000000..46f8960
--- /dev/null
+++ b/msi/WiX/Patch-x86.wxs
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
+    <PatchCreation\r
+        Id="{91DB241C-5491-4405-BFAD-E91F7E9BB948}"\r
+        CleanWorkingFolder="yes"\r
+        OutputPath="patch.pcp"\r
+        WholeFilesOnly="yes"\r
+        >\r
+ \r
+    <!-- Information put into the summary (Details) field -->\r
+\r
+        <PatchInformation \r
+            Description="Security Patch for Shibboleth SP 2.5.1 (x86)"\r
+            Comments="OpenSAML version to 2.5.2" \r
+            ShortNames="no" \r
+            Languages="1033" \r
+            Compressed="yes" \r
+            Manufacturer="Shibboleth Consortium"/>\r
+ \r
+    <!-- Recommended values for 'Classification' are\r
+         Critical Update, Hotfix, Security Rollup, Security Update, Service Pack, Update, Update Rollup. \r
+\r
+         DisplayName goes into the Name Column for "View installed updates" in control panel's "Porgram and Feature".\r
+      -->\r
+\r
+        <PatchMetadata\r
+            AllowRemoval="yes"\r
+            Description="Security Patch for Shibboleth SP 2.5.1 (x86)"\r
+            ManufacturerName="Shibboleth Consortium"\r
+            TargetProductName="Shibboleth SP"\r
+            MoreInfoURL="http://www.shibboleth.net/"\r
+            Classification="Update"\r
+            DisplayName="Security Patch for Shibboleth SP 2.5.1 10-Jan-2013"/>\r
+ \r
+    <!-- Note:\r
+         That SequenceStart must be greater than the last\r
+         sequence in the File table in the target package or the patch\r
+         will not install. -->\r
+\r
+        <Family DiskId="5000"\r
+            MediaSrcProp="Sample" \r
+            Name="Sample"\r
+            SequenceStart="5000">\r
+            <UpgradeImage SourceFile="C:\foo\PatchSp\x86\new\new.msi" Id="Upgrade">\r
+                <TargetImage SourceFile="C:\foo\PatchSp\x86\old\old.msi" Order="2"      \r
+                    Id="Target" IgnoreMissingFiles="no" />\r
+            </UpgradeImage>\r
+        </Family>\r
+ \r
+    <!-- Supersede:  Set this value to 'yes' to indicate that this patch will\r
+         supersede all previous patches in this patch family.  The\r
+         default value is 'no'. \r
+         \r
+         PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed\r
+      -->\r
+\r
+        <PatchSequence PatchFamily="ShibbolethSPPatchFamily"\r
+            Sequence="1.0.0.0"\r
+            Supersede="yes" />\r
+ \r
+    </PatchCreation>\r
+</Wix>\r

diff --git a/msi/WiX/Patch.wxs b/msi/WiX/Patch.wxs
deleted file mode 100644 (file)
index 279ba2a..0000000
--- a/msi/WiX/Patch.wxs
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <PatchCreation
-     Id='{1E09E74F-D547-464B-80B7-1FF63C496BAB}'
-     CleanWorkingFolder='yes'
-     OutputPath='patch.pcp'
-     WholeFilesOnly='yes'
-     >
-    
-    <!-- Information oput into the summary (Details) field -->
-    <PatchInformation 
-       Description='This patch does something' 
-       Comments='comments' 
-       Manufacturer='Shibboleth Consortium'/>
-    
-    <!-- Recommended values for 'Classification' are
-         Critical Update, Hotfix, Security Rollup, Security Update, Service Pack, Update, Update Rollup. 
-
-         DisplayName goes into the Name Column for "View installed updates" in control panel's "Porgram and Feature".
-      -->
-    <PatchMetadata
-       AllowRemoval='yes'
-       Description='This patch does something'
-       ManufacturerName='Shibboleth Consortium'
-       TargetProductName='Shibboleth SP Version'
-       MoreInfoURL='http://www.shibboleth.net/secadv/bla/bla'
-       Classification='Update' 
-       DisplayName='Shibboleth Patch sevadv blabla'/> 
-    
-    <!-- Note:
-         That SequenceStart must be greater than the last
-         sequence in the File table in the target package or the patch
-         will not install. -->
-
-    <Family DiskId='5000'
-            MediaSrcProp='Sample' 
-            Name='Sample'
-            SequenceStart='5000'>
-      <UpgradeImage SourceFile='C:\My Downloads\shib\SPInst\patch\251\admin\ShibbolethSP-main-x64.msi' Id='SampleUpgrade'>
-        <TargetImage SourceFile='C:\My Downloads\shib\SPInst\patch\250\admin\ShibbolethSP-main-x64.msi' Order='2'      
-                     Id='SampleTarget' IgnoreMissingFiles='no' />
-      </UpgradeImage>
-    </Family>
-    
-    <!-- Supersede:  Set this value to 'yes' to indicate that this patch will
-         supersede all previous patches in this patch family.  The
-         default value is 'no'. 
-         
-         PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed
-      -->
-
-    <PatchSequence PatchFamily='SamplePatchFamily'
-                   Sequence='1.0.0.0'
-                   Supersede='no' />
-    
-  </PatchCreation>
-</Wix>