474978 - Move generation of install.rdf for default theme to be alongside theme files.

Status: RESOLVED FIXED

(Thunderbird :: Build Config, defect)

Description

[Mark Banner (:standard8)]

Attachment: The fix

The install.rdf that is generated for the classic/default theme currently resides in the easy to remember location mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/ totally separate from the actual theme files in mail/themes.

As it is common to all themes, install.rdf should just reside in mail/themes. We can also tidy up some of the preprocessing, including picking up the python version of the preprocessor.

It does mean its best to move the theme selection back to mail/themes (which I only moved recently), though overall I think we will enter one less directory with this patch (and we'll have files in a more logical location.

The removal of DEFINES += -DHAVE_SHELL_SERVICE=1 is due to the fact its not required in that directory. Similarly installed-extensions.txt is no longer required.

Comment 1

[Magnus Melin [:mkmelin]]

Comment on attachment 358385 [details] [diff] [review]
The fix

This didn't build for me.

make[5]: *** No rule to make target `/opt/comm-central/src/mail/themes/Makefile.in', needed by `themes/Makefile'.  Stop.

Comment 2

[Mark Banner (:standard8)]

Comment on attachment 358385 [details] [diff] [review]
The fix

Did you use patch or git-apply or hg (q)import?

If you used patch I expect this wouldn't work as it doesn't know about moving files.

The mail/themes/Makefile.in is definitely created in the patch.

Comment 3

[Magnus Melin [:mkmelin]]

Ah yes, I used patch...

Comment 4

[Magnus Melin [:mkmelin]]

Comment on attachment 358385 [details] [diff] [review]
The fix

Ok, works fine now! r=mkmelin

Comment 5

[Mark Banner (:standard8)]

Patch checked in: http://hg.mozilla.org/comm-central/rev/1824ae4b67d7