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

Status: RESOLVED FIXED

(MailNews Core :: Build Config, defect)

Description

[Serge Gautherie (:sgautherie)]

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.)

Comment 1

[Robert Kaiser]

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.

Comment 2

[Serge Gautherie (:sgautherie)]

Attachment: (Av1) Remove *OJI* from c-c "configure", m-* one(s) is enough [Checkin: See comment 5]

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

Comment 3

[Robert Kaiser]

(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.

Comment 4

[Mark Banner (:standard8)]

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.

Comment 5

[Serge Gautherie (:sgautherie)]

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).

Comment 6

[Serge Gautherie (:sgautherie)]

Attachment: (Bv1-SM) Packaging part, m-c and (MacOSX) m-1.9.2 [Checkin: Comment 7]

*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...

Comment 7

[Serge Gautherie (:sgautherie)]

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

Comment 8

[Serge Gautherie (:sgautherie)]

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

This part is V.Fixed, per tinderbox.

Comment 9

[Serge Gautherie (:sgautherie)]

Attachment: (Cv1-SM) Remove SeaMonkey/1.9.2 packaging [Checkin: Comment 11]

Comment 10

[Justin Wood (:Callek)]

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.

Comment 11

[Serge Gautherie (:sgautherie)]

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...

Comment 12

[Serge Gautherie (:sgautherie)]

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

Bug 547375 will fix this.