Closed Bug 506493 (C192ConfSync) Opened 11 years ago Closed 9 years ago

Resync' configure.in between comm-central (= comm-1.9.2) and mozilla-central

Categories

(MailNews Core :: Build Config, defect)

defect
Not set
trivial

Tracking

(Not tracked)

RESOLVED FIXED
Thunderbird 3.1b2

People

(Reporter: sgautherie, Assigned: sgautherie)

References

(Blocks 1 open bug, )

Details

(Keywords: meta)

Attachments

(14 files, 6 obsolete files)

1.69 KB, patch
Callek
: review+
Callek
: feedback+
Details | Diff | Splinter Review
1.63 KB, patch
Callek
: review+
Details | Diff | Splinter Review
1.31 KB, patch
Callek
: review+
Details | Diff | Splinter Review
1.04 KB, patch
Callek
: review+
Details | Diff | Splinter Review
1.02 KB, patch
Callek
: review+
Details | Diff | Splinter Review
1.88 KB, patch
Callek
: review+
Details | Diff | Splinter Review
2.75 KB, patch
standard8
: review+
Details | Diff | Splinter Review
797 bytes, patch
Callek
: review+
Details | Diff | Splinter Review
1.35 KB, patch
Callek
: review+
Details | Diff | Splinter Review
1.03 KB, patch
Callek
: review+
Details | Diff | Splinter Review
1.15 KB, patch
Callek
: review+
Details | Diff | Splinter Review
4.49 KB, patch
Callek
: review+
Details | Diff | Splinter Review
3.16 KB, patch
Callek
: review+
Details | Diff | Splinter Review
2.52 KB, patch
Callek
: review+
Details | Diff | Splinter Review
[To be done after branching to m-c from m-1.9.1.]
Depends on: 508760
Depends on: 508156
Blocks: 514215
Depends on: 534408
Depends on: 535231
Depends on: 537874
Depends on: 538747
Target Milestone: Future → ---
Depends on: 535469
Depends on: 540470
Depends on: 538837
Depends on: 536678
Blocks: 512490
Depends on: 541991
Depends on: 542283
Depends on: 542291
Depends on: 542297
Alias: CcConfSync
Depends on: 542692
Depends on: 542767
Depends on: 542770
Depends on: 542779
Depends on: 542786
Depends on: 543159
Depends on: 543212
Depends on: 543230
Depends on: 543380
Depends on: 543382
Depends on: 543893
Depends on: 544172
Depends on: 545055
Depends on: 545057
Depends on: 545058
Depends on: 543294
Depends on: 545133
Depends on: 543295
Depends on: 543296
Depends on: 545313
Depends on: 545320
Depends on: 545343
No longer depends on: 545133
Depends on: 509147
Depends on: 545594
Depends on: 546065
Depends on: 487956
Depends on: 481584
Depends on: 514787
Depends on: 541966
Depends on: 546177
Depends on: 543297
Depends on: 482277
Depends on: 485405
Depends on: 541203
Depends on: 492026
Depends on: 547518
Depends on: 548210
Depends on: 463417, 505289, 509249
Depends on: 509179
Depends on: 505739
Depends on: 548670
No longer depends on: 548670
Depends on: 517559
Depends on: 525331
Depends on: 549129
Depends on: 549293
Depends on: 511791
Depends on: 506845
Depends on: 505504
Depends on: 512504
NB: I have no idea if we could remove more code...
Assignee: nobody → sgautherie.bz
Status: NEW → ASSIGNED
Attachment #430123 - Flags: review?(bugspam.Callek)
Depends on: 518107
Depends on: 518641
Depends on: 520224
Depends on: 517557
Depends on: 547375
Comment on attachment 430123 [details] [diff] [review]
(Av1) Copy bug 512504, Remove useless AC_DEFINE(HAVE_LIBDL), (m-1.9.2+)
[Checkin: Comment 50]

>-        AC_DEFINE(HAVE_LIBDL)))
>+        ))

