Remove some unnecessary preprocessing, no bug
authorGavin Sharp <gavin@gavinsharp.com>
Sun, 17 Feb 2013 17:49:25 -0800
changeset 122667 6583bff5300a93419021b777e77ce66d3fa6bb30
parent 122666 e7d1e1d555344d9bd7927cc736c1eac3b98600e7
child 122668 09d5766f58799dff4a11a4a1fab40a2eeb5394aa
push id23428
push usergsharp@mozilla.com
push dateFri, 22 Feb 2013 17:39:34 +0000
treeherdermozilla-inbound@09d5766f5879 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone22.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Remove some unnecessary preprocessing, no bug
browser/components/downloads/src/Makefile.in
browser/components/places/jar.mn
browser/components/places/src/Makefile.in
browser/components/sessionstore/src/Makefile.in
dom/base/Makefile.in
dom/ipc/jar.mn
services/sync/Makefile.in
toolkit/components/console/jar.mn
toolkit/content/Makefile.in
toolkit/content/aboutTelemetry.xhtml
toolkit/content/jar.mn
toolkit/mozapps/update/Makefile.in
toolkit/mozapps/update/nsUpdateServiceStub.js
--- a/browser/components/downloads/src/Makefile.in
+++ b/browser/components/downloads/src/Makefile.in
@@ -7,19 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_COMPONENTS = \
   BrowserDownloads.manifest \
   DownloadsUI.js \
-  $(NULL)
-
-EXTRA_PP_COMPONENTS = \
   DownloadsStartup.js \
   $(NULL)
 
 EXTRA_JS_MODULES = \
   DownloadsCommon.jsm \
   DownloadsLogger.jsm \
   $(NULL)
 
--- a/browser/components/places/jar.mn
+++ b/browser/components/places/jar.mn
@@ -11,17 +11,17 @@ browser.jar:
 *   content/browser/places/places.js                     (content/places.js)
     content/browser/places/places.css                    (content/places.css)
     content/browser/places/organizer.css                 (content/organizer.css)
     content/browser/places/bookmarkProperties.xul        (content/bookmarkProperties.xul)
     content/browser/places/bookmarkProperties.js         (content/bookmarkProperties.js)
     content/browser/places/placesOverlay.xul             (content/placesOverlay.xul)
 *   content/browser/places/menu.xml                      (content/menu.xml)
     content/browser/places/tree.xml                      (content/tree.xml)
-*   content/browser/places/controller.js                 (content/controller.js)
+    content/browser/places/controller.js                 (content/controller.js)
     content/browser/places/treeView.js                   (content/treeView.js)
 *   content/browser/places/browserPlacesViews.js         (content/browserPlacesViews.js)
 # keep the Places version of the history sidebar at history/history-panel.xul 
 # to prevent having to worry about between versions of the browser
 *   content/browser/history/history-panel.xul            (content/history-panel.xul) 
     content/browser/places/history-panel.js              (content/history-panel.js)
 # ditto for the bookmarks sidebar
     content/browser/bookmarks/bookmarksPanel.xul         (content/bookmarksPanel.xul)
--- a/browser/components/places/src/Makefile.in
+++ b/browser/components/places/src/Makefile.in
@@ -10,15 +10,15 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_COMPONENTS = \
   BrowserPlaces.manifest \
   PlacesProtocolHandler.js \
   $(NULL)
 
-EXTRA_PP_JS_MODULES = \
+EXTRA_JS_MODULES = \
   PlacesUIUtils.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 XPIDL_FLAGS += -I$(topsrcdir)/browser/components
--- a/browser/components/sessionstore/src/Makefile.in
+++ b/browser/components/sessionstore/src/Makefile.in
@@ -8,20 +8,19 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 EXTRA_COMPONENTS = \
   nsSessionStore.manifest \
   nsSessionStore.js \
+  nsSessionStartup.js \
   $(NULL)
 
-EXTRA_PP_COMPONENTS := nsSessionStartup.js
-
 JS_MODULES_PATH := $(FINAL_TARGET)/modules/sessionstore
 
 EXTRA_JS_MODULES := \
   DocumentUtils.jsm \
   SessionStorage.jsm \
   XPathGenerator.jsm \
   _SessionFile.jsm \
   $(NULL)
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -20,19 +20,16 @@ endif # !_MSC_VER
 
 DIRS = \
   test \
   $(NULL)
 
 EXTRA_COMPONENTS = \
   SiteSpecificUserAgent.js \
   SiteSpecificUserAgent.manifest \
-  $(NULL)
-
-EXTRA_PP_COMPONENTS = \
   ConsoleAPI.js \
   ConsoleAPI.manifest \
   $(NULL)
 
 EXTRA_JS_MODULES = ConsoleAPIStorage.jsm \
   $(NULL)
 
 EXTRA_JS_MODULES += \
--- a/dom/ipc/jar.mn
+++ b/dom/ipc/jar.mn
@@ -1,11 +1,11 @@
 # 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/.
 
 toolkit.jar:
         content/global/test-ipc.xul (test.xul)
         content/global/remote-test-ipc.js (remote-test.js)
         content/global/BrowserElementChild.js (../browser-element/BrowserElementChild.js)
-*       content/global/BrowserElementChildPreload.js (../browser-element/BrowserElementChildPreload.js)
+        content/global/BrowserElementChildPreload.js (../browser-element/BrowserElementChildPreload.js)
 *       content/global/BrowserElementPanning.js (../browser-element/BrowserElementPanning.js)
         content/global/preload.js (preload.js)
