Leverage jar preprocessor to simplify chrome build

RESOLVED FIXED

Status

SeaMonkey
Build Config
RESOLVED FIXED
14 years ago
11 years ago

People

(Reporter: neil@parkwaycc.co.uk, Assigned: neil@parkwaycc.co.uk)

Tracking

({helpwanted})

Trunk
helpwanted

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(2 attachments, 3 obsolete attachments)

(Assignee)

Description

14 years ago
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.
(Assignee)

Comment 1

14 years ago
Created attachment 155708 [details] [diff] [review]
Merge classic theme platforms into classic/jar.mn (checked in)
Assignee: nobody → neil.parkwaycc.co.uk
Status: NEW → ASSIGNED
(Assignee)

Updated

14 years ago
Attachment #155708 - Flags: superreview?(jag)
Attachment #155708 - Flags: review?(bsmedberg)

Comment 2

14 years ago
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
this may have broken camino. we no longer get scrollbars in the 8/11 build. do
embedding apps need anything special here?

Comment 4

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

Comment 5

14 years ago
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?
Attachment #155708 - Flags: superreview?(jag)
Attachment #155708 - Flags: review?(bsmedberg)
Product: Browser → Seamonkey
(Assignee)

Comment 7

14 years ago
It's not fixed, I just never got around to fixing the other platform Makefiles.
Status: RESOLVED → REOPENED
Keywords: helpwanted
Resolution: FIXED → ---

Comment 8

14 years ago
Created attachment 178182 [details] [diff] [review]
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 ;-)

Updated

14 years ago
Attachment #178182 - Flags: superreview?(benjamin)
Attachment #178182 - Flags: review?(neil.parkwaycc.co.uk)

Comment 9

14 years ago
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.
Attachment #178182 - Flags: superreview?(benjamin)

Comment 10

14 years ago
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.
Attachment #178182 - Flags: review?(neil.parkwaycc.co.uk) → review-
Created attachment 178333 [details] [diff] [review]
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).
Attachment #178182 - Attachment is obsolete: true
Attachment #178333 - Flags: superreview?(neil.parkwaycc.co.uk)
Attachment #178333 - Flags: review?(neil.parkwaycc.co.uk)

Updated

14 years ago
Attachment #155708 - Attachment description: Merge classic theme platforms into classic/jar.mn → Merge classic theme platforms into classic/jar.mn (checked in)

Comment 12

14 years ago
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 :)
Attachment #178333 - Flags: review?(neil.parkwaycc.co.uk) → review+
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.
Created attachment 178426 [details] [diff] [review]
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)
Attachment #178333 - Attachment is obsolete: true
Attachment #178426 - Flags: superreview?(neil.parkwaycc.co.uk)
Attachment #178426 - Flags: review?(neil.parkwaycc.co.uk)

Updated

14 years ago
Attachment #178333 - Flags: superreview?(neil.parkwaycc.co.uk)
Attachment #178333 - Flags: review+
(Assignee)

Comment 15

14 years ago
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
;-)
Attachment #178426 - Flags: superreview?(neil.parkwaycc.co.uk)
Attachment #178426 - Flags: superreview+
Attachment #178426 - Flags: review?(neil.parkwaycc.co.uk)
Attachment #178426 - Flags: review+
Created attachment 178675 [details] [diff] [review]
xpfe/browser, xpfe/communicator [final] (checked in)

Patch to comit, porting r+sr=Neil; rs=bsmedberg,kairo as well ;-)
Attachment #178426 - Attachment is obsolete: true
Attachment #178675 - Flags: superreview+
Attachment #178675 - Flags: review+
Comment on attachment 178675 [details] [diff] [review]
xpfe/browser, xpfe/communicator [final] (checked in)

I checked this patch in
Attachment #178675 - Attachment description: xpfe/browser, xpfe/communicator [final] → xpfe/browser, xpfe/communicator [final] (checked in)
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
Depends on: 299058

Comment 19

11 years ago
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.
Looks like it should be resolved.
Status: REOPENED → RESOLVED
Last Resolved: 14 years ago11 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.