Closed Bug 560007 Opened 10 years ago Closed 9 years ago

Remove ifdefs relating to MOZILLA_1_9_2 from generic build config

Categories

(MailNews Core :: Build Config, defect, minor)

defect
Not set
minor

Tracking

(thunderbird3.1 wontfix, thunderbird3.0 unaffected)

RESOLVED FIXED
Tracking Status
thunderbird3.1 --- wontfix
thunderbird3.0 --- unaffected

People

(Reporter: Callek, Assigned: Callek)

References

Details

Attachments

(1 file)

Once c-c branches to 1.9.2 (which will be soon) we need to remove the MOZILLA_1_9_2 ifdefs throughout.

Calendar/ and mail/ (and mailnews/) ifdefs will come later, to ensure easier merging for the time being.
Attached patch Just do itSplinter Review
Just do it; feedback from serge for a first-pass review please.
Attachment #439673 - Flags: feedback?(sgautherie.bz)
Target Milestone: --- → Future
Comment on attachment 439673 [details] [diff] [review]
Just do it


Ask me again when bug 544237 is fixed: I won't look at it before.
Attachment #439673 - Flags: feedback?(sgautherie.bz)
I set the status flags the way I did on purpose.

(In reply to comment #2)
> (From update of attachment 439673 [details] [diff] [review])
> 
> Ask me again when bug 544237 is fixed: I won't look at it before.

This is to be happening within the week: https://mail.mozilla.org/pipermail/tb-planning/2010-April/000102.html

Which is why I filed and wrote the patch.
Attachment #439673 - Flags: feedback?(sgautherie.bz)
(In reply to comment #3)

> I set the status flags the way I did on purpose.

As you like, but I'm really ignoring this request per my comment 2.

> This is to be happening within the week:
> https://mail.mozilla.org/pipermail/tb-planning/2010-April/000102.html

(I didn't know, that's good news!)
Ping me again when that's actually done.
Status: NEW → ASSIGNED
Target Milestone: Future → ---
Comment on attachment 439673 [details] [diff] [review]
Just do it

After a quick look:

>diff --git a/Makefile.in b/Makefile.in
>-# defined in (mozilla/.../)package-name.mk
> export MOZ_SOURCE_STAMP

Keep the comment.

>diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
>-MOZILLA_1_9_2_BRANCH = @MOZILLA_1_9_2_BRANCH@

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

Maybe we could just disable (rather than remove) these, as we'll need them again next time m-c branches?
(Or even just update them to 1.9.3...)

>-dnl Default to MSVC for win32 and gcc-4.2 for darwin (on !MOZILLA_1_9_2_BRANCH)
>-dnl ==============================================================

Remove " (on !MOZILLA_1_9_2_BRANCH)" only.

>-    if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
>-    TK_LIBS='-framework Carbon -framework AddressBook'
>-    else
>     TK_LIBS='-framework QuartzCore -framework Carbon -framework AddressBook'
>     fi

Remove 'fi' too.
Attachment #439673 - Flags: feedback?(sgautherie.bz) → feedback+
(In reply to comment #5)
> Maybe we could just disable (rather than remove) these, as we'll need them
> again next time m-c branches?
> (Or even just update them to 1.9.3...)

I'm for removing. When we need it again (in changed form anyhow for the new version), it's trivial to look up hg history to find this removal.
Comment on attachment 439673 [details] [diff] [review]
Just do it

Pretend all of serge's nits [except "Maybe we could just disable (rather than remove) "] are addressed.

If you would rather (or just plain need) an updated patch I'll get to it within 24hr
Attachment #439673 - Flags: review?(kairo)
Comment on attachment 439673 [details] [diff] [review]
Just do it

I haven't actually tried building with this, so make sure you watch for bustages when landing, but it looks good from code inspection.
Attachment #439673 - Flags: review?(kairo) → review+
Pushed as: http://hg.mozilla.org/comm-central/rev/877fe35a43f1
Status: ASSIGNED → RESOLVED
Closed: 9 years ago
Resolution: --- → FIXED
Blocks: 566167
Blocks: 570902
You need to log in before you can comment on or make changes to this bug.