179565 - configure and milestone.txt have an inconsistent milestone.

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, defect)

Description

[Aleksey Nogin]

I did 
egrep -r '1\.(2b|3a)'
in Mozilla sources (checked out of CVS around 2002111023  - e.g. 12 hours ago)
and found some weird results.

1) Really annoying:

> configure:MOZILLA_VERSION='1.2b'
> configure.in:MOZILLA_VERSION='1.2b'
> config/milestone.txt:1.3a

This IMHO is pretty bad. In particular, this way we build Mozilla that calls
itself 1.3a, but is installed into .../lib/mozilla-1.2b! Shouldn't configure
take the version off milestone.txt for consistency?

2) A few others that can be potentially inconsistent (not sure):

> xpinstall/packager/win_mfcembed/runapp.bat:set GRE_VERSION=1.3a
> embedding/qa/testembed/winEmbedFileLocProvider.cpp:    strcpy(szKey,
"Software\\Mozilla\\GRE\\1.2b");
> /embedding/tests/mfcembed/winEmbedFileLocProvider.cpp:    strcpy(szKey,
"Software\\mozilla.org\\GRE\\1.3a");

and

> xpinstall/wizard/mac/rsrc/MacInstallerVersion.r:        "1.2b",              
// short version string
> xpinstall/wizard/mac/rsrc/MacInstallerVersion.r:        "Mozilla 1.2b
Installer"      // long version string
> xpinstall/wizard/os2/builder/build.pl:$verPartial    = "1.2b.0.";
> xpinstall/wizard/windows/builder/build_gre.pl:$verPartial    = "1.3a.0.";

Comment 1

[Jon Granrose]

I wasn't even aware there was a version number in configure.  When did that
happen?  Who usually updates it?

We're still in the process of updating other versions in the tree to 1.3a so
those other files should be changed over the coming week as r/sr/a comes in. 
Kyle's tracking those changes.

Comment 2

[hacker formerly known as [e-mail]]

The configure.in's milestone variable predated milestone.txt by quite a bit.  We
have discussed pulling the info from milestone.txt once it became the standard
but we haven't gotten around to it.

Comment 3

[Aki Sasaki]

i've gotta change commercial milestone.txt to allow for multiple settings
anyway.  should i just change milestone.txt to be a sourceable bourne shell
script which my perl module can parse and configure can '.'?

Comment 4

[hacker formerly known as [e-mail]]

That's not necessary.  We can just assign the MOZILLA_VERSION variable in
config.mk using the perl script.

Comment 5

[hacker formerly known as [e-mail]]

Attachment: Fix & call milestone.pl from configure.in

Comment 6

[hacker formerly known as [e-mail]]

Patch has been checked in.