Bug 780313 - Remove unnecessary preprocessing of Toolkit files. r=gavin

toolkit/components/Makefile.in

@@ -88,7 +88,9 @@ DIRS += \
   build \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = nsDefaultCLH.js
-EXTRA_COMPONENTS = nsDefaultCLH.manifest
+EXTRA_COMPONENTS = \
+  nsDefaultCLH.manifest \
+  nsDefaultCLH.js \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk

toolkit/components/console/Makefile.in

@@ -1,4 +1,3 @@
-#
 # 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/.
@@ -11,7 +10,9 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_PP_COMPONENTS = jsconsole-clhandler.js jsconsole-clhandler.manifest
+EXTRA_COMPONENTS = \
+  jsconsole-clhandler.js \
+  jsconsole-clhandler.manifest \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-

toolkit/components/console/jsconsole-clhandler.js

@@ -1,8 +1,10 @@
-# -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# vim:sw=4:sr:sta:et:sts:
-# 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/.
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:sw=4:sr:sta:et:sts: */
+
+/* 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/. */
+
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");

toolkit/components/nsDefaultCLH.js

@@ -1,6 +1,6 @@
-# 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/.
+/* 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/. */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 

toolkit/components/search/Makefile.in

@@ -9,9 +9,14 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_COMPONENTS = toolkitsearch.manifest
-EXTRA_PP_COMPONENTS = nsSearchService.js \
-	nsSearchSuggestions.js
+EXTRA_COMPONENTS = \
+  toolkitsearch.manifest \
+  nsSearchSuggestions.js \
+  $(NULL)
+
+EXTRA_PP_COMPONENTS = \
+  nsSearchService.js \
+  $(NULL)
 
 DEFINES += -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID)
 

toolkit/components/urlformatter/Makefile.in

@@ -18,9 +18,6 @@ XPIDLSRCS = \
 
 EXTRA_COMPONENTS = \
   nsURLFormatter.manifest \
-  $(NULL)
-
-EXTRA_PP_COMPONENTS = \
   nsURLFormatter.js \
   $(NULL)
 

toolkit/components/urlformatter/nsURLFormatter.js

@@ -1,7 +1,8 @@
-# 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/.
-/**
+/* 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/. */
+
+ /**
  * @class nsURLFormatterService
  *
  * nsURLFormatterService exposes methods to substitute variables in URL formats.

toolkit/content/Makefile.in

@@ -57,20 +57,20 @@ endif
 TEST_DIRS += tests
 
 EXTRA_JS_MODULES = \
+  debug.js \
   Geometry.jsm \
   InlineSpellChecker.jsm \
   PopupNotifications.jsm \
   Dict.jsm \
+  PageMenu.jsm \
   PropertyListUtils.jsm \
   PrivateBrowsingUtils.jsm \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = \
-  debug.js \
   LightweightThemeConsumer.jsm \
   Services.jsm \
   WindowDraggingUtils.jsm \
-  PageMenu.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

toolkit/content/PageMenu.jsm

@@ -1,6 +1,6 @@
-# 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/.
+/* 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/. */
 
 let EXPORTED_SYMBOLS = ["PageMenu"];
 

toolkit/content/debug.js

@@ -1,12 +1,12 @@
-# vim:set ts=2 sw=2 sts=2 ci et:
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-#
-# 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/.
-#
-# This file contains functions that are useful for debugging purposes from
-# within JavaScript code.
+/* vim:set ts=2 sw=2 sts=2 ci et: */
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
+/* 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/. */
+
+// This file contains functions that are useful for debugging purposes from
+// within JavaScript code.
 
 var EXPORTED_SYMBOLS = ["NS_ASSERT"];
 

toolkit/mozapps/extensions/Makefile.in

@@ -26,26 +26,29 @@ XPIDLSRCS = \
   $(NULL)
 
 EXTRA_PP_COMPONENTS = \
-  extensions.manifest \
   nsBlocklistService.js \
+  $(NULL)
+
+EXTRA_COMPONENTS = \
+  extensions.manifest \
   addonManager.js \
   amContentHandler.js \
   amWebInstallListener.js \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = \
-  AddonLogging.jsm \
   AddonManager.jsm \
-  AddonRepository.jsm \
-  AddonUpdateChecker.jsm \
-  PluginProvider.jsm \
   XPIProvider.jsm \
   XPIProviderUtils.js \
   $(NULL)
 
 EXTRA_JS_MODULES = \
+  AddonLogging.jsm \
+  AddonRepository.jsm \
+  AddonUpdateChecker.jsm \
   ChromeManifestParser.jsm \
   LightweightThemeManager.jsm \
+  PluginProvider.jsm \
   SpellCheckDictionaryBootstrap.js \
   $(NULL)
 

toolkit/mozapps/extensions/addonManager.js

@@ -1,8 +1,6 @@
-/*
-# 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/.
-*/
+/* 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/. */
 
 /**
  * This component serves as integration between the platform and AddonManager.

toolkit/mozapps/extensions/amContentHandler.js

@@ -1,8 +1,6 @@
-/*
-# 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/.
-*/
+/* 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/. */
 
 "use strict";
 

