662277 - remove MOZILLA_BRANCH_VERSION hack from comm-central

Status: RESOLVED FIXED

(MailNews Core :: Build Config, defect)

Description

[Robert Kaiser]

Now that every comm-* repo corresponds to a single mozilla-* repo, we should remove the MOZILLA_BRANCH_VERSION hacks at least from comm-central, potentially even from -aurora and -beta (this includes removal of version-50.txt).

As a note, because we still are using this to determine different version numbers for our apps, I'll bump both version.txt and version-50.txt on comm-beta for SeaMonkey to have 2.2, so we can't get into problems there.

Comment 1

[Robert Kaiser]

Attachment: v1: remove all branch selection mechanics

This patch should do it. We could even land this on Aurora, but we should do it on trunk at least.

Comment 2

[Mark Banner (:standard8)]

Comment on attachment 540259 [details] [diff] [review]
v1: remove all branch selection mechanics

> changequote(,)
> MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\).*/\1/;'`
> changequote([,])
> 
>-dnl Set the Gecko branch version.
>-MOZILLA_5_0_BRANCH=
>-if test "$MOZILLA_BRANCH_VERSION" = "5.0"; then
>-    MOZILLA_5_0_BRANCH=1
>-    AC_DEFINE(MOZILLA_5_0_BRANCH)
>-fi
>-AC_SUBST(MOZILLA_5_0_BRANCH)

You can also kill the MOZILLA_BRANCH_VERSION and associated changequotes, as they were only used for determining the gecko version.

Given this looks just the same as the patch I'd done but forgotten to attach, r=me.

I wouldn't take this on aurora/other branches, as it doesn't actually by us anything, and we should be keeping the churn to a minimum on those branches.

Comment 3

[Robert Kaiser]

(In reply to comment #2)
> You can also kill the MOZILLA_BRANCH_VERSION and associated changequotes, as
> they were only used for determining the gecko version.

Er, right, somehow overlooked that, while I caught the definitions in the confvars.sh files.

> Given this looks just the same as the patch I'd done but forgotten to
> attach, r=me.

Thanks, will land with that.

> I wouldn't take this on aurora/other branches, as it doesn't actually by us
> anything, and we should be keeping the churn to a minimum on those branches.

OK, sure, just wanted to throw this out there - they'll be replaced with newer code within weeks anyhow. ;-)

Comment 4

[Robert Kaiser]

Pushed as http://hg.mozilla.org/comm-central/rev/b7462630a424