479131 - ReleaseBuildFactory and ReleaseRepackFactory need to override MOZ_PKG_VERSION

Status: RESOLVED DUPLICATE of bug 464014

(Release Engineering :: General, defect, P2)

Description

[[e-mail] (:bhearsum)]

I just noticed that we don't override MOZ_PKG_VERSION at all in either of these factories. Most of the time this fine, because the version set in release_config.py is the same as the one in browser/config/version.txt, but when we get into RCs these will differ. We simply need to set MOZ_PKG_VERSION in the environment during packaging to fix this.

Comment 1

[Nick Thomas [:nthomas] (UTC+12)]

You mean use the likes of 3.1rc1 from appVersion in release_config, rather than the 3.1 in version.txt ?

Comment 2

[[e-mail] (:bhearsum)]

I think version = 3.1rc1 and appVersion = 3.1, actually, but yes. (http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/tools/release/configs/fx-moz19-bootstrap.cfg&rev=1.27)

Comment 3

[Nick Thomas [:nthomas] (UTC+12)]

Ah yes, what you said.

Comment 4

[[e-mail] (:bhearsum)]

Attachment: set MOZ_PKG_VERSION in ReleaseBuild and ReleaseRepack factories

Note that this will set MOZ_PKG_VERSION for any step that uses self.env. Since we manually bump version.txt there shouldn't be any way for this to infect that file. I did a quick test by doing:
export MOZ_PKG_VERSION="3.1rc1"
make package

and the package did indeed get named as 3.1rc1, and the internal version was still the version listed in version.txt. (3.1b3pre in this case, because we don't have any plain '3.1' trees).

Comment 5

[[e-mail] (:bhearsum)]

Argh, I just realized that the appVersion patch which is waiting to land does all of this already.