Port |Bug 517355 - Restore OJI, Liveconnect and the JEP on the 1.9.2 branch on OS X| to comm-central (apps)

RESOLVED FIXED in Thunderbird 3.1a1

Status

defect
--
trivial
RESOLVED FIXED
10 years ago
9 years ago

People

(Reporter: sgautherie, Assigned: sgautherie)

Tracking

Trunk
Thunderbird 3.1a1
Dependency tree / graph
Bug Flags:
in-testsuite -

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(3 attachments)

Assignee

Description

10 years ago
We probably need to port (at least) some configure and/or removed-files.in parts to support m-1.9.2.

We may also want to check what we're currently doing for m-1.9.1 and m-1.9.3.
(See http://hg.mozilla.org/comm-central/rev/c11e48d0bef1 from bug 496236.)
Assignee

Updated

10 years ago
Blocks: 511884

Comment 1

10 years ago
As 1.9.3 will branch in January for a release in June 2010, I think it would be a mistake for comm-central to even care about 1.9.2 - that's just my opinion though.
Assignee

Comment 2

10 years ago
configure part:
If I'm right that our confvars.sh files apply directly to m-* configure,
then we don't need any of these.
(If I'm wrong, then I miss to understand how that works.)

*****

packaging part:
I'll check that separately.

Self reminder:
http://mxr.mozilla.org/comm-central/search?string=%5B%5E_a-z%5DOJI%5B%5E_a-z%5D&regexp=on&find=%2Finstaller%2F
Assignee: nobody → sgautherie.bz
Status: NEW → ASSIGNED
Attachment #405790 - Flags: review?(bugzilla)
Attachment #405790 - Flags: approval-thunderbird3?
Assignee

Updated

10 years ago

Comment 3

10 years ago
(In reply to comment #2)
> configure part:
> If I'm right that our confvars.sh files apply directly to m-* configure,
> then we don't need any of these.

Our confvars.sh is indeed directly read by Mozilla configure due to pointing it to e.g. --enable-application=../suite and it reads e.g. confvars.sh from the directory pointed to by --enable-application.
Attachment #405790 - Flags: approval-thunderbird3?
Comment on attachment 405790 [details] [diff] [review]
(Av1) Remove *OJI* from c-c "configure", m-* one(s) is enough
[Checkin: See comment 5]

In these files:

>diff --git a/calendar/confvars.sh b/calendar/confvars.sh
>diff --git a/mail/confvars.sh b/mail/confvars.sh

> # MOZ_OJI is only required to be cleared for MOZILLA_1_9_1_BRANCH.
>+# And for MacOSX MOZILLA_1_9_2_BRANCH.
> # mozilla-central does not have this.

Obviously now we've branched, we don't want the 1.9.1 reference. Therefore just swap that previous line to:

# MOZ_OJI is only required to be cleared for MOZILLA_1_9_2_BRANCH (OS X).

You can drop the "# mozilla-central does not have this." line as well, I don't think that adds anything.

r=Standard8 with those comments fixed.
Attachment #405790 - Flags: review?(bugzilla) → review+
Assignee

Updated

10 years ago
Blocks: 523820
Assignee

Comment 5

10 years ago
Comment on attachment 405790 [details] [diff] [review]
(Av1) Remove *OJI* from c-c "configure", m-* one(s) is enough
[Checkin: See comment 5]


http://hg.mozilla.org/comm-central/rev/51801a22f118
Av1, with comment 4 suggestion(s).
Attachment #405790 - Attachment description: (Av1) Remove *OJI* from c-c "configure", m-* one(s) is enough → (Av1) Remove *OJI* from c-c "configure", m-* one(s) is enough [Checkin: See comment 5]
Assignee

Updated

10 years ago
Flags: in-testsuite-
Target Milestone: --- → Thunderbird 3.1a1
Assignee

Comment 6

10 years ago
*Fix Linux and Windows packaging :-)
*MacOSX 'oji.xpt' non-handling in removed-files.in is left as-is (ftb).
*'OJI' is still undefined even on MacOSX: this bug...
Attachment #417431 - Flags: review?(kairo)
Assignee

Updated

10 years ago
Depends on: 485984

Updated

10 years ago
Attachment #417431 - Flags: review?(kairo) → review+
Assignee

Comment 7

10 years ago
Comment on attachment 417431 [details] [diff] [review]
(Bv1-SM) Packaging part, m-c and (MacOSX) m-1.9.2
[Checkin: Comment 7]


http://hg.mozilla.org/comm-central/rev/553dba4cb6a5
Attachment #417431 - Attachment description: (Bv1-SM) Packaging part, m-c and (MacOSX) m-1.9.2 → (Bv1-SM) Packaging part, m-c and (MacOSX) m-1.9.2 [Checkin: Comment 7]
Assignee

Comment 8

10 years ago
(In reply to comment #7)
> http://hg.mozilla.org/comm-central/rev/553dba4cb6a5

This part is V.Fixed, per tinderbox.
Assignee

Updated

10 years ago
Blocks: 512378
Assignee

Updated

10 years ago
Depends on: 535594
Assignee

Updated

9 years ago
Blocks: 546487
Depends on: NoC192SM
Comment on attachment 427896 [details] [diff] [review]
(Cv1-SM) Remove SeaMonkey/1.9.2 packaging
[Checkin: Comment 11]

don't know why your doing this here; but sure, looks right.
Attachment #427896 - Flags: review?(bugspam.Callek) → review+
Assignee

Comment 11

9 years ago
Comment on attachment 427896 [details] [diff] [review]
(Cv1-SM) Remove SeaMonkey/1.9.2 packaging
[Checkin: Comment 11]


http://hg.mozilla.org/comm-central/rev/173b9eadcb19


(In reply to comment #10)
> don't know why your doing this here

Because it was added here...
Attachment #427896 - Attachment description: (Cv1-SM) Remove SeaMonkey/1.9.2 packaging → (Cv1-SM) Remove SeaMonkey/1.9.2 packaging [Checkin: Comment 11]
Assignee

Updated

9 years ago
No longer blocks: 511884
No longer depends on: C191ConfSync
Assignee

Updated

9 years ago
Depends on: 547375
Assignee

Comment 12

9 years ago
(In reply to comment #6)
> *MacOSX 'oji.xpt' non-handling in removed-files.in is left as-is (ftb).

Bug 547375 will fix this.
Status: ASSIGNED → RESOLVED
Last Resolved: 9 years ago
Depends on: C191ConfSync
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.