toolkit/mozapps/extensions/amWebInstallListener.js

@@ -1,8 +1,6 @@
-/*
-# 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/.
-*/
+/* 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/. */
 
 /**
  * This is a default implementation of amIWebInstallListener that should work

toolkit/mozapps/extensions/nsBlocklistService.js

@@ -1,9 +1,8 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
-# 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/.
-*/
+
+/* 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/. */
 
 "use strict";
 

toolkit/mozapps/shared/Makefile.in

@@ -14,6 +14,9 @@ MODULE = toolkitShared
 
 EXTRA_PP_JS_MODULES = \
   CertUtils.jsm \
+  $(NULL)
+
+EXTRA_JS_MODULES = \
   FileUtils.jsm \
   $(NULL)
 

toolkit/mozapps/update/Makefile.in

@@ -13,7 +13,10 @@ MODULE = update
 
 XPIDLSRCS = nsIUpdateTimerManager.idl
 
-EXTRA_PP_COMPONENTS = nsUpdateTimerManager.js nsUpdateTimerManager.manifest
+EXTRA_COMPONENTS = \
+  nsUpdateTimerManager.js \
+  nsUpdateTimerManager.manifest \
+  $(NULL)
 
 ifdef MOZ_UPDATER
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
@@ -26,8 +29,12 @@ XPIDLSRCS += nsIUpdateService.idl
 EXTRA_PP_COMPONENTS += \
   nsUpdateService.js \
   nsUpdateServiceStub.js \
+  $(NULL)
+
+EXTRA_COMPONENTS += \
   nsUpdateService.manifest \
   $(NULL)
+
 else
 
 # If only the maintenance service is installed and not

toolkit/mozapps/update/nsUpdateTimerManager.js

@@ -1,8 +1,7 @@
-/*
-# 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/.
-*/
+/* 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/. */
+
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
@@ -21,16 +20,16 @@ XPCOMUtils.defineLazyGetter(this, "gLogEnabled", function tm_gLogEnabled() {
 });
 
 /**
-#  Gets a preference value, handling the case where there is no default.
-#  @param   func
-#           The name of the preference function to call, on nsIPrefBranch
-#  @param   preference
-#           The name of the preference
-#  @param   defaultValue
-#           The default value to return in the event the preference has
-#           no setting
-#  @returns The value of the preference, or undefined if there was no
-#           user or default value.
+ *  Gets a preference value, handling the case where there is no default.
+ *  @param   func
+ *           The name of the preference function to call, on nsIPrefBranch
+ *  @param   preference
+ *           The name of the preference
+ *  @param   defaultValue
+ *           The default value to return in the event the preference has
+ *           no setting
+ *  @returns The value of the preference, or undefined if there was no
+ *           user or default value.
  */
 function getPref(func, preference, defaultValue) {
   try {
@@ -42,9 +41,9 @@ function getPref(func, preference, defaultValue) {
 }
 
 /**
-#  Logs a string to the error console.
-#  @param   string
-#           The string to write to the error console.
+ *  Logs a string to the error console.
+ *  @param   string
+ *           The string to write to the error console.
  */
 function LOG(string) {
   if (gLogEnabled) {
@@ -54,9 +53,9 @@ function LOG(string) {
 }
 
 /**
-#  A manager for timers. Manages timers that fire over long periods of time
-#  (e.g. days, weeks, months).
-#  @constructor
+ *  A manager for timers. Manages timers that fire over long periods of time
+ *  (e.g. days, weeks, months).
+ *  @constructor
  */
 function TimerManager() {
   Services.obs.addObserver(this, "xpcom-shutdown", false);
@@ -68,9 +67,9 @@ TimerManager.prototype = {
   _timer: null,
 
   /**
-#    The Checker Timer minimum delay interval as specified by the
-#    app.update.timerMinimumDelay pref. If the app.update.timerMinimumDelay
-#    pref doesn't exist this will default to 120000.
+ *    The Checker Timer minimum delay interval as specified by the
+ *    app.update.timerMinimumDelay pref. If the app.update.timerMinimumDelay
+ *    pref doesn't exist this will default to 120000.
    */
    _timerMinimumDelay: null,
 
@@ -117,14 +116,14 @@ TimerManager.prototype = {
   },
 
   /**
-#    Called when the checking timer fires.
-#
-#    We only fire one notification each time, so that the operations are
-#    staggered. We don't want too many to happen at once, which could
-#    negatively impact responsiveness.
-#
-#    @param   timer
-#             The checking timer that fired.
+   * Called when the checking timer fires.
+   *
+   * We only fire one notification each time, so that the operations are
+   * staggered. We don't want too many to happen at once, which could
+   * negatively impact responsiveness.
+   *
+   * @param   timer
+   *          The checking timer that fired.
    */
   notify: function TM_notify(timer) {
     var nextDelay = null;