952120 - Port bug 774572 (Define JAR_MANIFESTS in moz.build files) to DOMi, Chatzilla, Venkman

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Philip Chee]

Attachment: WIP patch for DOM Inspector (not working)

STR: have the required moz.build files containing:
 +JAR_MANIFESTS += ['jar.mn']
But I still cannot build DOM Inspector. Error message:

mozmake[3]: Entering directory 'c:/t1/hg/objdir-sm/mozilla/extensions/inspector/resources/locale'
c:/t1/hg/comm-central/mozilla/config/rules.mk:1327: *** c:/t1/hg/comm-central/mozilla/extensions/inspector/resources/locale contains a jar.mn file but this file is not declared in a JAR_MANIFESTS variable in a moz.build file.  Stop.

I *do* have a moz.build file in that directory with the requisite declarations.

Comment 1

[Philip Chee]

Attachment: V1.0 Working patch for DOM Inspector

Finally managed to get DOM Inspector, Chatzilla, and Venkman to build. I don't know if this is the right way of doing things but at least it works.

Comment 2

[Gregory Szorc [:gps]]

Comment on attachment 8350194 [details] [diff] [review]
V1.0 Working patch for DOM Inspector

Review of attachment 8350194 [details] [diff] [review]:
-----------------------------------------------------------------

The DOM inspector extension build config is... special.

resources/Makefile.in is iterating over some pre-defined languages and calling |make -C locale AB_CD=$locale|. resources/locale isn't known to moz.build, so it isn't part of regular directory traversal. Thus, JAR_MANIFESTS in moz.build don't come into play.

I think marking resources/Makefile.in as an external make file and dealing with the underlying problem later is sufficient.

::: resources/locale/moz.build
@@ +2,5 @@
> +# This Source Code Form is subject to the terms of the Mozilla Public
> +# License, v. 2.0. If a copy of the MPL was not distributed with this
> +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
> +
> +JAR_MANIFESTS += ['jar.mn']

You shouldn't need this after marking resources/locale/Makefile.in as externally managed.

::: resources/moz.build
@@ +6,5 @@
>  CONFIGURE_SUBST_FILES += ['locale/Makefile']
>  
> +DIRS += [
> +    'locale',
> +]

Or this.

Comment 3

[Philip Chee]

Attachment: Patch v1.1 for DOM Inspector

(In reply to Gregory Szorc [:gps] from comment #2)

> ::: resources/locale/moz.build
> @@ +2,5 @@
>> +# This Source Code Form is subject to the terms of the Mozilla Public
>> +# License, v. 2.0. If a copy of the MPL was not distributed with this
>> +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>> +
>> +JAR_MANIFESTS += ['jar.mn']
> 
> You shouldn't need this after marking resources/locale/Makefile.in as
> externally managed.
Fixed.

> ::: resources/moz.build
> @@ +6,5 @@
>>  CONFIGURE_SUBST_FILES += ['locale/Makefile']
>>  
>> +DIRS += [
>> +    'locale',
>> +]
> 
> Or this.
Fixed.

Comment 4

[Philip Chee]

Attachment: Patch Bv1.0 for Venkman

Fix for Venkman.

Comment 5

[Philip Chee]

Attachment: Patch Cv1.0 for Chatzilla

Fix for Chatzilla.

Comment 6

[Frank Wein [:mcsmurf]]

Pushed all patches:
http://hg.mozilla.org/dom-inspector/rev/ea97f73f8302
http://hg.mozilla.org/venkman/rev/7f29ecb94e07
http://hg.mozilla.org/chatzilla/rev/d565df1a6c92