Closed Bug 1273006 Opened 4 years ago Closed 4 years ago

Don't include makefiles from toolkit/mozapps/installer needlessly

Categories

(Firefox Build System :: General, defect)

defect
Not set
normal

Tracking

(firefox49 fixed)

RESOLVED FIXED
mozilla49
Tracking Status
firefox49 --- fixed

People

(Reporter: ehsan, Assigned: ehsan)

References

Details

Attachments

(1 file)

These includes make out-of-tree builds of SpiderMonkey depend on the
installer.
Attachment #8752615 - Flags: review?(mh+mozilla)
Comment on attachment 8752615 [details] [diff] [review]
Don't include makefiles from toolkit/mozapps/installer needlessly

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

::: Makefile.in
@@ +292,3 @@
>  
>  SYMBOL_INDEX_NAME = \
>    $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)-symbols.txt

You might as well enclose this line too. BUILDID is not set without including package-name.mk, and the variable is only used in the ifdef'ed block below.

::: build/moz-automation.mk
@@ -11,5 @@
>  endif
>  endif
>  
> -include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
> -include $(topsrcdir)/toolkit/mozapps/installer/upload-files.mk

For the record, the two includes were initially required for a command in this file using COMPLETE_MAR and some other variables from there, but that hasn't been useful since bug 1198179.
Attachment #8752615 - Flags: review?(mh+mozilla) → review+
https://hg.mozilla.org/mozilla-central/rev/f8e784f16f69
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla49
Depends on: 1274273
Assignee: nobody → ehsan
Backed out for breaking Android nightlies per bug 1274273.
https://hg.mozilla.org/mozilla-central/rev/128e727da496
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Target Milestone: mozilla49 → ---
I think the PACKAGE variable being echo'ed in buildbase.py is defined here: <https://dxr.mozilla.org/mozilla-central/source/toolkit/mozapps/installer/upload-files.mk#50>

Mike, is there a useful macro to check for in moz-automation.mk that would let us include these makefiles conditionally for non-SpiderMonkey builds?  Is JS_STANDALONE the right variable?
Flags: needinfo?(mh+mozilla)
It's probably the least worst choice, yeah. Automation should not rely on echo-variable-FOO too, but I won't ask you to fix that.
Flags: needinfo?(mh+mozilla)
https://hg.mozilla.org/mozilla-central/rev/4bde696a04d8
Status: REOPENED → RESOLVED
Closed: 4 years ago4 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla49
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.