Please explain what this change is all about/for.
Depends on: 524139
Depends on: 538753
Depends on: 518401
No longer depends on: 518401
Depends on: 550657
Depends on: 520359
Depends on: 524554
Depends on: 521750
Depends on: 514519
Depends on: 549246
Attached patch (Dv1) Port bug 549246 (1.9.2+) (obsolete) — Splinter Review
Attachment #431902 - Flags: review?(bugspam.Callek)
Depends on: 547915
No longer depends on: 547915
Depends on: 536567
Depends on: NoC192SM
Attachment #431902 - Flags: review?(bugspam.Callek) → review?(bugzilla)
Attachment #432023 - Flags: review?(bugspam.Callek)
No longer depends on: 521750
Depends on: 545755
Attachment #432138 - Flags: review?(bugspam.Callek)
Depends on: 529319
Attachment #432139 - Flags: review?(bugspam.Callek)
Comment on attachment 430123 [details] [diff] [review]
(Av1) Copy bug 512504, Remove useless AC_DEFINE(HAVE_LIBDL), (m-1.9.2+)
[Checkin: Comment 50]

serge, can you please file a bug on the AC_DEFINE(LIBDL) removal from m-c. or remind me in IRC later and I'll do it. I'd like to stay in sync, but this can land as-is.
Attachment #430123 - Flags: review?(bugspam.Callek) → review+
Comment on attachment 430939 [details] [diff] [review]
(Bv1) Copy (the useful part of) changeset db2c3e1c7d28
[Checkin: Comment 13]

