diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 10:47:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 10:47:28 +0000 |
| commit | a9a62dc3aa1e52f89acd2edef0daae070477586c (patch) | |
| tree | 0c677a2da355edf3be95b4ea264a5fc0ea59160e /solenv | |
| parent | 38eb3d56932aeb8980e1eb85acaf25c38e51b2b1 (diff) | |
INTEGRATION: CWS native188_DEV300 (1.14.160.1.2); FILE MERGED
2008/08/21 15:16:23 is 1.14.160.1.2.1: #i92952# ooo3 has to remove all older ooo3 products
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/windows/upgrade.pm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm index 4e3437939ba1..ed7e9e4a2553 100644 --- a/solenv/bin/modules/installer/windows/upgrade.pm +++ b/solenv/bin/modules/installer/windows/upgrade.pm @@ -8,7 +8,7 @@ # # $RCSfile: upgrade.pm,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # # This file is part of OpenOffice.org. # @@ -59,7 +59,13 @@ sub create_upgrade_table installer::windows::idtglobal::write_idt_header(\@upgradetable, "upgrade"); - my $newline = $installer::globals::upgradecode . "\t" . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "1" . "\t" . "\t" . "OLDPRODUCTS" . "\n"; + # Setting also $installer::globals::msimajorproductversion, that is for example "3.0.0", to differ between old products for OOo 2.x and + # older products from OOo 3.x. The latter must be removed always, the removal of the first is controlled with a checkbox. + my $newline = $installer::globals::upgradecode . "\t" . "\t" . $installer::globals::msimajorproductversion . "\t" . "\t" . "0" . "\t" . "\t" . "OLDPRODUCTS" . "\n"; + push(@upgradetable, $newline); + + # Setting all products, that must be removed. + $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msimajorproductversion . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "257" . "\t" . "\t" . "OLDPRODUCTSSAMEMAJOR" . "\n"; push(@upgradetable, $newline); if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack )) |