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

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[(no longer active)]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=9611e0abf276

Comment 1

[(no longer active)]

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

These includes make out-of-tree builds of SpiderMonkey depend on the
installer.

Comment 2

[Mike Hommey [:glandium]]

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.

Comment 3

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/f8e784f16f69

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/f8e784f16f69

Comment 5

[Ryan VanderMeulen [:RyanVM]]

Backed out for breaking Android nightlies per bug 1274273.
https://hg.mozilla.org/mozilla-central/rev/128e727da496

Comment 6

[(no longer active)]

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?

Comment 7

[Mike Hommey [:glandium]]

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.

Comment 8

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/4bde696a04d8

Comment 9

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/4bde696a04d8