The default bug view has changed. See this FAQ.

Remove libxul-rules.mk and libxul-config.mk

RESOLVED FIXED in mozilla11

Status

()

Core
Build Config
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: gps, Assigned: gps)

Tracking

Trunk
mozilla11
Points:
---

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment, 1 obsolete attachment)

(Assignee)

Description

5 years ago
This is a cleanup/low-priority request to remove toolkit/library/libxul-rules.mk.

This file is only included once, by toolkit/library/Makefile.in. Therefore, it makes no sense to exist as a separate file. The contents can easily be rolled into the aforementioned Makefile.
(Assignee)

Comment 1

5 years ago
Looks like libxul-config.mk in the same directory has the same behavior.
Summary: Remove libxul-rules.mk → Remove libxul-rules.mk and libxul-config.mk
I think these files may have been more useful at one point, but we could definitely just fold them in now.
(Assignee)

Comment 3

5 years ago
Created attachment 574364 [details] [diff] [review]
Move libxul-config.mk and libxul-rules.mk into Makefile, v1

This patch simply moves the contents of the extra .mk files inline to toolkit/library/Makefile.in.

There are certainly bits that could be consolidated. I purposefully kept it simple. I can submit a part 2 to perform sanitizing, if requested.
Assignee: nobody → gps
Status: NEW → ASSIGNED
Attachment #574364 - Flags: review?(ted.mielczarek)
(Assignee)

Comment 4

5 years ago
Comment on attachment 574364 [details] [diff] [review]
Move libxul-config.mk and libxul-rules.mk into Makefile, v1

Build failed on my local machine. Looking into it now...
Attachment #574364 - Flags: review?(ted.mielczarek)
(Assignee)

Comment 5

5 years ago
Created attachment 574382 [details] [diff] [review]
Move libxul-config.mk and libxul-rules.mk into Makefile, v2

Same as last except I removed references to the deleted .mk files from EXTRA_DEPS. Tree compiles fine now.
Attachment #574364 - Attachment is obsolete: true
Attachment #574382 - Flags: review?(ted.mielczarek)
Comment on attachment 574382 [details] [diff] [review]
Move libxul-config.mk and libxul-rules.mk into Makefile, v2

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

::: toolkit/library/Makefile.in
@@ +86,5 @@
>  	$(NULL)
>  
> +CPPSRCS += \
> +	nsStaticXULComponents.cpp \
> +	$(NULL)

While you're here, can you at least change the formatting on lines you're changing to two-space indent? You don't have to do a ton of cleanup, but that would be nice.
Attachment #574382 - Flags: review?(ted.mielczarek) → review+
(Assignee)

Comment 7

5 years ago
https://hg.mozilla.org/projects/build-system/rev/6f76da3f5e2f

Whitespace changes were made post-review. `hg qdiff -w` had no output. Ted declined additional review on IRC.
(Assignee)

Comment 8

5 years ago
https://hg.mozilla.org/mozilla-central/rev/6f76da3f5e2f
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla11
You need to log in before you can comment on or make changes to this bug.