Bug 1415742 - Move channel-prefs.js installation to moz.build. r=nalexander,ted

This was awkward because it doesn't want to end up under dist/bin/browser,
but DIST_SUBDIR is exported here. firefox.exe doesn't want to end up under
dist/bin/browser either, so we unset DIST_SUBDIR for this directory and
move the files that need it to a different directory.

MozReview-Commit-ID: Jr1RLUIj0HM

--HG--
extra : rebase_source : 37bbea6792196895316c081176b64db233fe62e1

browser/app/Makefile.in

@@ -53,11 +53,6 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, firefox.js)
 
 endif
 
-# channel-prefs.js is handled separate from other prefs due to bug 756325
-libs:: $(srcdir)/profile/channel-prefs.js
-	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
-	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
 MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)

browser/app/moz.build

@@ -36,18 +36,15 @@ DIRS += ['profile/extensions']
 
 GeckoProgram(CONFIG['MOZ_APP_NAME'])
 
-JS_PREFERENCE_PP_FILES += [
-    'profile/firefox.js',
-]
-
 SOURCES += [
     'nsBrowserApp.cpp',
 ]
 
-FINAL_TARGET_FILES += ['blocklist.xml']
-FINAL_TARGET_FILES.defaults += ['permissions']
+# Neither channel-prefs.js nor firefox.exe want to end up in dist/bin/browser.
+DIST_SUBDIR = ""
 
-DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+# channel-prefs.js is handled separate from other prefs due to bug 756325
+JS_PREFERENCE_PP_FILES += ['profile/channel-prefs.js']
 
 LOCAL_INCLUDES += [
     '!/build',
@@ -74,9 +71,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     RCINCLUDE = 'splash.rc'
     DEFINES['MOZ_PHOENIX'] = True
 
-for cdm in CONFIG['MOZ_EME_MODULES']:
-    DEFINES['MOZ_%s_EME' % cdm.upper()] = True
-
 if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
     # For sandbox includes and the include dependencies those have
     LOCAL_INCLUDES += [
@@ -112,9 +106,6 @@ if CONFIG['MOZ_LINKER']:
 if CONFIG['HAVE_CLOCK_MONOTONIC']:
     OS_LIBS += CONFIG['REALTIME_LIBS']
 
-if CONFIG['MOZ_GPSD']:
-    DEFINES['MOZ_GPSD'] = True
-
 if CONFIG['MOZ_LINUX_32_SSE2_STARTUP_ERROR']:
     DEFINES['MOZ_LINUX_32_SSE2_STARTUP_ERROR'] = True
     COMPILE_FLAGS['OS_CXXFLAGS'] = [

browser/app/profile/channel-prefs.js

@@ -2,4 +2,5 @@
  * 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/. */
 
+#filter substitution
 pref("app.update.channel", "@MOZ_UPDATE_CHANNEL@");

browser/moz.build

@@ -40,6 +40,24 @@ if CONFIG['MOZ_ARTIFACT_BUILDS']:
         '../build/prebuilt-interfaces.manifest',
     ]
 
+
+# These defines are read in firefox.js
+DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+
+for cdm in CONFIG['MOZ_EME_MODULES']:
+    DEFINES['MOZ_%s_EME' % cdm.upper()] = True
+
+if CONFIG['MOZ_GPSD']:
+    DEFINES['MOZ_GPSD'] = True
+
+# These files are specified in this moz.build to pick up DIST_SUBDIR as set in
+# this directory, which is un-set in browser/app.
+JS_PREFERENCE_PP_FILES += [
+    'app/profile/firefox.js',
+]
+FINAL_TARGET_FILES += ['app/blocklist.xml']
+FINAL_TARGET_FILES.defaults += ['app/permissions']
+
 with Files("**"):
     BUG_COMPONENT = ("Firefox", "General")