1159775 - Port |Bug 870891 - Move DIST_FILES to moz.build| to comm-central

Status: RESOLVED FIXED

(MailNews Core :: Build Config, defect)

Description

[Ian Neal]

Bug 870891 moved DIST_FILES from Makefile.in to moz.build on mozilla-central, the same should be done for comm-central

Comment 1

[Ian Neal]

Attachment: Calendar port [Checked in: Comment 13]

Comment 2

[Ian Neal]

Attachment: Thunderbird port

Comment 3

[Ian Neal]

Attachment: SeaMonkey port [Checked in: Comment 9]

Comment 4

[Ian Neal]

Attachment: Instantbird port [Checked in: Comment 7]

Comment 5

[Patrick Cloke [:clokep]]

Comment on attachment 8599388 [details] [diff] [review]
Instantbird port [Checked in: Comment 7]

Thank you! :)

Comment 6

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Comment on attachment 8599384 [details] [diff] [review]
Calendar port [Checked in: Comment 13]

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

Hmm so DIST_FILES preprocesses the files afaik, maybe we can simplify some stuff this way.

In calendar/base/backend/libical/build/Makefile.in can you try removing the libs target, and putting this into moz.build:

DIST_FILES.components += [ 'libical-manifest' ]

As a result, the libical-manifest should be copied to the dist/xpi-stage/components/libical-manifest and be preprocessed. Make sure to remove the file before you attempt to have it copied to make sure its updated.

If that doesn't work, r+ nevertheless.

Comment 7

[Ian Neal]

Comment on attachment 8599388 [details] [diff] [review]
Instantbird port [Checked in: Comment 7]

https://hg.mozilla.org/comm-central/rev/b831d31b8821

Comment 8

[Philip Chee]

Comment on attachment 8599387 [details] [diff] [review]
SeaMonkey port [Checked in: Comment 9]

a=me CLOSED TREE

Comment 9

[Ian Neal]

Comment on attachment 8599387 [details] [diff] [review]
SeaMonkey port [Checked in: Comment 9]

http://hg.mozilla.org/comm-central/rev/71d8771ae203

Comment 10

[Ian Neal]

Attachment: Use EXTRA_PP_COMPONENTS for Calendar [Checked in: Comment 17]

DIST_FILES does not deal with subdirectories, but there is EXTRA_PP_COMPONENTS which does pre-process files into the components subdirectory.

Comment 11

[Ian Neal]

Attachment: Thunderbird port with no theme changes [Checked in: Comment 18]

I've removed the theme changes as they are now covered in bug 1163441

Comment 12

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Can you do a try build with this patch? I think I tried to use EXTRA_PP_COMPONENTS in the past, but since its usually used for actual components, it threw some error about missing a manifest entry or something.

Comment 13

[Ian Neal]

Comment on attachment 8599384 [details] [diff] [review]
Calendar port [Checked in: Comment 13]

https://hg.mozilla.org/comm-central/rev/856553fccd61

Comment 14

[Ian Neal]

Pushed to try:
https://hg.mozilla.org/try-comm-central/pushloghtml?changeset=2f68b4374ac0
https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=2f68b4374ac0

Comment 15

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Comment on attachment 8603818 [details] [diff] [review]
Use EXTRA_PP_COMPONENTS for Calendar [Checked in: Comment 17]

Try build looks good, r=philipp

Comment 16

[Kent James (:rkent)]

Comment on attachment 8603886 [details] [diff] [review]
Thunderbird port with no theme changes [Checked in: Comment 18]

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

Joshua still seems to be tied up with his research project, so let me r+ this simple change.

Comment 17

[Ian Neal]

Comment on attachment 8603818 [details] [diff] [review]
Use EXTRA_PP_COMPONENTS for Calendar [Checked in: Comment 17]

https://hg.mozilla.org/comm-central/rev/9ae077f0b6bb

Comment 18

[Ian Neal]

Comment on attachment 8603886 [details] [diff] [review]
Thunderbird port with no theme changes [Checked in: Comment 18]

https://hg.mozilla.org/comm-central/rev/cf486fa6264b