[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/windows/msiglobal.pm |   20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

New commits:
commit fb8c93b5aa90501bf33dffe075390cc7f1e71c22
Author: Andras Timar <atimar at suse.com>
Date:   Sat Dec 10 22:10:35 2011 +0100

    use PACKAGEVERSION as the base of MSI ProductVersion
    
    Formerly PRODUCTVERSION was used but that did not contain
    the microversion digit. It is better to have it in MSI
    ProductVersion, because a higher build number of a lower
    microversion looked newer from the MSI point of view, and
    update failed.
    
    MSI ProductVersion is now major.minor.micro.build, e.g.
    3.6.1.1206 (build number is taken from minor.mk)

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index a90698a..43e6ee3 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1805,27 +1805,11 @@ sub set_msiproductversion
 {
     my ( $allvariables ) = @_;
 
-    my $productversion = $allvariables->{'PRODUCTVERSION'};
-
-    if (( $productversion =~ /^\s*\d+\s*$/ ) && ( $productversion > 255 )) { $productversion = $productversion%256; }
+    my $productversion = $allvariables->{'PACKAGEVERSION'};
 
     if ( $productversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
     {
-        $productversion = $1 . "\." . $2 . $3 . "\." . $installer::globals::buildid;
-    }
-    elsif  ( $productversion =~ /^\s*(\d+)\.(\d+)\s*$/ )
-    {
-        $productversion = $1 . "\." . $2 . "\." . $installer::globals::buildid;
-    }
-    else
-    {
-        my $productminor = "00";
-        if (( $allvariables->{'PACKAGEVERSION'} ) && ( $allvariables->{'PACKAGEVERSION'} ne "" ))
-        {
-            if ( $allvariables->{'PACKAGEVERSION'} =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ ) { $productminor = $2; }
-        }
-
-        $productversion = $productversion . "\." . $productminor . "\." . $installer::globals::buildid;
+        $productversion = $1 . "\." . $2 . "\." . $3 . "\." . $installer::globals::buildid;
     }
 
     $installer::globals::msiproductversion = $productversion;