Bug 1124736: Move PREF_JS_EXPORTS to moz.build (c-c easy moves) r=jcr…

…anmer
mozilla · Jan 19, 2015 · 2c9e15f · 2c9e15f
1 parent 63ba43d
commit 2c9e15f
Show file tree

Hide file tree

Showing 26 changed files with 71 additions and 147 deletions.
diff --git a/calendar/lightning/Makefile.in b/calendar/lightning/Makefile.in
@@ -2,13 +2,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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # Calendar builders currently use STRIP_XPI to reduce the binary component in
 # Lightning.
 
@@ -19,7 +12,6 @@ XPI_VERSION = $(LIGHTNING_VERSION)
 XPI_EM_ID = {e2fda1a4-762b-4020-b5ad-a41df1933103}
 
 DIST_FILES = install.rdf application.ini
-PREF_JS_EXPORTS = $(srcdir)/content/lightning.js
 
 # Lighting version number
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)

diff --git a/calendar/lightning/moz.build b/calendar/lightning/moz.build
@@ -26,3 +26,8 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DEFINES['THEME'] = 'osx'
 else:
     DEFINES['THEME'] = 'linux'
+
+JS_PREFERENCE_FILES += [
+    'content/lightning.js',
+]
+
diff --git a/calendar/providers/gdata/Makefile.in b/calendar/providers/gdata/Makefile.in
@@ -2,13 +2,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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 USE_EXTENSION_MANIFEST = 1
 DIST_FILES = install.rdf
 XPI_PKGNAME = gdata-provider-$(GDATA_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
@@ -32,8 +25,6 @@ DEFINES += -DAB_CD=$(AB_CD) \
            -DGDATA_VERSION=$(GDATA_VERSION) \
            $(NULL)
 
-PREF_JS_EXPORTS = $(srcdir)/defaults/preferences.js
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 # If the macbundle dist dir was already created, sync the gdata provider here to avoid
 # the need to make -C objdir/mail/app each time

diff --git a/calendar/providers/gdata/moz.build b/calendar/providers/gdata/moz.build
@@ -36,3 +36,8 @@ EXTRA_COMPONENTS += [
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+JS_PREFERENCE_FILES += [
+    'defaults/preferences.js',
+]
+
diff --git a/calendar/timezones/Makefile.in b/calendar/timezones/Makefile.in
@@ -2,19 +2,10 @@
 # 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/.
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 USE_EXTENSION_MANIFEST = 1
 DIST_FILES = install.rdf
 XPI_PKGNAME = calendar-timezones
 
-PREF_JS_EXPORTS = $(srcdir)/defaults/preferences.js
-
 ifndef DISABLE_LIGHTNING_INSTALL
 # install as a global extension in dist/bin/extensions/
 INSTALL_EXTENSION_ID = calendar-timezones@mozilla.org

diff --git a/calendar/timezones/moz.build b/calendar/timezones/moz.build
@@ -9,3 +9,8 @@ XPI_NAME = 'calendar-timezones'
 export('XPI_NAME')
 
 JAR_MANIFESTS += ['jar.mn']
+
+JS_PREFERENCE_FILES += [
+    'defaults/preferences.js',
+]
+
diff --git a/chat/Makefile.in b/chat/Makefile.in
diff --git a/chat/moz.build b/chat/moz.build
@@ -22,3 +22,7 @@ DIRS += [
 if CONFIG['MOZ_DEBUG']:
     DIRS += ['protocols/jsTest']
 
+JS_PREFERENCE_FILES += [
+    'chat-prefs.js',
+]
+
diff --git a/editor/ui/Makefile.in b/editor/ui/Makefile.in
diff --git a/editor/ui/moz.build b/editor/ui/moz.build
@@ -17,3 +17,8 @@ EXTRA_JS_MODULES += [
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+if not CONFIG['MOZ_STANDALONE_COMPOSER']:
+    JS_PREFERENCE_FILES += [
+        'composer.js'
+    ]
diff --git a/im/app/Makefile.in b/im/app/Makefile.in
@@ -2,13 +2,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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 AB_CD = $(MOZ_UI_LOCALE)
 
 GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
@@ -26,11 +19,6 @@ ifdef SOURCE_REPO
 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
 endif
 
-PREF_JS_EXPORTS = \
-    $(srcdir)/profile/all-instantbird.js \
-    $(srcdir)/profile/channel-prefs.js \
-    $(NULL)
-
 DEFINES += \
   -DAB_CD=$(AB_CD) \
   -DINSTANTBIRD_ICO=\"$(DIST)/branding/instantbird.ico\" \

diff --git a/im/app/moz.build b/im/app/moz.build
@@ -52,3 +52,9 @@ if CONFIG['MOZILLA_OFFICIAL']:
     DEFINES['MOZILLA_OFFICIAL'] = True
 
 DISABLE_STL_WRAPPING = True
+
+JS_PREFERENCE_FILES += [
+    'profile/all-instantbird.js',
+    'profile/channel-prefs.js',
+]
+
diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in
@@ -2,13 +2,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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 AB_CD = $(MOZ_UI_LOCALE) 
 
 GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
@@ -24,11 +17,6 @@ ifdef SOURCE_REPO
 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
 endif
 
-PREF_JS_EXPORTS = \
-    $(srcdir)/profile/all-thunderbird.js \
-    $(srcdir)/profile/channel-prefs.js \
-    $(NULL)
-
 DEFINES += \
   -DAB_CD=$(AB_CD) \
   -DTHUNDERBIRD_ICO='"$(DIST)/branding/thunderbird.ico"' \

diff --git a/mail/app/moz.build b/mail/app/moz.build
@@ -52,3 +52,9 @@ if CONFIG['MOZILLA_OFFICIAL']:
     DEFINES['MOZILLA_OFFICIAL'] = True
 
 DISABLE_STL_WRAPPING = True
+
+JS_PREFERENCE_FILES += [
+    'profile/all-thunderbird.js',
+    'profile/channel-prefs.js',
+]
+
diff --git a/mail/branding/aurora/Makefile.in b/mail/branding/aurora/Makefile.in
@@ -4,15 +4,6 @@
 
 # Branding Makefile for nightlies/unofficial branding
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js
-
 include $(topsrcdir)/config/rules.mk
 
 export::

diff --git a/mail/branding/aurora/moz.build b/mail/branding/aurora/moz.build
@@ -6,3 +6,8 @@
 DIRS += ['locales']
 
 JAR_MANIFESTS += ['jar.mn']
+
+JS_PREFERENCE_FILES += [
+    'thunderbird-branding.js',
+]
+
diff --git a/mail/branding/nightly/Makefile.in b/mail/branding/nightly/Makefile.in
@@ -4,15 +4,6 @@
 
 # Branding Makefile for nightlies/unofficial branding
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js
-
 include $(topsrcdir)/config/rules.mk
 
 export::

diff --git a/mail/branding/nightly/moz.build b/mail/branding/nightly/moz.build
@@ -6,3 +6,8 @@
 DIRS += ['locales']
 
 JAR_MANIFESTS += ['jar.mn']
+
+JS_PREFERENCE_FILES += [
+    'thunderbird-branding.js',
+]
+
diff --git a/mail/components/im/Makefile.in b/mail/components/im/Makefile.in
diff --git a/mail/components/im/moz.build b/mail/components/im/moz.build
@@ -17,3 +17,8 @@ EXTRA_JS_MODULES += [
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+JS_PREFERENCE_FILES += [
+    'all-im.js',
+]
+
diff --git a/mailnews/Makefile.in b/mailnews/Makefile.in
@@ -3,15 +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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-PREF_JS_EXPORTS = $(srcdir)/mailnews.js
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef ENABLE_TESTS

diff --git a/mailnews/moz.build b/mailnews/moz.build
@@ -76,3 +76,8 @@ TESTING_JS_MODULES.mailnews += [
 	'test/resources/MockFactory.js',
 	'test/resources/PromiseTestUtils.jsm',
 ]
+
+JS_PREFERENCE_FILES += [
+    'mailnews.js',
+]
+
diff --git a/other-licenses/branding/thunderbird/Makefile.in b/other-licenses/branding/thunderbird/Makefile.in
@@ -3,15 +3,6 @@
 #  - copies artwork to appropriate places in objdir for bundling into app 
 #    resources
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-PREF_JS_EXPORTS = $(srcdir)/thunderbird-branding.js
-
 include $(topsrcdir)/config/rules.mk
 
 export::

diff --git a/other-licenses/branding/thunderbird/moz.build b/other-licenses/branding/thunderbird/moz.build
@@ -6,3 +6,8 @@
 DIRS += ['locales']
 
 JAR_MANIFESTS += ['jar.mn']
+
+JS_PREFERENCE_FILES += [
+    'thunderbird-branding.js',
+]
+
diff --git a/suite/browser/Makefile.in b/suite/browser/Makefile.in
@@ -3,23 +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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-PREF_JS_EXPORTS = \
-	$(srcdir)/browser-prefs.js \
-	$(NULL)
-
-ifdef LIBXUL_SDK
-PREF_JS_EXPORTS += \
-	$(srcdir)/channel-prefs.js
-	$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 ifndef LIBXUL_SDK

diff --git a/suite/browser/moz.build b/suite/browser/moz.build
@@ -18,3 +18,13 @@ for var in ('MOZ_APP_NAME', 'MOZ_APP_DISPLAYNAME', 'MOZ_APP_VERSION'):
 
 if CONFIG['MOZILLA_OFFICIAL']:
     DEFINES['OFFICIAL_BUILD'] = 1
+
+if CONFIG['LIBXUL_SDK']:
+    PREF_JS_EXPORTS += [
+        'channel-prefs.js'
+    ]
+
+JS_PREFERENCE_FILES += [
+    'browser-prefs.js',
+]
+