Closed Bug 1154687 Opened 7 years ago Closed 7 years ago

EXTERNALLY_MANAGED_MAKE_FILE no longer disables the moz.build variable blacklist

Categories

(Firefox Build System :: General, defect)

defect
Not set
normal

Tracking

(firefox40 fixed)

VERIFIED FIXED
mozilla40
Tracking Status
firefox40 --- fixed

People

(Reporter: bokeefe, Assigned: bokeefe)

References

Details

Attachments

(1 file, 2 obsolete files)

Per bug 852814 comment #16, setting EXTERNALLY_MANAGED_MAKE_FILE doesn't ignore the variable blacklist anymore. I have a patch ready that puts that feature back in.
Comment on attachment 8592774 [details] [diff] [review]
Restore EXTERNALLY_MANAGED_MAKE_FILE handling to the moz.build blacklist checkbug-1154687.patch

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

::: python/mozbuild/mozbuild/backend/recursivemake.py
@@ +700,5 @@
>              rule = makefile.create_rule(['$(all_absolute_unified_files)'])
>              rule.add_dependencies(['$(CURDIR)/%: %'])
>  
>      def _check_blacklisted_variables(self, makefile_in, makefile_content):
> +        if re.search(r'^\s*EXTERNALLY_MANAGED_MAKE_FILE\s*:=\s*1$', makefile_content, re.M):

The chances of the variable name occurring inside a Makefile.in and not being related to assigning this variable is slim. Please commit the simpler version:

if 'EXTERNALLY_MANAGED_MAKE_FILE' in makefile_content:
Attachment #8592774 - Flags: review?(gps) → review+
With the change gps requested
Attachment #8592774 - Attachment is obsolete: true
Attachment #8594743 - Flags: review+
Keywords: checkin-needed
This failed to apply: 

patching file python/mozbuild/mozbuild/backend/recursivemake.py
Hunk #1 FAILED at 696
1 out of 1 hunks FAILED -- saving rejects to file python/mozbuild/mozbuild/backend/recursivemake.py.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh bug-1154687.patch

could you take a look, thanks!
Flags: needinfo?(bokeefe)
Keywords: checkin-needed
(In reply to Carsten Book [:Tomcat] from comment #4)
> This failed to apply: 
> 
> patching file python/mozbuild/mozbuild/backend/recursivemake.py
> Hunk #1 FAILED at 696
> 1 out of 1 hunks FAILED -- saving rejects to file
> python/mozbuild/mozbuild/backend/recursivemake.py.rej
> patch failed, unable to continue (try -v)
> patch failed, rejects left in working dir
> errors during apply, please fix and refresh bug-1154687.patch
> 
> could you take a look, thanks!

This needed rebasing on top of Bug 1153566. Should be good to go now.
Attachment #8594743 - Attachment is obsolete: true
Flags: needinfo?(bokeefe)
Attachment #8595400 - Flags: review+
Keywords: checkin-needed
https://hg.mozilla.org/mozilla-central/rev/f86abf168590
Status: NEW → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla40
Thanks for fixing this! :)
Status: RESOLVED → VERIFIED
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.