Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-01 19:39:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 813287 - Move healthreport prefs into greprefs.js; r=rnewman

Browse Source
This commit is contained in:
Gregory Szorc 2013-01-06 16:15:51 -08:00
parent 06e65eccad
commit 02e0479d7d
6 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
b2g/installer/package-manifest.in
View File

@ -585,9 +585,6 @@
#ifdef MOZ_SERVICES_SYNC
@BINPATH@/defaults/pref/services-sync.js
#endif
#ifdef MOZ_SERVICES_HEALTHREPORT
@BINPATH@/defaults/pref/healthreport-prefs.js
#endif
; [Layout Engine Resources]
; Style Sheets, Graphics and other Resources used by the layout engine.

3
browser/installer/package-manifest.in
View File

@ -593,9 +593,6 @@
#ifdef MOZ_SERVICES_SYNC
@BINPATH@/defaults/pref/services-sync.js
#endif
#ifdef MOZ_SERVICES_HEALTHREPORT
@BINPATH@/defaults/pref/healthreport-prefs.js
#endif
; [Layout Engine Resources]
; Style Sheets, Graphics and other Resources used by the layout engine.

5
mobile/android/installer/package-manifest.in
View File

@ -426,11 +426,6 @@
@BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/defaults/profile/prefs.js
; Services (gre) prefs
#ifdef MOZ_SERVICES_HEALTHREPORT
@BINPATH@/defaults/pref/healthreport-prefs.js
#endif
; [Layout Engine Resources]
; Style Sheets, Graphics and other Resources used by the layout engine.
@BINPATH@/res/EditorOverride.css

3
mobile/xul/installer/package-manifest.in
View File

@ -510,9 +510,6 @@
#ifdef MOZ_SERVICES_SYNC
@BINPATH@/defaults/pref/services-sync.js
#endif
#ifdef MOZ_SERVICES_HEALTHREPORT
@BINPATH@/defaults/pref/healthreport-prefs.js
#endif
; [Layout Engine Resources]
; Style Sheets, Graphics and other Resources used by the layout engine.

9
modules/libpref/src/Makefile.in
View File

@ -40,7 +40,12 @@ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, \
GARBAGE += greprefs.js
GREPREF_FILES = $(topsrcdir)/netwerk/base/public/security-prefs.js $(srcdir)/init/all.js
# TODO bug 813259 external files should be defined near their location in the source tree.
grepref_files = $(topsrcdir)/netwerk/base/public/security-prefs.js $(srcdir)/init/all.js
ifdef MOZ_SERVICES_HEALTHREPORT
grepref_files += $(topsrcdir)/services/healthreport/healthreport-prefs.js
endif
# Optimizer bug with GCC 3.2.2 on OS/2
ifeq ($(OS_ARCH), OS2)
@ -51,7 +56,7 @@ nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
endif
greprefs.js: $(GREPREF_FILES)
greprefs.js: $(grepref_files)
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ > $@
libs:: greprefs.js

2
services/healthreport/Makefile.in
View File

@ -35,6 +35,4 @@ EXTRA_COMPONENTS := \
HealthReportService.js \
$(NULL)
PREF_JS_EXPORTS := healthreport-prefs.js
include $(topsrcdir)/config/rules.mk