Ironically we are flipping the configure.in value of this to "true" but our confvars actually *all* set it to false. For simplicity sake of staying in sync, I'm all for this
Attachment #430939 - Flags: review?(bugspam.Callek) → review+
Attachment #431065 - Flags: review?(bugspam.Callek) → review+
(In reply to comment #10)

I don't understand: c-c doesn't use that define, but m-c does...
Comment on attachment 430939 [details] [diff] [review]
(Bv1) Copy (the useful part of) changeset db2c3e1c7d28
[Checkin: Comment 13]


http://hg.mozilla.org/comm-central/rev/42abd8a80877
Attachment #430939 - Attachment description: (Bv1) Copy (the useful part of) changeset db2c3e1c7d28 → (Bv1) Copy (the useful part of) changeset db2c3e1c7d28 [Checkin: Comment 13]
Comment on attachment 431065 [details] [diff] [review]
(Cv1) Copy bug 520359 and bug 524554
[Checkin: Comment 14]


http://hg.mozilla.org/comm-central/rev/86c1a9c1f192
Attachment #431065 - Attachment description: (Cv1) Copy bug 520359 and bug 524554 → (Cv1) Copy bug 520359 and bug 524554 [Checkin: Comment 14]
Depends on: 448515
(In reply to comment #12)
> (In reply to comment #10)
> 
> I don't understand: c-c doesn't use that define, but m-c does...

Answered  this in e-mail actually...
Comment on attachment 432023 [details] [diff] [review]
(Ev1-SM) Port bug 536567
[Checkin: Comment 17]

'we' should also kill this from mail/
Attachment #432023 - Flags: review?(bugspam.Callek) → review+
Attachment #432138 - Flags: review?(bugspam.Callek) → review+
Attachment #432139 - Flags: review?(bugspam.Callek) → review+
Comment on attachment 432023 [details] [diff] [review]
(Ev1-SM) Port bug 536567
[Checkin: Comment 17]


http://hg.mozilla.org/comm-central/rev/89a8752677ff
Attachment #432023 - Attachment description: (Ev1-SM) Port bug 536567 → (Ev1-SM) Port bug 536567 [Checkin: Comment 17]
Comment on attachment 432138 [details] [diff] [review]
(Fv1-192) Copy bug 545755
[Checkin: Comment 18]


http://hg.mozilla.org/comm-central/rev/9a24c92bb357
Attachment #432138 - Attachment description: (Fv1-192) Copy bug 545755 → (Fv1-192) Copy bug 545755 [Checkin: Comment 18]
Comment on attachment 432139 [details] [diff] [review]
(Gv1) Copy bug 529319
[Checkin: Comment 19]


http://hg.mozilla.org/comm-central/rev/37e3f6432a81
Attachment #432139 - Attachment description: (Gv1) Copy bug 529319 → (Gv1) Copy bug 529319 [Checkin: Comment 19]
Comment on attachment 432418 [details] [diff] [review]
(Hv1-TB-SB) Port bug 536567
[Checkin: See comment 22]


>+# Bug 506493 - Resync' configure.in between c-c and m-c; (Ev1-SM) Port bug 536567.
>+# Bug 536567 - Store the value of the per-site last file upload directories inside the memory while private browsing is active
>+#ifndef MOZILLA_1_9_2_BRANCH
>+components/contentprefs.xpt
>+#endif

I don't think we need the additional comments here.

r=Standard8 with those removed.
Attachment #432418 - Flags: review?(bugzilla) → review+
Comment on attachment 432418 [details] [diff] [review]
(Hv1-TB-SB) Port bug 536567
[Checkin: See comment 22]


http://hg.mozilla.org/comm-central/rev/4812530ad1f6
Hv1-TB-SB, with comment 21 suggestion(s).
Attachment #432418 - Attachment description: (Hv1-TB-SB) Port bug 536567 → (Hv1-TB-SB) Port bug 536567 [Checkin: See comment 22]
Depends on: 554993
No longer depends on: 554993
Comment on attachment 431902 [details] [diff] [review]
(Dv1) Port bug 549246 (1.9.2+)

>diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in
...
>-#ifndef XP_MACOSX
> @BINPATH@/@MOZ_APP_NAME@
> #endif
>-#endif

This is wrong, we don't build @MOZ_APP_NAME@ for Thunderbird.

>+#ifdef XP_UNIX
> #ifdef UNIX_BUT_NOT_MAC
>+@BINPATH@/icons/*.png
>+#endif
> @BINPATH@/run-mozilla.sh
>-@BINPATH@/icons/*.png
> #endif

Urgh, this is confusing. If you want to do it that way, change #ifdef UNIX_BUT_NOT_MAC to #ifndef XP_MACOSX (ditto in the ones case later on).
Attachment #431902 - Flags: review?(bugzilla) → review-
Attached patch (Dv2) Port bug 549246 (1.9.2+) (obsolete) — Splinter Review
Dv1, with comment 23 suggestion(s).


> This is wrong, we don't build @MOZ_APP_NAME@ for Thunderbird.

Indeed, MacOSX package-compare doesn't report /seamonkey nor /thunderbird.
Yet, I wonder why Firefox would have it and not our apps?
Attachment #431902 - Attachment is obsolete: true
Attachment #435063 - Flags: review?(bugzilla)
Depends on: 526302
Depends on: 529327
Attachment #435413 - Flags: review?(bugspam.Callek)
Depends on: 522440
Depends on: 522157
Attachment #435401 - Attachment description: (Iv1) Port bug 526302 → (Iv1) Copy bug 526302
Attachment #435413 - Attachment description: (Jv1) Port bug 529327 → (Jv1) Copy bug 529327
Attachment #435401 - Attachment description: (Iv1) Copy bug 526302 → (Iv1) Copy bug 526302 (m-1.9.2+)
Attachment #435401 - Flags: review?(bugspam.Callek) → review+
Attachment #435413 - Flags: review?(bugspam.Callek) → review+
Comment on attachment 435417 [details] [diff] [review]
(Kv1) Copy bug 522157, Port bug 522440
[Checkin: See comment 31]

needs !1.9.2 wrapper
Attachment #435417 - Flags: review?(bugspam.Callek) → review+
Comment on attachment 435401 [details] [diff] [review]
(Iv1) Copy bug 526302 (m-1.9.2+)
[Checkin: Comment 29]


http://hg.mozilla.org/comm-central/rev/c830226b1820
Attachment #435401 - Attachment description: (Iv1) Copy bug 526302 (m-1.9.2+) → (Iv1) Copy bug 526302 (m-1.9.2+) [Checkin: Comment 29]
Comment on attachment 435413 [details] [diff] [review]
(Jv1) Copy bug 529327
[Checkin: Comment 30]


http://hg.mozilla.org/comm-central/rev/871b3d26feec
Attachment #435413 - Attachment description: (Jv1) Copy bug 529327 → (Jv1) Copy bug 529327 [Checkin: Comment 30]
Comment on attachment 435417 [details] [diff] [review]
(Kv1) Copy bug 522157, Port bug 522440
[Checkin: See comment 31]


http://hg.mozilla.org/comm-central/rev/17581dee5a68
Kv1, with comment 28 suggestion(s).
Attachment #435417 - Attachment description: (Kv1) Copy bug 522157, Port bug 522440 → (Kv1) Copy bug 522157, Port bug 522440 [Checkin: See comment 31]
Depends on: 518506
Attachment #435472 - Flags: review?(bugspam.Callek)
Depends on: 458088
Attachment #435475 - Flags: review?(bugspam.Callek)
Comment on attachment 435063 [details] [diff] [review]
(Dv2) Port bug 549246 (1.9.2+)

AFAICT this is exactly the same as Dv1 apart from the comment in the header...
Attachment #435063 - Flags: review?(bugzilla) → review-
Depends on: 486782
Please, confirm whether you previously removed the m-1.9.2 part on purpose or by mistake...
Attachment #435803 - Flags: review?(bugspam.Callek)
Ov1, with local merge issue fixed.
Attachment #435803 - Attachment is obsolete: true
Attachment #435805 - Flags: review?(bugspam.Callek)
Attachment #435803 - Flags: review?(bugspam.Callek)
(In reply to comment #35)
> Please, confirm whether you previously removed the m-1.9.2 part on purpose or
> by mistake...

As you seem to have suspected, it was a mistake; thanks. (I don't think it hurt anyone, but its "safer" to remain in sync here, yes)
Depends on: 555684
No longer depends on: 514787
Depends on: 556269
No longer depends on: 555684
Depends on: 557042
Depends on: 543976
MOZ_GFX_OPTIMIZE_MOBILE is tested in
/mozilla/widget/public/nsILookAndFeel.h which is included in
/mailnews/base/src/nsMessengerWinIntegration.cpp

MOZ_PLATFORM_MAEMO is tested in
/mozilla/modules/plugin/base/public/nsPluginNativeWindow.h which is included in
/mozilla/modules/plugin/base/public/nsIPluginHost.idl which is used in
/suite/browser/test/browser/browser_pluginnotification.js
Attachment #436891 - Flags: review?(bugspam.Callek)
Depends on: 464394
Attachment #435472 - Flags: review?(bugspam.Callek) → review+
Comment on attachment 435475 [details] [diff] [review]
(Mv1) Copy bug 458088
[superseded by newer bugs]

I doubt this would work; given order of things, the new vars you are adding is AFTER where its used.
Attachment #435475 - Flags: review?(bugspam.Callek) → review-
Attachment #435805 - Flags: review?(bugspam.Callek) → review+
Comment on attachment 435472 [details] [diff] [review]
(Lv1) Copy bug 518506
[Checkin: Comment 40]


http://hg.mozilla.org/comm-central/rev/2b335d50b7f5
Attachment #435472 - Attachment description: (Lv1) Copy bug 518506 → (Lv1) Copy bug 518506 [Checkin: Comment 40]
Comment on attachment 435805 [details] [diff] [review]
(Ov1a) Port bug 486782, Restore m-1.9.2 part after bug 543081
[Checkin: Comment 41]


http://hg.mozilla.org/comm-central/rev/655ab6620778
Attachment #435805 - Attachment description: (Ov1a) Port bug 486782, Restore m-1.9.2 part after bug 543081 → (Ov1a) Port bug 486782, Restore m-1.9.2 part after bug 543081 [Checkin: Comment 41]
Comment on attachment 435475 [details] [diff] [review]
(Mv1) Copy bug 458088
[superseded by newer bugs]


(In reply to comment #39)

Then, I eventually commented on bug 458088.
Yet, in this case, I'm interested in sync'ing only...
r? again!?
(In reply to comment #42)
> Then, I eventually commented on bug 458088.
> Yet, in this case, I'm interested in sync'ing only...
> r? again!?

Given my latest comments in that bug; r- stands for now, even if we are syncing I'd rather not checkin broken code. If you insist you can get KaiRo's rs+ to override me.
Attachment #436891 - Flags: review?(bugspam.Callek) → review+
Comment on attachment 436891 [details] [diff] [review]
(Pv1) Port (the useful part of) bug 464394 and bug 543976
[Checkin: Comment 44]


http://hg.mozilla.org/comm-central/rev/912bb76e5065
Attachment #436891 - Attachment description: (Pv1) Port (the useful part of) bug 464394 and bug 543976 → (Pv1) Port (the useful part of) bug 464394 and bug 543976 [Checkin: Comment 44]
Depends on: 554359
Depends on: 520622
Attached patch (Qv1) Port bug 520622 (obsolete) — Splinter Review
Please, double-check the |_pwd=$_pwd/mozilla| trick I used.
Attachment #439000 - Flags: review?(bugspam.Callek)
Qv1, with |_topsrcdirwin=$_topsrcdirwin/mozilla| too.
Attachment #439000 - Attachment is obsolete: true
Attachment #439002 - Flags: review?(bugspam.Callek)
Attachment #439000 - Flags: review?(bugspam.Callek)
Comment on attachment 439002 [details] [diff] [review]
(Qv1a) Port bug 520622
[Checkin: See comment 48]

>+    _pwd=`pwd -W`
>+    _pwd=$_pwd/mozilla
>+    _topsrcdirwin=`cd \`dirname $0\`; pwd -W`
>+    _topsrcdirwin=$_topsrcdirwin/mozilla

Correct and works, but very minor nit, just append |/mozilla| right after the last ` though I won't block on this nit if you disagree.
Attachment #439002 - Flags: review?(bugspam.Callek) → review+
Comment on attachment 439002 [details] [diff] [review]
(Qv1a) Port bug 520622
[Checkin: See comment 48]


http://hg.mozilla.org/comm-central/rev/4d451d246928
Qv1a, with comment 47 suggestion(s).
Attachment #439002 - Attachment description: (Qv1a) Port bug 520622 → (Qv1a) Port bug 520622 [Checkin: Comment 48]
Attachment #439002 - Attachment description: (Qv1a) Port bug 520622 [Checkin: Comment 48] → (Qv1a) Port bug 520622 [Checkin: See comment 48]
Attachment #430123 - Flags: feedback?(bugspam.Callek)
Comment on attachment 430123 [details] [diff] [review]
(Av1) Copy bug 512504, Remove useless AC_DEFINE(HAVE_LIBDL), (m-1.9.2+)
[Checkin: Comment 50]

...Hmm you're right in that m-c (currently) needs this. But we don't so feel free to land this.
Attachment #430123 - Flags: feedback?(bugspam.Callek) → feedback+
Comment on attachment 430123 [details] [diff] [review]
(Av1) Copy bug 512504, Remove useless AC_DEFINE(HAVE_LIBDL), (m-1.9.2+)
[Checkin: Comment 50]


http://hg.mozilla.org/comm-central/rev/3533388a3856
Attachment #430123 - Attachment description: (Av1) Copy bug 512504, Remove useless AC_DEFINE(HAVE_LIBDL) → (Av1) Copy bug 512504, Remove useless AC_DEFINE(HAVE_LIBDL), (m-1.9.2+) [Checkin: Comment 50]
No longer depends on: 549246
Depends on: 575179
Depends on: 575509
Depends on: 579704
Depends on: 601910
Depends on: 608670
Depends on: 608673
Depends on: 613419
No longer depends on: 608670
Depends on: 613811
Depends on: 613814
Dv2, with more of comment 23 suggestion(s).


(In reply to Serge Gautherie (:sgautherie) from comment #24)
> > This is wrong, we don't build @MOZ_APP_NAME@ for Thunderbird.
> 
> Indeed, MacOSX package-compare doesn't report /seamonkey nor /thunderbird.
> Yet, I wonder why Firefox would have it and not our apps?

I found that Thunderbird has now done that part in bug 668869.
I marked that bug as "TB2SM".


(In reply to Mark Banner (:standard8) from comment #34)
> AFAICT this is exactly the same as Dv1 apart from the comment in the
> header...

No, it had s/UNIX_BUT_NOT_MAC/XP_MACOSX/g per your comment 23.


I added SeaMonkey removed-files.in update too.
Attachment #435063 - Attachment is obsolete: true
Attachment #583424 - Flags: review?(mbanner)
Attachment #583424 - Flags: review?(bugspam.Callek)
Comment on attachment 583424 [details] [diff] [review]
(Dv3) Port '/icons/...' and 'run-mozilla.sh' parts of bug 549246
[superseded by newer bugs]

>Bug 549246 - Go back to shipping run-mozilla.sh and the "firefox" script on OS X

Actually, now I look at it again, I don't think we should follow this bug. We no longer ship the "thunderbird" script based on "mozilla.in" - the "thunderbird" file on Mac is now an actual executable, so from a shipping perspective, there is no incentive to ship run-mozilla.sh.

The build system still requires it, but I'm wondering how much of that is just historical.

I think instead we should look at seeing if we can avoid shipping run-mozilla.sh on OS X. If we can, then we may even be able to avoid shipping it on Linux, once we ship the executable there as well instead of the mozilla.in script (FF already does this).

I've pushed a proof of concept patch to try server, that I'll file a bug for if it succeeds - if it doesn't I'll come back and re-think this review (hence not changing the request for now).
Depends on: 549246
Comment on attachment 583424 [details] [diff] [review]
(Dv3) Port '/icons/...' and 'run-mozilla.sh' parts of bug 549246
[superseded by newer bugs]

Ok, I've confirmed my suspicions enough that I've raised bug 715089 on not shipping run-mozilla.sh for Firefox on Mac. I haven't got time to complete it at the moment, but I definitely don't want to start shipping it for TB, and I see no reason to for SM.

The icons stuff I don't really care about as a result and I think we should just leave that alone in the TB instance at least.
Attachment #583424 - Flags: review?(mbanner)
Attachment #583424 - Flags: review?(bugspam.Callek)
Attachment #583424 - Flags: review-
Depends on: 715089
Comment on attachment 435475 [details] [diff] [review]
(Mv1) Copy bug 458088
[superseded by newer bugs]

WINCE and --disable-vista-sdk-requirements supports have since been removed (from m-c).
Attachment #435475 - Attachment is obsolete: true
No longer depends on: 458088
No longer depends on: 549246
Comment on attachment 583424 [details] [diff] [review]
(Dv3) Port '/icons/...' and 'run-mozilla.sh' parts of bug 549246
[superseded by newer bugs]

(In reply to Mark Banner (:standard8) from comment #53)

> Ok, I've confirmed my suspicions enough that I've raised bug 715089 on not
> shipping run-mozilla.sh for Firefox on Mac. I haven't got time to complete
> it at the moment, but I definitely don't want to start shipping it for TB,
> and I see no reason to for SM.

TB and SM parts dropped, per bug 715089.

> The icons stuff I don't really care about as a result and I think we should
> just leave that alone in the TB instance at least.

TB part dropped.
SM part moved to bug 730254.
Attachment #583424 - Attachment description: (Dv3) Port '/icons/...' and 'run-mozilla.sh' parts of bug 549246 → (Dv3) Port '/icons/...' and 'run-mozilla.sh' parts of bug 549246 [superseded by newer bugs]
Attachment #583424 - Attachment is obsolete: true
No longer depends on: 715089
Attachment #435475 - Attachment description: (Mv1) Copy bug 458088 → (Mv1) Copy bug 458088 [superseded by newer bugs]
Alias: CcConfSync → C192ConfSync
Status: ASSIGNED → RESOLVED
Closed: 9 years ago
Flags: in-testsuite-
Resolution: --- → FIXED
Summary: Resync' configure.in between c-c and m-c → Resync' configure.in between comm-central (= comm-1.9.2) and mozilla-central
Target Milestone: --- → Thunderbird 3.1b2
You need to log in before you can comment on or make changes to this bug.