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 870366 - Part 2: Move PREF_JS_EXPORTS to moz.build (easy moves). r=gps

Browse Source
This commit is contained in:
Brian O'Keefe 2015-01-20 13:07:03 -05:00
parent aa4e523b48
commit 9035722dbf
30 changed files with 79 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/app/Makefile.in
View File

@ -5,8 +5,6 @@
USE_RCS_MK := 1
include $(topsrcdir)/config/makefiles/rcs.mk
PREF_JS_EXPORTS = $(srcdir)/b2g.js
UA_UPDATE_FILE = ua-update.json
$(UA_UPDATE_FILE): % : %.in

5
b2g/app/moz.build
View File

@ -76,3 +76,8 @@ if CONFIG['OS_ARCH'] == 'WINNT':
]
FAIL_ON_WARNINGS = True
JS_PREFERENCE_FILES += [
'b2g.js',
]

5
b2g/dev/app/Makefile.in
View File

@ -1,5 +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/.
PREF_JS_EXPORTS += $(topsrcdir)/b2g/app/b2g.js

5
b2g/dev/app/moz.build
View File

@ -4,3 +4,8 @@
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
JS_PREFERENCE_FILES += [
'/b2g/app/b2g.js',
]

7
browser/app/Makefile.in
View File

@ -4,9 +4,6 @@
dist_dest = $(DIST)/$(MOZ_MACBUNDLE_NAME)
PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
$(NULL)
# hardcode en-US for the moment
AB_CD = en-US
@ -18,10 +15,6 @@ DEFINES += \
-DPBMODE_ICO='"$(DIST)/branding/pbmode.ico"' \
$(NULL)
ifdef LIBXUL_SDK #{
PREF_JS_EXPORTS += $(srcdir)/profile/channel-prefs.js
endif #} LIBXUL_SDK
# Build a binary bootstrapping with XRE_main
ifndef MOZ_WINCONSOLE

9
browser/app/moz.build
View File

@ -11,6 +11,15 @@ if CONFIG['OS_ARCH'] == 'WINNT' and (CONFIG['MOZ_METRO'] or CONFIG['MOZ_ASAN']):
else:
GeckoProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static')
JS_PREFERENCE_FILES += [
'profile/firefox.js',
]
if CONFIG['LIBXUL_SDK']:
PREF_JS_EXPORTS += [
'profile/channel-prefs.js',
]
SOURCES += [
'nsBrowserApp.cpp',
]

2
browser/branding/aurora/Makefile.in
View File

@ -4,8 +4,6 @@
include $(topsrcdir)/config/config.mk
PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
# On Windows only do this step for browser, skip for metro.
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
BRANDING_FILES := \

5
browser/branding/aurora/moz.build
View File

@ -8,3 +8,8 @@ DIRS += ['content', 'locales']
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
JS_PREFERENCE_FILES += [
'pref/firefox-branding.js',
]

2
browser/branding/nightly/Makefile.in
View File

@ -4,8 +4,6 @@
include $(topsrcdir)/config/config.mk
PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
# On Windows only do this step for browser, skip for metro.
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
BRANDING_FILES := \

5
browser/branding/nightly/moz.build
View File

@ -8,3 +8,8 @@ DIRS += ['content', 'locales']
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
JS_PREFERENCE_FILES += [
'pref/firefox-branding.js',
]

2
browser/branding/official/Makefile.in
View File

@ -4,8 +4,6 @@
include $(topsrcdir)/config/config.mk
PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
# On Windows only do this step for browser, skip for metro.
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
BRANDING_FILES := \

5
browser/branding/official/moz.build
View File

@ -8,3 +8,8 @@ DIRS += ['content', 'locales']
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
JS_PREFERENCE_FILES += [
'pref/firefox-branding.js',
]

2
browser/branding/unofficial/Makefile.in
View File

@ -4,8 +4,6 @@
include $(topsrcdir)/config/config.mk
PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
# On Windows only do this step for browser, skip for metro.
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
BRANDING_FILES := \

5
browser/branding/unofficial/moz.build
View File

@ -8,3 +8,8 @@ DIRS += ['content', 'locales']
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
JS_PREFERENCE_FILES += [
'pref/firefox-branding.js',
]

