Update MSI packaging for ipptool release.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10855 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/vcnet/ipptool-installer.vdproj b/vcnet/ipptool-installer.vdproj
index 948299e88bb14a02c156f8d3d1c403c1ced720e3..45f9084a29a7ef825a98a1928cba9bb3db121b6b 100644 (file)
--- a/vcnet/ipptool-installer.vdproj
+++ b/vcnet/ipptool-installer.vdproj
@@ -27,6 +27,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_1DBDCFABB8DF28E5F75E41EDAE4BF6BE"\r
+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_1E4B2A9BD6A44926B719E0D7E8FC0952"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -57,32 +63,32 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_65CBD149C9DA448FBACE2B02766A6537"\r
+        "MsmKey" = "8:_4454D1BB58774F95972FB94388DC5E6A"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_6F893B2A3B7048CBA39359FC368BCA27"\r
+        "MsmKey" = "8:_46AB64FF360D4F309866FF5F49C65D88"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_7AFD2BBA568D45F5B1E871E2B93892BC"\r
-        "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
+        "MsmKey" = "8:_531A281ACDC6420D918E2A9FE97A2D42"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_7AFD2BBA568D45F5B1E871E2B93892BC"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmKey" = "8:_65CBD149C9DA448FBACE2B02766A6537"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_7AFD2BBA568D45F5B1E871E2B93892BC"\r
-        "OwnerKey" = "8:_E97571D3FBE048DABDC59B37762D800F"\r
+        "MsmKey" = "8:_6F893B2A3B7048CBA39359FC368BCA27"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -111,6 +117,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_9314DE98517C42E9AF190B67472408DF"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_9967519E7058965D4C7DEF47EB39CC50"\r
         "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -123,12 +135,24 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_AB0BD66B57BF4C41BE53BCE573C254BC"\r
