Closed Bug 870891 Opened 7 years ago Closed 5 years ago

Move DIST_FILES to moz.build

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(firefox40 fixed)

RESOLVED FIXED
mozilla40
Tracking Status
firefox40 --- fixed

People

(Reporter: joey, Assigned: froydnj)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

No description provided.
Blocks: nomakefiles
Ta-da!  Builds locally, we'll see if all platforms like it:

https://treeherder.mozilla.org/#/jobs?repo=try&revision=bd75aef18bc5
Attachment #8593001 - Flags: review?(mshal)
Assignee: nobody → nfroyd
Comment on attachment 8593001 [details] [diff] [review]
move DIST_FILES to moz.build

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

::: python/mozbuild/mozbuild/backend/recursivemake.py
@@ +559,5 @@
>          elif isinstance(obj, FinalTargetFiles):
>              self._process_final_target_files(obj, obj.files, obj.target)
> +
> +        elif isinstance(obj, DistFiles):
> +            # We'd like to install these via manifests as preprocessed files.

File a bug to do that?

@@ +565,5 @@
> +            # some Makefiles, so for now we just pass them through to the
> +            # underlying Makefile.in.
> +            for f in obj.files:
> +                backend_file.write('DIST_FILES += %s\n' % f)
> +                

ws

::: python/mozbuild/mozbuild/test/backend/test_recursivemake.py
@@ +640,5 @@
> +        ]
> +
> +        found = [str for str in lines if str.startswith('DIST_FILES')]
> +        self.assertEqual(found, expected)
> +        

ws
Comment on attachment 8593001 [details] [diff] [review]
move DIST_FILES to moz.build

Nothing to add over #c2, but please address those!
Attachment #8593001 - Flags: review?(mshal) → review+
Blocks: 1155283
I guess we should disallow people from writing DIST_FILES in Makefile.ins now?  How do we do that?
Flags: needinfo?(mshal)
Looks like the list is in recursivemake.py now: http://mxr.mozilla.org/mozilla-central/source/python/mozbuild/mozbuild/backend/recursivemake.py#71
Flags: needinfo?(mshal)
https://hg.mozilla.org/mozilla-central/rev/399f25e8643a
Status: NEW → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla40
Blocks: 1159775
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.