Closed Bug 445146 Opened 11 years ago Closed 11 years ago

Move editor/ui from mozilla-central to comm-central

Categories

(MailNews Core :: Build Config, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla1.9.1b1

People

(Reporter: kairo, Assigned: standard8)

References

Details

Attachments

(3 files, 2 obsolete files)

editor/ui contains the compose part of mail and the SeaMonkey composer, this should probably move over from mozilla-central to comm-central in the future.
Depends on: 447636
This is blocking compare-locales for mail and suite, I suggest to get this done before trying to do l10n builds on those.
I'll see if I can knock up a quick patch tonight.
Assignee: nobody → bugzilla
(In reply to comment #1)
> This is blocking compare-locales for mail and suite, I suggest to get this done
> before trying to do l10n builds on those.

Actually, I'm pretty sure doing L10n builds and having compare-locales run are orthogonal and do NOT block each other.
This is the list of editor files to move, generated from a mozilla-central patch. I can attach the full patches if you really want me to, but I doubt it.

Build config patches coming up in a moment.
Attachment #335950 - Flags: superreview?(neil)
Attachment #335950 - Flags: review?(neil)
These are the build changes to comm-central, note: to be applied after moving the files (if you want the patches to test, let me know).
Attachment #335951 - Flags: review?(kairo)
Attached patch mozilla-central changes (obsolete) — Splinter Review
The very minimal mozilla-central build changes.
Attachment #335952 - Flags: review?(ted.mielczarek)
Comment on attachment 335952 [details] [diff] [review]
mozilla-central changes

I just realised, editor/composer shouldn't be within the MOZ_COMPOSER if statement. Additionally, MOZ_COMPOSER is essentially redundant in mozilla-central with this move of editor/ui. Therefore we should just drop it as well.
Attachment #335952 - Flags: review?(ted.mielczarek) → review-
(In reply to comment #7)
> (From update of attachment 335952 [details] [diff] [review])
> I just realised, editor/composer shouldn't be within the MOZ_COMPOSER if
> statement. Additionally, MOZ_COMPOSER is essentially redundant in
> mozilla-central with this move of editor/ui. Therefore we should just drop it
> as well.

From Thunderbird, yes - but I think we still will want to be able to build SeaMonkey with --disable-composer (probably along with --disable-mailnews).
(In reply to comment #8)
> (In reply to comment #7)
> > (From update of attachment 335952 [details] [diff] [review] [details])
> > I just realised, editor/composer shouldn't be within the MOZ_COMPOSER if
> > statement. Additionally, MOZ_COMPOSER is essentially redundant in
> > mozilla-central with this move of editor/ui. Therefore we should just drop it
> > as well.
> 
> From Thunderbird, yes - but I think we still will want to be able to build
> SeaMonkey with --disable-composer (probably along with --disable-mailnews).

This won't affect the comm-central apps. It will just mean that mozilla-central configure will no longer have a --disable-composer option. The comm-central one will remain untouched.
Ah, right, you wrote *mozilla*-central, not *comm*-central. In that case, sure, MOZ_COMPOSER is probably obsolete there.
Attached patch mozilla-central changes v2 (obsolete) — Splinter Review
Updated patch for the mozilla-central changes. This removes the --disable-composer option from the mozilla-central configure.in, and sorts out some inaccuracies in toolkit-makefiles.sh (as well as removing the unneeded options).
Attachment #335952 - Attachment is obsolete: true
Attachment #336197 - Flags: review?(ted.mielczarek)
Product: SeaMonkey → MailNews Core
QA Contact: build-config → build-config
Attachment #335951 - Flags: review?(kairo) → review+
Comment on attachment 335951 [details] [diff] [review]
[checked in] comm-central build changes

>diff --git a/mail/build.mk b/mail/build.mk
>--- a/mail/build.mk
>+++ b/mail/build.mk
>@@ -56,6 +54,10 @@ ifdef MOZ_LDAP_XPCOM
> ifdef MOZ_LDAP_XPCOM
> tier_app_staticdirs += directory/c-sdk
> tier_app_dirs += directory/xpcom
>+endif
>+
>+ifdef MOZ_COMPOSER
>+tier_app_dirs += editor/ui
> endif

I don't think Thunderbird wants to make anything |ifdef MOZ_COMPOSER|, mailnews doesn't work without MOZ_COMPOSER and such ifdefs haven't been in Thunderbird-specific code for some time from what I've seen.

I haven't actually tested the code, but it looks good to me.
Comment on attachment 336197 [details] [diff] [review]
mozilla-central changes v2

http://mxr.mozilla.org/comm-central/source/mozilla/config/autoconf.mk.in#125 probably should also be deleted
Attachment #335950 - Flags: superreview?(neil)
Attachment #335950 - Flags: superreview+
Attachment #335950 - Flags: review?(neil)
Attachment #335950 - Flags: review+
Comment on attachment 335950 [details] [diff] [review]
[checked in] Editor Files to move

I'm assuming here you meant to include the images too but because they're binary they didn't show up in a normal diff.
(In reply to comment #14)
> (From update of attachment 335950 [details] [diff] [review])
> I'm assuming here you meant to include the images too but because they're
> binary they didn't show up in a normal diff.

They did in the git diff, but I grepped wrong.
Include the config/autoconf.mk.in change
Attachment #336197 - Attachment is obsolete: true
Attachment #336261 - Flags: review?(ted.mielczarek)
Attachment #336197 - Flags: review?(ted.mielczarek)
Attachment #336261 - Flags: review?(ted.mielczarek) → review+
Comment on attachment 335950 [details] [diff] [review]
[checked in] Editor Files to move

Checked in.

comm-central changeset id: 250:ee719a050249
mozilla-central changeset id: 18735:c0e82e7f2412
Attachment #335950 - Attachment description: Editor Files to move → [checked in] Editor Files to move
Attachment #335951 - Attachment description: comm-central build changes → [checked in] comm-central build changes
Attachment #336261 - Attachment description: mozilla-central changes v3 → [checked in] mozilla-central changes v3
Status: NEW → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla1.9.1b1
You need to log in before you can comment on or make changes to this bug.