mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1219126 - Move greprefs.js definition in moz.build. r=mshal
This commit is contained in:
parent
cc9560d1d8
commit
95d8169c08
@ -43,7 +43,6 @@ default: $(addprefix install-,$(INSTALL_MANIFESTS))
|
|||||||
|
|
||||||
# Explicit files to be built for a default build
|
# Explicit files to be built for a default build
|
||||||
default: $(addprefix $(TOPOBJDIR)/,$(MANIFEST_TARGETS))
|
default: $(addprefix $(TOPOBJDIR)/,$(MANIFEST_TARGETS))
|
||||||
default: $(TOPOBJDIR)/dist/bin/greprefs.js
|
|
||||||
default: $(TOPOBJDIR)/dist/bin/platform.ini
|
default: $(TOPOBJDIR)/dist/bin/platform.ini
|
||||||
|
|
||||||
# Targets from the recursive make backend to be built for a default build
|
# Targets from the recursive make backend to be built for a default build
|
||||||
@ -126,7 +125,6 @@ $(addprefix $(TOPOBJDIR)/,$(MANIFEST_TARGETS)): FORCE
|
|||||||
# that are not supported by data in moz.build.
|
# that are not supported by data in moz.build.
|
||||||
|
|
||||||
# Files to build with the recursive backend and simply copy
|
# Files to build with the recursive backend and simply copy
|
||||||
$(TOPOBJDIR)/dist/bin/greprefs.js: $(TOPOBJDIR)/modules/libpref/greprefs.js
|
|
||||||
$(TOPOBJDIR)/dist/bin/platform.ini: $(TOPOBJDIR)/toolkit/xre/platform.ini
|
$(TOPOBJDIR)/dist/bin/platform.ini: $(TOPOBJDIR)/toolkit/xre/platform.ini
|
||||||
|
|
||||||
# The xpidl target in config/makefiles/xpidl requires the install manifest for
|
# The xpidl target in config/makefiles/xpidl requires the install manifest for
|
||||||
|
@ -1,33 +0,0 @@
|
|||||||
#
|
|
||||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
|
||||||
|
|
||||||
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, \
|
|
||||||
mailnews.js editor.js \
|
|
||||||
aix.js unix.js winpref.js)
|
|
||||||
|
|
||||||
GARBAGE += greprefs.js
|
|
||||||
|
|
||||||
# TODO bug 813259 external files should be defined near their location in the source tree.
|
|
||||||
grepref_files = $(topsrcdir)/netwerk/base/security-prefs.js $(srcdir)/init/all.js
|
|
||||||
|
|
||||||
ifdef MOZ_DATA_REPORTING
|
|
||||||
grepref_files += $(topsrcdir)/services/datareporting/datareporting-prefs.js
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef MOZ_SERVICES_HEALTHREPORT
|
|
||||||
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
|
|
||||||
grepref_files += $(topsrcdir)/services/healthreport/healthreport-prefs.js
|
|
||||||
else
|
|
||||||
grepref_files += $(topsrcdir)/mobile/android/chrome/content/healthreport-prefs.js
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
greprefs.js: $(grepref_files)
|
|
||||||
$(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(MOZ_DEBUG_DEFINES) $^ -o $@)
|
|
||||||
|
|
||||||
libs:: greprefs.js
|
|
||||||
$(INSTALL) $^ $(DIST)/bin/
|
|
12
modules/libpref/greprefs.js
Normal file
12
modules/libpref/greprefs.js
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
#include ../../netwerk/base/security-prefs.js
|
||||||
|
#include init/all.js
|
||||||
|
#ifdef MOZ_DATA_REPORTING
|
||||||
|
#include ../../services/datareporting/datareporting-prefs.js
|
||||||
|
#endif
|
||||||
|
#ifdef MOZ_SERVICES_HEALTHREPORT
|
||||||
|
#if MOZ_WIDGET_TOOLKIT == android
|
||||||
|
#include ../../mobile/android/chrome/content/healthreport-prefs.js
|
||||||
|
#else
|
||||||
|
#include ../../services/healthreport/healthreport-prefs.js
|
||||||
|
#endif
|
||||||
|
#endif
|
@ -45,3 +45,7 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
|
|||||||
|
|
||||||
if CONFIG['GNU_CXX']:
|
if CONFIG['GNU_CXX']:
|
||||||
CXXFLAGS += ['-Wshadow']
|
CXXFLAGS += ['-Wshadow']
|
||||||
|
|
||||||
|
DIST_FILES += [
|
||||||
|
'greprefs.js',
|
||||||
|
]
|
||||||
|
Loading…
Reference in New Issue
Block a user