Closed
Bug 929905
Opened 11 years ago
Closed 11 years ago
Consolidate sources in moz.build
Categories
(Firefox Build System :: General, defect)
Firefox Build System
General
Tracking
(Not tracked)
RESOLVED
FIXED
mozilla27
People
(Reporter: glandium, Assigned: glandium)
References
Details
Attachments
(2 files, 3 obsolete files)
(deleted),
text/plain
|
Details | |
(deleted),
patch
|
gps
:
review+
|
Details | Diff | Splinter Review |
We currently have CPP_SOURCES, CSRCS, ASFILES, etc. As discussed in I-don't-remember-what-bug, we should just use a single variable and discriminate by extension.
[Since i wanted to add another category of sources in bug 928244, I figured I should do this first]
Assignee | ||
Comment 1•11 years ago
|
||
Assignee | ||
Updated•11 years ago
|
Assignee: nobody → mh+mozilla
Status: NEW → ASSIGNED
Assignee | ||
Comment 2•11 years ago
|
||
Comment on attachment 820867 [details] [diff] [review]
Consolidate sources in moz.build, GTEST only.
This is my implementation proposal, limited to gtests as a conversation opener. Kind of hackish, but i prefer keeping the filtering out of the backend.
Attachment #820867 -
Flags: feedback?(gps)
Comment 3•11 years ago
|
||
Comment on attachment 820867 [details] [diff] [review]
Consolidate sources in moz.build, GTEST only.
Review of attachment 820867 [details] [diff] [review]:
-----------------------------------------------------------------
Makes sense to me.
Not sure if you are planning to expand scope to CPP_SOURCES and friends. But I was thinking those would always end up using our next gen binary defining syntax from bug 879837 (whatever that may be). Not sure if it is worth consolidating lists today only to munge it again shortly.
::: python/mozbuild/mozbuild/frontend/emitter.py
@@ +181,5 @@
> + GTEST_CSRCS=('GTEST_SOURCES', ['.c']),
> + )
> + for mak, (moz, ext) in varmap.items():
> + if sandbox[moz]:
> + filtered = [f for f in sandbox[moz] if any(f.endswith(e) for e in ext)]
endswith() can accept a tuple of items to match against.
Attachment #820867 -
Flags: feedback?(gps) → feedback+
Assignee | ||
Comment 4•11 years ago
|
||
With adjustments to the endswith thing, and handling all source variables.
https://tbpl.mozilla.org/?tree=Try&rev=cdeccb117004
Attachment #821372 -
Flags: review?(gps)
Assignee | ||
Updated•11 years ago
|
Attachment #820867 -
Attachment is obsolete: true
Assignee | ||
Comment 5•11 years ago
|
||
Comment on attachment 821372 [details] [diff] [review]
Consolidate sources in moz.build.
There are a couple issues to solve, still.
Attachment #821372 -
Flags: review?(gps)
Comment 6•11 years ago
|
||
Comment on attachment 821372 [details] [diff] [review]
Consolidate sources in moz.build.
Review of attachment 821372 [details] [diff] [review]:
-----------------------------------------------------------------
I only casually looked at everything except the .py files.
Assignee | ||
Comment 7•11 years ago
|
||
Attachment #821510 -
Flags: review?(gps)
Assignee | ||
Updated•11 years ago
|
Attachment #821372 -
Attachment is obsolete: true
Assignee | ||
Comment 8•11 years ago
|
||
Assignee | ||
Updated•11 years ago
|
Attachment #821512 -
Attachment mime type: text/x-python → text/plain
Assignee | ||
Comment 9•11 years ago
|
||
(In reply to Mike Hommey [:glandium] from comment #7)
> Created attachment 821510 [details] [diff] [review]
> Consolidate sources in moz.build.
>
> https://tbpl.mozilla.org/?tree=Try&rev=0c22327d9cd8
And for Windows, since i fucked up bug 930380:
https://tbpl.mozilla.org/?tree=Try&rev=bd2c5cea84c6
Depends on: 930380
Assignee | ||
Comment 10•11 years ago
|
||
Err, I was effectively reverting bug 930380 with the emitter changes.
Attachment #821532 -
Flags: review?(gps)
Assignee | ||
Updated•11 years ago
|
Attachment #821510 -
Attachment is obsolete: true
Attachment #821510 -
Flags: review?(gps)
Assignee | ||
Comment 11•11 years ago
|
||
Another windows try with hopefully a working bug 930380:
https://tbpl.mozilla.org/?tree=Try&rev=b85dc94eb0aa
Comment 12•11 years ago
|
||
Comment on attachment 821532 [details] [diff] [review]
Consolidate sources in moz.build.
Review of attachment 821532 [details] [diff] [review]:
-----------------------------------------------------------------
Again, I only very casually looked at the automated moves.
::: python/mozbuild/mozbuild/frontend/emitter.py
@@ +184,5 @@
> + for mak, (moz, ext) in varmap.items():
> + if sandbox[moz]:
> + filtered = [f for f in sandbox[moz] if f.endswith(ext)]
> + if filtered:
> + passthru.variables[mak] = filtered
Do you think its worth checking for files that aren't passed through because of an unrecognized extension? I'd hate to see things silently fail for this reason. Followup?
Attachment #821532 -
Flags: review?(gps) → review+
Assignee | ||
Comment 13•11 years ago
|
||
Comment 14•11 years ago
|
||
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla27
Updated•7 years ago
|
Product: Core → Firefox Build System
You need to log in
before you can comment on or make changes to this bug.
Description
•