+        "OwnerKey" = "8:_F208E348BAE54EDEA200755E5C149F13"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_AF057921D20E4520A3C6420F0729A744"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_B85BD013DC024B9E82862535191B405B"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_B9E79062FEF64745915546DDD5BF8D85"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -225,14 +249,26 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_F0AA062C769A4867B5C302491CA4F2D3"\r
-        "OwnerKey" = "8:_7AFD2BBA568D45F5B1E871E2B93892BC"\r
+        "MsmKey" = "8:_F16FA7F9826E461E955A95B2EEABA975"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_F16FA7F9826E461E955A95B2EEABA975"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13"\r
+        "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13"\r
+        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13"\r
+        "OwnerKey" = "8:_E97571D3FBE048DABDC59B37762D800F"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -378,6 +414,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1DBDCFABB8DF28E5F75E41EDAE4BF6BE"\r
+            {\r
+            "SourcePath" = "8:zlibwapi.dll"\r
+            "TargetName" = "8:zlibwapi.dll"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:TRUE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1E4B2A9BD6A44926B719E0D7E8FC0952"\r
             {\r
             "SourcePath" = "8:..\\test\\get-printer-attributes.test"\r
@@ -478,6 +534,66 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4454D1BB58774F95972FB94388DC5E6A"\r
+            {\r
+            "SourcePath" = "8:..\\test\\print-job-deflate.test"\r
+            "TargetName" = "8:print-job-deflate.test"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_EB00D0298C7E441EBD0257AC04FB3560"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_46AB64FF360D4F309866FF5F49C65D88"\r
+            {\r
+            "SourcePath" = "8:..\\test\\ipp-everywhere.test"\r
+            "TargetName" = "8:ipp-everywhere.test"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_EB00D0298C7E441EBD0257AC04FB3560"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_531A281ACDC6420D918E2A9FE97A2D42"\r
+            {\r
+            "SourcePath" = "8:..\\test\\get-notifications.test"\r
+            "TargetName" = "8:get-notifications.test"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_EB00D0298C7E441EBD0257AC04FB3560"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_65CBD149C9DA448FBACE2B02766A6537"\r
             {\r
             "SourcePath" = "8:..\\test\\testfile.ps"\r
@@ -598,6 +714,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9314DE98517C42E9AF190B67472408DF"\r
+            {\r
+            "SourcePath" = "8:..\\test\\get-subscriptions.test"\r
+            "TargetName" = "8:get-subscriptions.test"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_EB00D0298C7E441EBD0257AC04FB3560"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9967519E7058965D4C7DEF47EB39CC50"\r
             {\r
             "SourcePath" = "8:CRYPT32.dll"\r
@@ -658,6 +794,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B85BD013DC024B9E82862535191B405B"\r
+            {\r
+            "SourcePath" = "8:..\\test\\print-job-gzip.test"\r
+            "TargetName" = "8:print-job-gzip.test"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_EB00D0298C7E441EBD0257AC04FB3560"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B9E79062FEF64745915546DDD5BF8D85"\r
             {\r
             "SourcePath" = "8:..\\CHANGES-IPPTOOL.txt"\r
@@ -973,6 +1129,17 @@
             "Property" = "8:ProgramMenuFolder"\r
                 "Folders"\r
                 {\r
+                    "{9EF0B969-E518-4E46-987F-47570745A589}:_E379D4EDBAD0460BB876711E9062ADB4"\r
+                    {\r
+                    "Name" = "8:ipptool"\r
+                    "AlwaysCreate" = "11:FALSE"\r
+                    "Condition" = "8:"\r
+                    "Transitive" = "11:FALSE"\r
+                    "Property" = "8:_D115D2F4F12143B09D5FDA447A6A7D04"\r
+                        "Folders"\r
+                        {\r
+                        }\r
+                    }\r
                 }\r
             }\r
             "{1525181F-901A-416C-8A58-119130FE478E}:_D02CDADE99F344CF92CA1A8D0278861F"\r
@@ -1025,14 +1192,14 @@
         {\r
         "Name" = "8:Microsoft Visual Studio"\r
         "ProductName" = "8:ipptool for Windows"\r
-        "ProductCode" = "8:{8220ED6C-8FAC-4E28-8589-867295E2A23D}"\r
-        "PackageCode" = "8:{B78F9AC6-92F9-48FF-AA11-ECD929442B4A}"\r
+        "ProductCode" = "8:{BADD3454-4180-4519-B1CA-5C255DAB0047}"\r
+        "PackageCode" = "8:{3C801C7B-F294-47ED-9146-D35C6B48C3B9}"\r
         "UpgradeCode" = "8:{BAB6EBBB-515D-4155-9FEF-D98DA76814CA}"\r
         "RestartWWWService" = "11:FALSE"\r
         "RemovePreviousVersions" = "11:TRUE"\r
         "DetectNewerInstalledVersion" = "11:TRUE"\r
         "InstallAllUsers" = "11:TRUE"\r
-        "ProductVersion" = "8:12.02.0600"\r
+        "ProductVersion" = "8:13.01.3100"\r
         "Manufacturer" = "8:Apple Inc."\r
         "ARPHELPTELEPHONE" = "8:"\r
         "ARPHELPLINK" = "8:http://www.cups.org/str.php"\r
@@ -1153,6 +1320,48 @@
         }\r
         "Shortcut"\r
         {\r
+            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_63715171338D40FFBC5B47A1418B4814"\r
+            {\r
+            "Name" = "8:README"\r
+            "Arguments" = "8:"\r
+            "Description" = "8:"\r
+            "ShowCmd" = "3:1"\r
+            "IconIndex" = "3:0"\r
+            "Transitive" = "11:FALSE"\r
+            "Target" = "8:_AF057921D20E4520A3C6420F0729A744"\r
+            "Folder" = "8:_E379D4EDBAD0460BB876711E9062ADB4"\r
+            "WorkingFolder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Icon" = "8:"\r
+            "Feature" = "8:"\r
+            }\r
+            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_70CF74DB997A408DBBFD48AB10F92321"\r
+            {\r
+            "Name" = "8:ipptool Documentation"\r
+            "Arguments" = "8:"\r
+            "Description" = "8:"\r
+            "ShowCmd" = "3:1"\r
+            "IconIndex" = "3:0"\r
+            "Transitive" = "11:FALSE"\r
+            "Target" = "8:_D5CD9D9AB1644688A1D54B1589BDF724"\r
+            "Folder" = "8:_E379D4EDBAD0460BB876711E9062ADB4"\r
+            "WorkingFolder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Icon" = "8:"\r
+            "Feature" = "8:"\r
+            }\r
+            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_BD2A7DF74D844FF5919EE8340EE36ECD"\r
+            {\r
+            "Name" = "8:Test File Documentation"\r
+            "Arguments" = "8:"\r
+            "Description" = "8:"\r
+            "ShowCmd" = "3:1"\r
+            "IconIndex" = "3:0"\r
+            "Transitive" = "11:FALSE"\r
+            "Target" = "8:_1A1324305D78463BBFC62269C56DCF0B"\r
+            "Folder" = "8:_E379D4EDBAD0460BB876711E9062ADB4"\r
+            "WorkingFolder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Icon" = "8:"\r
+            "Feature" = "8:"\r
+            }\r
         }\r
         "UserInterface"\r
         {\r
@@ -1549,11 +1758,11 @@
         }\r
         "MergeModule"\r
         {\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7AFD2BBA568D45F5B1E871E2B93892BC"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_AB0BD66B57BF4C41BE53BCE573C254BC"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"\r
+            "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"\r
                 "Properties"\r
                 {\r
                 }\r
@@ -1563,11 +1772,11 @@
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F0AA062C769A4867B5C302491CA4F2D3"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F208E348BAE54EDEA200755E5C149F13"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"\r
+            "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"\r
                 "Properties"\r
                 {\r
                 }\r