Changeset: a725ea43bf8c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a725ea43bf8c Modified Files: NT/installer32/cv64-32.sh NT/installer64/cv32-64.sh Branch: Jan2014 Log Message:
Properly maintain UpgradeCode. diffs (24 lines): diff --git a/NT/installer32/cv64-32.sh b/NT/installer32/cv64-32.sh --- a/NT/installer32/cv64-32.sh +++ b/NT/installer32/cv64-32.sh @@ -25,5 +25,7 @@ sed -i -e '/TargetPlatform/s/3:1/3:0/' \ -e 's/C:\\\\Program Files.*\\\\Common Files\\\\Merge Modules\\\\Microsoft_VC100_CRT_x64.msm/C:\\\\Program Files\\\\Common Files\\\\Merge Modules\\\\Microsoft_VC100_CRT_x86.msm/' \ -e 's/"ProductCode" = "8:{.*/"ProductCode" = "8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"/' \ -e 's/"PackageCode" = "8:{.*/"PackageCode" = "8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"/' \ - -e 's/"UpgradeCode" = "8:{.*/"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"/' \ + -e 's/"UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"/"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"/' \ + -e 's/"UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"/"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"/' \ + -e 's/"UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}"/"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"/' \ *.vdproj diff --git a/NT/installer64/cv32-64.sh b/NT/installer64/cv32-64.sh --- a/NT/installer64/cv32-64.sh +++ b/NT/installer64/cv32-64.sh @@ -25,5 +25,7 @@ sed -i -e '/TargetPlatform/s/3:0/3:1/' \ -e 's/C:\\\\Program Files.*\\\\Common Files\\\\Merge Modules\\\\Microsoft_VC100_CRT_x86.msm/C:\\\\Program Files\\\\Common Files\\\\Merge Modules\\\\Microsoft_VC100_CRT_x86_x64.msm/' \ -e 's/"ProductCode" = "8:{.*/"ProductCode" = "8:{ACC32EDD-13CE-4079-A6E7-D9DD94DA42EE}"/' \ -e 's/"PackageCode" = "8:{.*/"PackageCode" = "8:{332EB6D8-73DD-48CA-83E7-BB1922FFE3BD}"/' \ - -e 's/"UpgradeCode" = "8:{.*/"UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}"/' \ + -e 's/"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"/"UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"/' \ + -e 's/"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"/"UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"/' \ + -e 's/"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"/"UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}"/' \ *.vdproj _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list