wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1094037 - Move EXTRA_COMPONENTS and EXTRA_PP_COMPONENTS to the misc tier. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2014-11-06 09:29:11 +09:00
parent 18ccc42254
commit 636eec2f2a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/rules.mk
View File

@ -1184,10 +1184,11 @@ endif
endif
ifdef EXTRA_COMPONENTS
libs:: $(EXTRA_COMPONENTS)
misc:: $(EXTRA_COMPONENTS)
ifndef NO_DIST_INSTALL
EXTRA_COMPONENTS_FILES := $(EXTRA_COMPONENTS)
EXTRA_COMPONENTS_DEST := $(FINAL_TARGET)/components
EXTRA_COMPONENTS_TARGET := misc
INSTALL_TARGETS += EXTRA_COMPONENTS
endif
@ -1196,13 +1197,14 @@ endif
ifdef EXTRA_PP_COMPONENTS
ifndef NO_DIST_INSTALL
EXTRA_PP_COMPONENTS_PATH := $(FINAL_TARGET)/components
EXTRA_PP_COMPONENTS_TARGET := misc
PP_TARGETS += EXTRA_PP_COMPONENTS
endif
endif
EXTRA_MANIFESTS = $(filter %.manifest,$(EXTRA_COMPONENTS) $(EXTRA_PP_COMPONENTS))
ifneq (,$(EXTRA_MANIFESTS))
libs:: $(call mkdir_deps,$(FINAL_TARGET))
misc:: $(call mkdir_deps,$(FINAL_TARGET))
$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest $(patsubst %,'manifest components/%',$(notdir $(EXTRA_MANIFESTS))))
endif

6
python/mozbuild/mozbuild/frontend/context.py
View File

@ -377,6 +377,8 @@ def ContextDerivedTypedList(type, base_class=List):
# - 'export'
# - 'libs': everything that is not built from C/C++/ObjC source and that has
# traditionally been in the libs tier.
# - 'misc': like libs, but with parallel build. Eventually, everything that
# currently is in libs should move here.
# A value of None means the variable has no direct effect on any tier.
VARIABLES = {
@ -509,7 +511,7 @@ VARIABLES = {
This variable contains a list of files to copy into
``$(FINAL_TARGET)/components/``.
""", 'libs'),
""", 'misc'),
'EXTRA_JS_MODULES': (HierarchicalStringList, list,
"""Additional JavaScript files to distribute.
@ -542,7 +544,7 @@ VARIABLES = {
This variable contains a list of files to preprocess. Generated
files will be installed in the ``/components`` directory of the distribution.
""", 'libs'),
""", 'misc'),
'FINAL_LIBRARY': (unicode, unicode,
"""Library in which the objects of the current directory will be linked.