[ooo-build-commit] .: 2 commits - solenv/bin solenv/inc

[Fridrich Strba]

 solenv/bin/modules/installer/windows/upgrade.pm |    7 ++++---
 solenv/inc/minor.mk                             |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 266e567bccba70641b903d878be7985be0e772d9
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Oct 1 14:33:57 2010 +0200

    Setting build-id to 1 since now we are different product

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index d769c5b..86cdcb2 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
 RSCREVISION=330m7(Build:9526)
-BUILD=9526
+BUILD=1
 LAST_MINOR=m7
 SOURCEVERSION=OOO330
commit d52936487b0471ddd6d51bf0e4c7d8e5ca87d495
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Oct 1 14:31:35 2010 +0200

    Allow upgrading of the same version on windows
    
    Prevents the 'Same product is already installed' error when trying to reinstall a new binaries with the same build id

diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm
index 51f7f9a..8713dd5 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -61,7 +61,8 @@ sub create_upgrade_table
     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";
+    # $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msimajorproductversion . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "257" . "\t" . "\t" . "OLDPRODUCTSSAMEMAJOR" . "\n";
+    $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msimajorproductversion . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "769" . "\t" . "\t" . "OLDPRODUCTSSAMEMAJOR" . "\n";
     push(@upgradetable, $newline);
 
     if ( ! $installer::globals::patch )
@@ -70,8 +71,8 @@ sub create_upgrade_table
         $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msiproductversion . "\t" . $ooomaxnew . "\t" . "\t" . "2" . "\t" . "\t" . "NEWPRODUCTS" . "\n";
         push(@upgradetable, $newline);
 
-        $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msiproductversion . "\t" . $ooomaxnew . "\t" . "\t" . "258" . "\t" . "\t" . "SAMEPRODUCTS" . "\n";
-        push(@upgradetable, $newline);
+        # $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msiproductversion . "\t" . $ooomaxnew . "\t" . "\t" . "258" . "\t" . "\t" . "SAMEPRODUCTS" . "\n";
+        # push(@upgradetable, $newline);
 
         if ( $include_ooo_fix )
         {