| author | Mike Hommey <mh+mozilla@glandium.org> |
| Mon, 11 Feb 2013 14:10:10 +0100 (2013-02-11) | |
| changeset 121471 | 2d9c75b462f881a32f6faa65630fdfd2bd23cbed |
| parent 121470 | 729fe49f9e1f0570b697b8daa809810b13ceb981 |
| child 121472 | 784b9beebe90f5e0219a66c8a58a222fdd517c58 |
| push id | 24289 |
| push user | mh@glandium.org |
| push date | Mon, 11 Feb 2013 13:22:37 +0000 (2013-02-11) |
| treeherder | mozilla-central@784b9beebe90 [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | ted |
| bugs | 790115 |
| milestone | 21.0a1 |
| first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| config/rules.mk | file | annotate | diff | comparison | revisions | |
| js/src/config/rules.mk | file | annotate | diff | comparison | revisions |
--- a/config/rules.mk +++ b/config/rules.mk @@ -1736,18 +1736,27 @@ FREEZE_VARIABLES = \ $(foreach var,$(FREEZE_VARIABLES),$(eval $(var)_FROZEN := '$($(var))')) CHECK_FROZEN_VARIABLES = $(foreach var,$(FREEZE_VARIABLES), \ $(if $(subst $($(var)_FROZEN),,'$($(var))'),$(error Makefile variable '$(var)' changed value after including rules.mk. Was $($(var)_FROZEN), now $($(var)).))) libs export:: $(CHECK_FROZEN_VARIABLES) -default all:: - if test -d $(DIST)/bin ; then touch $(DIST)/bin/.purgecaches ; fi +PURGECACHES_DIRS ?= $(DIST)/bin +ifdef MOZ_WEBAPP_RUNTIME +PURGECACHES_DIRS += $(DIST)/bin/webapprt +endif + +PURGECACHES_FILES = $(addsuffix /.purgecaches,$(PURGECACHES_DIRS)) + +default all:: $(PURGECACHES_FILES) + +$(PURGECACHES_FILES): + if test -d $(@D) ; then touch $@ ; fi .DEFAULT_GOAL ?= default ############################################################################# # Derived targets and dependencies include $(topsrcdir)/config/makefiles/autotargets.mk ifneq ($(NULL),$(AUTO_DEPS))
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -1736,18 +1736,27 @@ FREEZE_VARIABLES = \ $(foreach var,$(FREEZE_VARIABLES),$(eval $(var)_FROZEN := '$($(var))')) CHECK_FROZEN_VARIABLES = $(foreach var,$(FREEZE_VARIABLES), \ $(if $(subst $($(var)_FROZEN),,'$($(var))'),$(error Makefile variable '$(var)' changed value after including rules.mk. Was $($(var)_FROZEN), now $($(var)).))) libs export:: $(CHECK_FROZEN_VARIABLES) -default all:: - if test -d $(DIST)/bin ; then touch $(DIST)/bin/.purgecaches ; fi +PURGECACHES_DIRS ?= $(DIST)/bin +ifdef MOZ_WEBAPP_RUNTIME +PURGECACHES_DIRS += $(DIST)/bin/webapprt +endif + +PURGECACHES_FILES = $(addsuffix /.purgecaches,$(PURGECACHES_DIRS)) + +default all:: $(PURGECACHES_FILES) + +$(PURGECACHES_FILES): + if test -d $(@D) ; then touch $@ ; fi .DEFAULT_GOAL ?= default ############################################################################# # Derived targets and dependencies include $(topsrcdir)/config/makefiles/autotargets.mk ifneq ($(NULL),$(AUTO_DEPS))