451601 - kill MOZILLA_LOCALE_VERSION

Status: RESOLVED FIXED

(MailNews Core :: Build Config, defect)

Description

[Robert Kaiser]

The lang.version entity as in http://mxr.mozilla.org/comm-central/source/suite/locales/en-US/chrome/branding/brand.dtd#1 is not used any more but there are multiple mentionings of MOZILLA_LOCALE_VERSION still around in the tree, see http://mxr.mozilla.org/comm-central/search?string=MOZILLA_LOCALE_VERSION

We should remove those that are not needed any more, i.e. the contents.rdf files in mozilla-central, etc.

Comment 1

[Robert Kaiser]

Attachment: mozilla-central patch to kill those chrome versions

This is the mozilla-central part, removing all the chrome-versions that were only needed by the old chrome registry which has died as well now. The occurrences I've not killed should be covered by the patches in bug 451909.

Comment 2

[Robert Kaiser]

Attachment: comm-central patch (checked in)

This is the comm-central part - not much to do here actually :)

Comment 3

[Robert Kaiser]

Attachment: DOMi patch (checked in)

DOMi still builds a contents.rdf, but only for the locale, not for anything else, even though that's unneeded as the manifest entry take precedence anyway.

Comment 4

[Robert Kaiser]

Comment on attachment 336276 [details] [diff] [review]
mozilla-central patch to kill those chrome versions

>diff --git a/xpfe/components/download-manager/resources/Makefile.in b/xpfe/components/download-manager/resources/Makefile.in
>-ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
>-DIRS		= win
>-else
> ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
> DIRS		= mac
> else
>-DIRS		= unix
>-endif
>-endif

Oops, that should be an endif that gets left over instead of the else.

Comment 5

[Robert Kaiser]

Attachment: ChatZilla patch (checked in)

This removes that stuff from ChatZilla - the make*xpi.sh scripts have set it to empty all the time anyway, so just do that by default for the contents.rdf files (and the new manifest stuff doesn't need it at all).

Comment 6

[Robert Kaiser]

Attachment: venkman patch (checked in)

And here's the venkman patch - as for ChatZilla, we were setting this to empty for the make*xpi.sh scripts all the time, so we're coding contents.rdf to have it like that by default.

Comment 7

[Alex Vincent [:WeirdAl]]

Comment on attachment 336298 [details] [diff] [review]
venkman patch (checked in)

Looks good to me.

Comment 8

[Mark Banner (:standard8)]

Comment on attachment 336277 [details] [diff] [review]
comm-central patch (checked in)

You should also remove the preprocess '*' from the start of the brand.dtd line in suite/locales/jar.mn.

r=me with that fixed.

Comment 9

[Robert Kaiser]

Comment on attachment 336277 [details] [diff] [review]
comm-central patch (checked in)

Pushed as http://hg.mozilla.org/comm-central/rev/effeccdba665

Comment 10

[Robert Kaiser]

Comment on attachment 336298 [details] [diff] [review]
venkman patch (checked in)

checked in the venkman part as well (in cvs trunk).

Comment 11

[:Gijs (he/him)]

Comment on attachment 336295 [details] [diff] [review]
ChatZilla patch (checked in)

r=me

Comment 12

[Shawn Wilsher :sdwilsh]

Comment on attachment 336279 [details] [diff] [review]
DOMi patch (checked in)

r=sdwilsh; I'm waiving the sr requirement for this patch.

Comment 13

[Robert Kaiser]

Comment on attachment 336295 [details] [diff] [review]
ChatZilla patch (checked in)

Checked in the ChatZilla part on cvs trunk.

Comment 14

[Robert Kaiser]

Comment on attachment 336279 [details] [diff] [review]
DOMi patch (checked in)

DOMi part pushed as http://hg.mozilla.org/dom-inspector/rev/213755b60af8

Comment 15

[Robert Kaiser]

Main mozilla-central part pushed as http://hg.mozilla.org/mozilla-central/rev/122c2763549f