Bug 969164 - Replace most BUILDING_JS uses with JS_STANDALONE. r=gps

Before making top-level traverse js/src moz.build files, there was a need to
distinguish between top-level traversing e.g. top-level moz.build or
config/moz.build and js/src traversing them. With a single traversal of both
moz.build sets, we now only need to distinguish between js standalone builds
and gecko builds.

There is still, however, a need to distinguish between top-level vs. js/src
configure runs on gecko builds to make them subconfigure icu and libffi from
top-level instead of js/src in js standalone builds, or when choosing to make
js/src's config.status do something when run or not.
This commit is contained in:
Mike Hommey 2014-02-11 10:37:47 +09:00
parent 557439c337
commit 989b41cf6b
6 changed files with 9 additions and 16 deletions

View File

@ -45,7 +45,7 @@ libs binaries export tools:: $(topsrcdir)/js/src/configure js/src/config.status
endif
endif
ifdef BUILDING_JS
ifdef JS_STANDALONE
.PHONY: CLOBBER
CLOBBER:
else
@ -115,7 +115,7 @@ install-manifests: $(addprefix install-dist-,$(install_manifests))
# that would remove the resulting files.
# Eventually, a standalone js build would just be able to build nspr itself,
# removing the need for the former.
ifdef BUILDING_JS
ifdef JS_STANDALONE
NO_REMOVE=1
endif
@ -156,7 +156,7 @@ endif
# with no regard for PGO passes. This decision could probably be revisited.
export:: install-dist-sdk
ifndef BUILDING_JS
ifndef JS_STANDALONE
ifdef ENABLE_TESTS
# Additional makefile targets to call automated test suites
include $(topsrcdir)/testing/testsuite-targets.mk
@ -200,7 +200,7 @@ endif
SYM_STORE_SOURCE_DIRS := $(topsrcdir)
ifndef BUILDING_JS
ifndef JS_STANDALONE
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
ifdef MOZ_SYMBOLS_EXTRA_BUILDID
@ -271,7 +271,7 @@ check::
@relcount=`find $(DIST)/bin -name '*.so' | xargs objdump -R | grep R_386_PC32 | wc -l` && if test $$relcount -gt 0; then echo 'FAILED: R_386_PC32 relocations detected in a shared library. Did you use a system header without adding it to config/system-headers?'; exit 1; else echo 'PASSED'; fi
endif
ifdef BUILDING_JS
ifdef JS_STANDALONE
# Delegate js-specific rules to js
check-%:
$(MAKE) -C js/src $@

View File

@ -34,7 +34,7 @@ INSTALL_TARGETS += NSINSTALL
endif
endif
ifndef BUILDING_JS
ifndef JS_STANDALONE
HEADERS_FILES = \
$(DEPTH)/mozilla-config.h \
$(NULL)
@ -49,7 +49,7 @@ include $(topsrcdir)/config/rules.mk
HOST_CFLAGS += -DUNICODE -D_UNICODE
ifndef BUILDING_JS
ifndef JS_STANDALONE
# Generate a new buildid every time we "export" in config... that's only
# supposed to be once per-build!
export::
@ -112,7 +112,7 @@ GARBAGE += \
FORCE:
ifndef BUILDING_JS
ifndef JS_STANDALONE
check-preqs += check-jar-mn
endif
check-preqs += check-makefiles

View File

@ -200,7 +200,6 @@ endif # ifeq (1_.,$(MOZ_PSEUDO_DERECURSE)_$(DEPTH))
ifdef MOZ_PSEUDO_DERECURSE
ifeq (.,$(DEPTH))
# top-level directories
ifdef BUILDING_JS
ifndef JS_STANDALONE
# Only define recurse_targets for js, when it is built as part of gecko.
recurse_targets := $(addsuffix /binaries,$(call TIER_DIRS,binaries))
@ -208,7 +207,6 @@ recurse_targets := $(addsuffix /binaries,$(call TIER_DIRS,binaries))
want_abspaths = 1
endif
endif
endif
ifdef COMPILE_ENVIRONMENT

View File

@ -359,10 +359,6 @@ ifdef MOZ_UPDATE_XTERM
UPDATE_TITLE = printf '\033]0;%s in %s\007' $(1) $(relativesrcdir)/$(2) ;
endif
ifdef BUILDING_JS
NO_BUILDSTATUS_MESSAGES=1
endif
ifdef MACH
ifndef NO_BUILDSTATUS_MESSAGES
define BUILDSTATUS

View File

@ -7,7 +7,7 @@
DEHYDRA_SCRIPT = $(topsrcdir)/config/static-checking.js
ifndef BUILDING_JS
ifndef JS_STANDALONE
DEHYDRA_MODULES = \
$(topsrcdir)/xpcom/analysis/final.js \
$(topsrcdir)/xpcom/analysis/must-override.js \

View File

@ -167,7 +167,6 @@ else
fi
AC_SUBST(JS_STANDALONE)
BUILDING_JS=1
AC_SUBST(BUILDING_JS)
AC_SUBST(autoconfmk)
MOZ_ARG_WITH_STRING(gonk,