1052948 - Port |Bug 968642 - Port RCFILE and RESFILE to moz.build| to im

Status: RESOLVED FIXED

(Instantbird Graveyard :: Other, defect)

Description

[Ian Neal]

Attachment: Move RCFILE and RESFILE to moz.build [Checked in: Comment 2]

Only part of c-c that still has RCFILE and RESFILE in Makefile.in is im so let's port the changes from Bug 968642
This is based on top of patches from Bug 1049935 and Bug 1052943

Comment 1

[Patrick Cloke [:clokep]]

Comment on attachment 8472006 [details] [diff] [review]
Move RCFILE and RESFILE to moz.build [Checked in: Comment 2]

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

This looks fine, but I'd like to see the results of today's nightly before we commit anything else on top of it.

Comment 2

[Ian Neal]

Comment on attachment 8472006 [details] [diff] [review]
Move RCFILE and RESFILE to moz.build [Checked in: Comment 2]

http://hg.mozilla.org/comm-central/rev/5c7fab2d17ab

Comment 3

[Florian Quèze [:florian]]

Comment on attachment 8472006 [details] [diff] [review]
Move RCFILE and RESFILE to moz.build [Checked in: Comment 2]

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

The nightly failed today with this message on Windows:

==============================
ERROR PROCESSING MOZBUILD FILE
==============================

The error occurred while processing the following file:

    d:/bb-slave/win32/build/im/components/mintrayr/moz.build

The error was triggered on line 17 of this file:

    RCFILE = resources.rc

An error was encountered as part of executing the file itself. The error appears to be the fault of the script.

The error as reported by Python is:

    ["NameError: name 'resources' is not defined\n"]

::: im/components/mintrayr/moz.build
@@ +14,5 @@
>      OS_LIBS += [
>          'shell32',
>      ]
> +    RCFILE = resources.rc
> +    RESFILE = resources.res

Quotes needed around 'resources.rc' and 'resources.res'.

Comment 4

[Ian Neal]

(In reply to Florian Quèze [:florian] [:flo] from comment #3)
> ::: im/components/mintrayr/moz.build
> @@ +14,5 @@
> >      OS_LIBS += [
> >          'shell32',
> >      ]
> > +    RCFILE = resources.rc
> > +    RESFILE = resources.res
> 
> Quotes needed around 'resources.rc' and 'resources.res'.

Sorry, I did spot that but forgot about it by the time I managed to checkin.
Fixed with https://hg.mozilla.org/comm-central/rev/05558e22489b