--- a/services/sync/Makefile.in
+++ b/services/sync/Makefile.in
@@ -47,23 +47,19 @@ sync_engine_modules := \
   addons.js \
   apps.js \
   bookmarks.js \
   clients.js \
   forms.js \
   history.js \
   passwords.js \
   prefs.js \
+  tabs.js \
   $(NULL)
 
-# Preprocess engine files.
-SYNC_PP_ENGINE := modules/engines/tabs.js
-SYNC_PP_ENGINE_PATH = $(FINAL_TARGET)/modules/services-sync/engines
-PP_TARGETS += SYNC_PP_ENGINE
-
 sync_stage_modules := \
   cluster.js \
   enginesync.js \
   $(NULL)
 
 sync_testing_modules := \
   fakeservices.js \
   rotaryengine.js \
--- a/toolkit/components/console/jar.mn
+++ b/toolkit/components/console/jar.mn
@@ -1,9 +1,9 @@
 # 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/.
 
 toolkit.jar:
    content/global/console.js                            (content/console.js)
    content/global/console.xul                           (content/console.xul)
    content/global/console.css                           (content/console.css)
-*  content/global/consoleBindings.xml                   (content/consoleBindings.xml)
+   content/global/consoleBindings.xml                   (content/consoleBindings.xml)
--- a/toolkit/content/Makefile.in
+++ b/toolkit/content/Makefile.in
@@ -58,20 +58,20 @@ EXTRA_JS_MODULES = \
   Deprecated.jsm \
   Dict.jsm \
   Geometry.jsm \
   InlineSpellChecker.jsm \
   PageMenu.jsm \
   PopupNotifications.jsm \
   PropertyListUtils.jsm \
   Task.jsm \
+  PrivateBrowsingUtils.jsm \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = \
-  PrivateBrowsingUtils.jsm \
   Services.jsm \
   WindowDraggingUtils.jsm \
   Troubleshoot.jsm \
   UpdateChannel.jsm \
   $(NULL)
 
 ifneq (Android,$(OS_TARGET))
 EXTRA_PP_JS_MODULES += LightweightThemeConsumer.jsm
--- a/toolkit/content/aboutTelemetry.xhtml
+++ b/toolkit/content/aboutTelemetry.xhtml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-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/. -->
 
 <!DOCTYPE html [
   <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD;
   <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
   <!ENTITY % aboutTelemetryDTD SYSTEM "chrome://global/locale/aboutTelemetry.dtd"> %aboutTelemetryDTD;
 ]>
 
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -12,17 +12,17 @@ toolkit.jar:
    content/global/menulist.css                (menulist.css)
    content/global/about.xhtml                 (about.xhtml)
    content/global/aboutAbout.xhtml            (aboutAbout.xhtml)
    content/global/aboutRights.xhtml           (aboutRights.xhtml)
    content/global/aboutRights-unbranded.xhtml (aboutRights-unbranded.xhtml)
 *  content/global/aboutSupport.js
 *  content/global/aboutSupport.xhtml
 *  content/global/aboutTelemetry.js
-*  content/global/aboutTelemetry.xhtml
+   content/global/aboutTelemetry.xhtml
    content/global/aboutTelemetry.css          (aboutTelemetry.css)
    content/global/directionDetector.html
    content/global/plugins.html
    content/global/plugins.css
 *+  content/global/buildconfig.html            (buildconfig.html)
 +  content/global/charsetOverlay.js           (charsetOverlay.js)
 +  content/global/charsetOverlay.xul          (charsetOverlay.xul)
 *  content/global/contentAreaUtils.js         (contentAreaUtils.js)
--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@@ -23,21 +23,21 @@ ifneq (android,$(MOZ_WIDGET_TOOLKIT))
 DIRS += common
 DIRS += updater
 endif
 
 XPIDLSRCS += nsIUpdateService.idl
 
 EXTRA_PP_COMPONENTS += \
   nsUpdateService.js \
-  nsUpdateServiceStub.js \
   $(NULL)
 
 EXTRA_COMPONENTS += \
   nsUpdateService.manifest \
+  nsUpdateServiceStub.js \
   $(NULL)
 
 else
 
 # If only the maintenance service is installed and not
 # the updater, then the maintenance service may still be
 # used for other things.  We need to build update/common
 # which the maintenance service uses.
--- a/toolkit/mozapps/update/nsUpdateServiceStub.js
+++ b/toolkit/mozapps/update/nsUpdateServiceStub.js
@@ -1,31 +1,30 @@
 /* -*- Mode: C++; tab-width: 8; 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/. */
+
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/FileUtils.jsm");
 
 const Ci = Components.interfaces;
 
 const DIR_UPDATES         = "updates";
 const FILE_UPDATE_STATUS  = "update.status";
 
 const KEY_UPDROOT         = "UpdRootD";
 
 /**
-#  Gets the specified directory at the specified hierarchy under the update root
-#  directory without creating it if it doesn't exist.
-#  @param   pathArray
-#           An array of path components to locate beneath the directory
-#           specified by |key|
-#  @return  nsIFile object for the location specified.
+ * Gets the specified directory at the specified hierarchy under the update root
+ * directory without creating it if it doesn't exist.
+ * @param   pathArray
+ *          An array of path components to locate beneath the directory
+ *          specified by |key|
+ * @return  nsIFile object for the location specified.
  */
 function getUpdateDirNoCreate(pathArray) {
   return FileUtils.getDir(KEY_UPDROOT, pathArray, false);
 }
 
 function UpdateServiceStub() {
   let statusFile = getUpdateDirNoCreate([DIR_UPDATES, "0"]);
   statusFile.append(FILE_UPDATE_STATUS);