Re: [REVIEW:3-5]LibreOffice Version Mismatch/Conflict

Andras Timar píše v Po 02. 04. 2012 v 16:58 +0200:
> In order to fully utilize Windows installer capabilities, files should
> be versioned properly. We have not reached this goal yet with 3.5, but
> we are closer. In 3.4 and earlier versions file versioning was messy.
> This was resolved by
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=3fbedc3e8f65c91999dcee42daa8312e387dcf40
> Currently VERSIONMICRO is used only in the VersionInfo resource of
> executables under Windows.

Sounds promissing.

> > How the windows installer distinguish the build version these days? Does
> > it use the VERSIONMAJOR+VERSIONMINOR+VERSIONMICRO? Could we restart
> > buildid for each bugfix release and get the following?
> >
> >        buildid 1 for rc1
> >        buildid 2 for rc2
> >
> > The we could have in the about dialog what we use now:
> >
> >      3.5.1.1 for 3.5.1-rc1
> >      3.5.1.2 for 3.5.1-rc2
> >      3.5.2.1 for 3.5.2-rc1
>
> I fully agree with this versioning scheme. 3.5.3.1 will be higher than
> 3.5.2.202, so upgrade will happen. Note, that we cannot do this for a
> hypothetical 3.5.2 rc3, because 3.5.2.3 would be lower than 3.5.2.202.

This should be done by the attached patch. Andrash, could you please
give it a try? Is it OK for you to push it?

I am slightly scared by resetting the buildid to 0. Well, I think that
it was used only for the windows installer and also as release number
for linux packages. They both should have the version 3.5.3 that is
higher than 3.5.2 and it should work fine.


Best Regards,
Petr

From 3b4f4ee2ead4ff77bb530862bc42a2fb5cd5be94 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Thu, 5 Apr 2012 11:24:07 +0200
Subject: [PATCH] match version in about dialog and file properties
 (bnc#47840)

bump VERSIONMICRO to 3 and reset buildid to 0
---
 solenv/inc/minor.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 0b94955..fdd3cd2 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,11 +1,11 @@
 RSCVERSION=350
-RSCREVISION=350m1(Build:300)
-BUILD=300
+RSCREVISION=350m1(Build:0)
+BUILD=0
 LAST_MINOR=m1
 SOURCEVERSION=OOO350
 
 VERSIONMAJOR=3
 VERSIONMINOR=5
-VERSIONMICRO=0
+VERSIONMICRO=3
 
 COPYRIGHTYEARRANGE=2000-2012
-- 
1.7.8.3