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 1044162 - part 2 - remove JS_MODULES_PATH from the build system; r=mshal

Browse Source
This commit is contained in:
Nathan Froyd 2014-07-25 14:37:22 -04:00
parent 13d14daf45
commit 056ab5697e
4 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/config.mk
View File

@ -55,7 +55,6 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
IS_COMPONENT \
JAR_MANIFEST \
JAVA_JAR_TARGETS \
JS_MODULES_PATH \
LD_VERSION_SCRIPT \
LIBRARY_NAME \
LIBS \

6
config/rules.mk
View File

@ -1221,10 +1221,8 @@ endif
################################################################################
# Copy each element of EXTRA_JS_MODULES to
# $(FINAL_TARGET)/$(JS_MODULES_PATH). JS_MODULES_PATH defaults to "modules"
# if it is undefined.
JS_MODULES_PATH ?= modules
FINAL_JS_MODULES_PATH := $(FINAL_TARGET)/$(JS_MODULES_PATH)
# $(FINAL_TARGET)/modules.
FINAL_JS_MODULES_PATH := $(FINAL_TARGET)/modules
ifdef EXTRA_JS_MODULES
ifndef NO_DIST_INSTALL

1
python/mozbuild/mozbuild/frontend/emitter.py
View File

@ -379,7 +379,6 @@ class TreeMetadataEmitter(LoggingMixin):
'USE_STATIC_LIBS',
'GENERATED_FILES',
'IS_GYP_DIR',
'JS_MODULES_PATH',
'MSVC_ENABLE_PGO',
'NO_DIST_INSTALL',
'OS_LIBS',

16
python/mozbuild/mozbuild/frontend/sandbox_symbols.py
View File

@ -190,16 +190,14 @@ VARIABLES = {
"""Additional JavaScript files to distribute.
This variable contains a list of files to copy into
``$(FINAL_TARGET)/$(JS_MODULES_PATH)``. ``JS_MODULES_PATH`` defaults
to ``modules`` if left undefined.
``$(FINAL_TARGET)/modules.
""", 'libs'),
'EXTRA_PP_JS_MODULES': (HierarchicalStringList, list,
"""Additional JavaScript files to distribute.
This variable contains a list of files to copy into
``$(FINAL_TARGET)/$(JS_MODULES_PATH)``, after preprocessing.
``JS_MODULES_PATH`` defaults to ``modules`` if left undefined.
``$(FINAL_TARGET)/modules``, after preprocessing.
""", 'libs'),
'TESTING_JS_MODULES': (HierarchicalStringList, list,
@ -292,16 +290,6 @@ VARIABLES = {
populated by calling add_java_jar().
""", 'libs'),
'JS_MODULES_PATH': (unicode, unicode,
"""Sub-directory of ``$(FINAL_TARGET)`` to install
``EXTRA_JS_MODULES``.
``EXTRA_JS_MODULES`` files are copied to
``$(FINAL_TARGET)/$(JS_MODULES_PATH)``. This variable does not
need to be defined if the desired destination directory is
``$(FINAL_TARGET)/modules``.
""", None),
'LIBRARY_NAME': (unicode, unicode,
"""The code name of the library generated for a directory.