5
browser/devtools/webide/Makefile.in
View File

@ -1,5 +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/.
PREF_JS_EXPORTS = $(srcdir)/webide-prefs.js

5
browser/devtools/webide/moz.build
View File

@ -23,3 +23,8 @@ EXTRA_JS_MODULES.devtools.webide += [
'modules/tab-store.js',
'modules/utils.js'
]
JS_PREFERENCE_FILES += [
'webide-prefs.js',
]

7
browser/metro/profile/Makefile.in
View File

@ -1,7 +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/config.mk
PREF_JS_EXPORTS = $(srcdir)/metro.js

4
browser/metro/profile/moz.build
View File

@ -4,3 +4,7 @@
# 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/.
JS_PREFERENCE_FILES += [
'metro.js',
]

5
mobile/android/app/Makefile.in
View File

@ -1,5 +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/.
PREF_JS_EXPORTS = $(srcdir)/mobile.js

5
mobile/android/app/moz.build
View File

@ -12,3 +12,8 @@ for var in ('MOZ_UPDATER', 'MOZ_APP_UA_NAME', 'ANDROID_PACKAGE_NAME'):
if CONFIG['MOZ_PKG_SPECIAL']:
DEFINES['MOZ_PKG_SPECIAL'] = CONFIG['MOZ_PKG_SPECIAL']
JS_PREFERENCE_FILES += [
'mobile.js',
]

5
services/common/Makefile.in
View File

@ -1,5 +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/.
PREF_JS_EXPORTS := $(srcdir)/services-common.js

5
services/common/moz.build
View File

@ -32,3 +32,8 @@ TESTING_JS_MODULES.services.common += [
'modules-testing/storageserver.js',
'modules-testing/utils.js',
]
JS_PREFERENCE_FILES += [
'services-common.js',
]

1
services/sync/Makefile.in
View File

@ -14,4 +14,3 @@ SYNC_PP_FLAGS := \
SYNC_PP_PATH = $(FINAL_TARGET)/modules/services-sync
PP_TARGETS += SYNC_PP
PREF_JS_EXPORTS := $(srcdir)/services-sync.js

5
services/sync/moz.build
View File

@ -60,3 +60,8 @@ TESTING_JS_MODULES.services.sync += [
'modules-testing/rotaryengine.js',
'modules-testing/utils.js',
]
JS_PREFERENCE_FILES += [
'services-sync.js',
]

3
webapprt/Makefile.in
View File

@ -5,9 +5,6 @@
# Include config.mk explicitly so we can override FINAL_TARGET.
include $(topsrcdir)/config/config.mk
PREF_JS_EXPORTS = $(srcdir)/prefs.js \
$(NULL)
include $(topsrcdir)/config/rules.mk
libs:: $(call mkdir_deps,$(FINAL_TARGET))

5
webapprt/moz.build
View File

@ -53,3 +53,8 @@ DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE']
DEFINES['MOZ_APP_BASENAME'] = CONFIG['MOZ_APP_BASENAME']
JAR_MANIFESTS += ['jar.mn']
JS_PREFERENCE_FILES += [
'prefs.js',
]

1
xulrunner/app/Makefile.in
View File

@ -3,7 +3,6 @@
# 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/.
PREF_JS_EXPORTS = $(srcdir)/xulrunner.js
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js)
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))

5
xulrunner/app/moz.build
View File

@ -55,3 +55,8 @@ if CONFIG['OS_ARCH'] == 'WINNT':
DISABLE_STL_WRAPPING = True
FAIL_ON_WARNINGS = True
JS_PREFERENCE_FILES += [
'xulrunner.js',
]

1
xulrunner/examples/simple/Makefile.in
View File

@ -3,7 +3,6 @@
# 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/.
PREF_JS_EXPORTS = $(srcdir)/simple-prefs.js
DIST_FILES = application.ini
ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))

7
xulrunner/examples/simple/moz.build
View File

@ -8,4 +8,9 @@ DIRS += ['components']
XPI_NAME = 'simple'
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ['jar.mn']
JS_PREFERENCE_FILES += [
'simple-prefs.js',
]