255036 - Leverage jar preprocessor to simplify chrome build

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, defect)

Description

[[e-mail]]

Parts of the SeaMonkey chrome are currently built using platform makefiles, but
bug 248507 now allows us to select the platform in the jar manifiests.

Comment 1

[[e-mail]]

Attachment: Merge classic theme platforms into classic/jar.mn (checked in)

Comment 2

[jag (Peter Annema)]

Comment on attachment 155708 [details] [diff] [review]
Merge classic theme platforms into classic/jar.mn (checked in)

Looks like you need a * for win/menu.css. Looks good otherwise. sr=jag

Comment 3

[Mike Pinkerton (not reading bugmail)]

this may have broken camino. we no longer get scrollbars in the 8/11 build. do
embedding apps need anything special here?

Comment 4

[cls]

Try changing the XP_MAC to XP_MACOSX in classic/jar.mn .

Comment 5

[Benjamin Smedberg]

Comment on attachment 155708 [details] [diff] [review]
Merge classic theme platforms into classic/jar.mn (checked in)

I'm pretty sure this already landed, no?

Comment 6

[Justin Wood (:Callek)]

Fixed with previous checkin:

http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=all&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=explicit&mindate=2004-08-10+15%3A57&maxdate=2004-08-10+16%3A02&cvsroot=%2Fcvsroot

Comment 7

[[e-mail]]

It's not fixed, I just never got around to fixing the other platform Makefiles.

Comment 8

[Justin Wood (:Callek)]

Attachment: xpfe/browser, xpfe/communicator

This patch address xpfe/browser and xpfe/communicator areas.

The sr? from Bsmedberg is for the allmakefiles.sh change (Though I will
entertain other comments if you choose to look through the patch), I really
wish for an r+sr from Neil ;-)

Comment 9

[Benjamin Smedberg]

Comment on attachment 178182 [details] [diff] [review]
xpfe/browser, xpfe/communicator

permanent rs=me for obvious changes to allmakefiles.sh... I can do a thorough
review if Neil wishes.

Comment 10

[Robert Kaiser]

Comment on attachment 178182 [details] [diff] [review]
xpfe/browser, xpfe/communicator

Actually, I have to r- this one from L10n point of view.

As I already told Callek privately on IRC, en-US.jar has to be exactly the same
on all platforms and contain the stuff for all platforms in some way, so that
we can use the same language XPI file for installing a language pack on all
platforms.

This actually is why we have those en-[unix|mac|win].jar files for. I'not
against finding a way to merge them into en-US.jar somehow, but we still need
to have the same en-US.jar on all platforms. That 1) makes it possible to get
all localized strings from one downloaded build for L10n teams and 2) makes it
possible for them to create a single XPI package to install as a language
package on any platform. Both are vital to L10n efforts. Please don't make
their lives harder. Thanks.

Comment 11

[Justin Wood (:Callek)]

Attachment: xpfe/browser, xpfe/communicator [take 2]

Kairo, wish to give this a peek as well? ;-)

I decided not to modify that actual jar file for any of these, at least with
this bug, keep in mind that foo-plat.jar is not actually registered unless your
OS has -plat (IE. win, unix, mac).

Comment 12

[Robert Kaiser]

Comment on attachment 178333 [details] [diff] [review]
xpfe/browser, xpfe/communicator [take 2]

This is OK with L10n, as far as I see L10n files should stay exactly as they
were, only build from a more central location :)

Comment 13

[Justin Wood (:Callek)]

Comment on attachment 178333 [details] [diff] [review]
xpfe/browser, xpfe/communicator [take 2]

Neil, this is (by accident) missing a change to  xpfe/communicator/Makefile.in

I will attach it when I get home.

Comment 14

[Justin Wood (:Callek)]

Attachment: xpfe/browser, xpfe/communicator [take 3]

Adds missing diff, and fixes a mini typo in a jar.mn I noticed earlier (though
my local had it fixed)

Comment 15

[[e-mail]]

Comment on attachment 178426 [details] [diff] [review]
xpfe/browser, xpfe/communicator [take 3]

>+
>+en-mac.jar:
>+*       locale/en-US/navigator-platform/contents.rdf        (resources/locale/en-US/mac/contents-platform.rdf)
>+        locale/en-US/navigator-platform/platformNavigationBindings.dtd (resources/locale/en-US/mac/platformNavigationBindings.dtd)
>+        locale/en-US/navigator-platform/navigator.properties (resources/locale/en-US/mac/navigator.properties)
>+
>+en-unix.jar:
>+*       locale/en-US/navigator-platform/contents.rdf        (resources/locale/en-US/unix/contents-platform.rdf)
>+        locale/en-US/navigator-platform/platformNavigationBindings.dtd (resources/locale/en-US/unix/platformNavigationBindings.dtd)
>+        locale/en-US/navigator-platform/navigator.properties (resources/locale/en-US/unix/navigator.properties)
>+
>+en-mac.jar:
>+*       locale/en-US/navigator-platform/contents.rdf        (resources/locale/en-US/win/contents-platform.rdf)
>+        locale/en-US/navigator-platform/platformNavigationBindings.dtd (resources/locale/en-US/win/platformNavigationBindings.dtd)
>+        locale/en-US/navigator-platform/navigator.properties (resources/locale/en-US/win/navigator.properties)
I think the last of these should be en-win.jar :-P r+sr=me with this fixed
(check in comment should also note rs=bsmedberg,kairo). Note that in future it
may pay you to request a full r=bsmedberg depending on our relative workloads
;-)

Comment 16

[Justin Wood (:Callek)]

Attachment: xpfe/browser, xpfe/communicator [final] (checked in)

Patch to comit, porting r+sr=Neil; rs=bsmedberg,kairo as well ;-)

Comment 17

[Christian :Biesinger (don't email me, ping me on IRC)]

Comment on attachment 178675 [details] [diff] [review]
xpfe/browser, xpfe/communicator [final] (checked in)

I checked this patch in

Comment 18

[Justin Wood (:Callek)]

Just as a note to myself, the .cvsignore files in directories with removed
|Makefile.in|'s should be cleaned up as well before this bug is closed

Comment 19

[Robert Kaiser]

Is this bug actually fixed now? I just stumbled over it with a bug query and it looks like a candidate to be just marked fixed.

Comment 20

[Justin Wood (:Callek)]

Looks like it should be resolved.