XMI_FILE_VERSION in umbrello/version.h

[Oliver Kellogg]

On Wed, Sep 30, 2020 at 1:39 PM Ralf Habacker <ralf.habacker at freenet.de> wrote:
>
> Am 30.09.20 um 05:41 schrieb Oliver Kellogg:
> > On Mon, Sep 28, 2020 at 10:14 AM Ralf Habacker <ralf.habacker at freenet.de> wrote:
> >>> [...]
> >>> #if defined(ENABLE_WIDGET_SHOW_DOC) || defined(ENABLE_XMIRESOLUTION)
> >>> #define XMI_FILE_VERSION "1.6.19"
> >>> #else
> >>> #define XMI_FILE_VERSION "1.6.18"
> >>> #endif
> >>
> >> You need to increment each number.
> >
> > If I do that then we will have 1.6.19 in the #else case -
> > which redefines the meaning of that number because right now, 1.6.19
> > is in the #if case.
> >
> Because the mentioned features are enabled only in the master branch it
> says, that, after merging your changes into master, builds from that
> branch will at version 1.6.20, while builds from the stable branches
> (releases/20.08) are at 1.6.19, each on incremented by one. Is that a
> problem ?

It is a problem because given any XMI file with the version, such as 1.6.19,
we cannot tell whether the file is from a build using
#if defined(ENABLE_WIDGET_SHOW_DOC) || defined(ENABLE_XMIRESOLUTION)
or from a build using the #else part.
In other words, the number is ambiguous.

- Oliver