Closed Bug 662277 Opened 8 years ago Closed 8 years ago

remove MOZILLA_BRANCH_VERSION hack from comm-central

Categories

(MailNews Core :: Build Config, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
Thunderbird 7.0

People

(Reporter: kairo, Assigned: kairo)

Details

Attachments

(1 file)

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.
This patch should do it. We could even land this on Aurora, but we should do it on trunk at least.
Assignee: nobody → kairo
Status: NEW → ASSIGNED
Attachment #540259 - Flags: review?(mbanner)
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.
Attachment #540259 - Flags: review?(mbanner) → review+
(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. ;-)
Pushed as http://hg.mozilla.org/comm-central/rev/b7462630a424
Status: ASSIGNED → RESOLVED
Closed: 8 years ago
Resolution: --- → FIXED
Summary: remove MOZILLA_BRANCH_VERSION hack from comm-central (possibly -aurora, -beta) → remove MOZILLA_BRANCH_VERSION hack from comm-central
Target Milestone: --- → Thunderbird 7.0
You need to log in before you can comment on or make changes to this bug.