Bug 828116 - Move modules in toolkit/content and toolkit/mozapps/shared to toolkit/modules. r=Mossop
authorEkanan Ketunuti <ananuti@gmail.com>
Tue, 14 May 2013 14:37:18 -0700
changeset 131934 b880a068345e6fc2ec6255a9d1199e33a365a065
parent 131933 bf0bcf4ecf28b0a935478f25be28c1757efd4881
child 131935 d08934cfce041a326591ef0a829f5ce9c1f5c5bc
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-esr52@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMossop
bugs828116
milestone24.0a1
Bug 828116 - Move modules in toolkit/content and toolkit/mozapps/shared to toolkit/modules. r=Mossop
toolkit/components/search/nsSearchService.js
toolkit/content/DeferredTask.jsm
toolkit/content/Deprecated.jsm
toolkit/content/Dict.jsm
toolkit/content/Geometry.jsm
toolkit/content/InlineSpellChecker.jsm
toolkit/content/LightweightThemeConsumer.jsm
toolkit/content/Makefile.in
toolkit/content/PageMenu.jsm
toolkit/content/PopupNotifications.jsm
toolkit/content/PrivateBrowsingUtils.jsm
toolkit/content/PropertyListUtils.jsm
toolkit/content/Services.jsm
toolkit/content/Task.jsm
toolkit/content/Troubleshoot.jsm
toolkit/content/UpdateChannel.jsm
toolkit/content/WindowDraggingUtils.jsm
toolkit/content/debug.js
toolkit/content/tests/browser/Makefile.in
toolkit/content/tests/browser/browser_DeferredTask.js
toolkit/content/tests/browser/browser_Deprecated.js
toolkit/content/tests/browser/browser_Geometry.js
toolkit/content/tests/browser/browser_InlineSpellChecker.js
toolkit/content/tests/browser/browser_Services.js
toolkit/content/tests/browser/browser_Troubleshoot.js
toolkit/content/tests/unit/propertyLists/bug710259_propertyListBinary.plist
toolkit/content/tests/unit/propertyLists/bug710259_propertyListXML.plist
toolkit/content/tests/unit/test_dict.js
toolkit/content/tests/unit/test_propertyListsUtils.js
toolkit/content/tests/unit/test_task.js
toolkit/content/tests/unit/xpcshell.ini
toolkit/modules/CertUtils.jsm
toolkit/modules/DeferredTask.jsm
toolkit/modules/Deprecated.jsm
toolkit/modules/Dict.jsm
toolkit/modules/FileUtils.jsm
toolkit/modules/Geometry.jsm
toolkit/modules/InlineSpellChecker.jsm
toolkit/modules/LightweightThemeConsumer.jsm
toolkit/modules/Makefile.in
toolkit/modules/PageMenu.jsm
toolkit/modules/PopupNotifications.jsm
toolkit/modules/PrivateBrowsingUtils.jsm
toolkit/modules/PropertyListUtils.jsm
toolkit/modules/Services.jsm
toolkit/modules/Task.jsm
toolkit/modules/Troubleshoot.jsm
toolkit/modules/UpdateChannel.jsm
toolkit/modules/WindowDraggingUtils.jsm
toolkit/modules/debug.js
toolkit/modules/tests/browser/Makefile.in
toolkit/modules/tests/browser/browser_DeferredTask.js
toolkit/modules/tests/browser/browser_Deprecated.js
toolkit/modules/tests/browser/browser_Geometry.js
toolkit/modules/tests/browser/browser_InlineSpellChecker.js
toolkit/modules/tests/browser/browser_Services.js
toolkit/modules/tests/browser/browser_Troubleshoot.js
toolkit/modules/tests/browser/moz.build
toolkit/modules/tests/chrome/Makefile.in
toolkit/modules/tests/chrome/moz.build
toolkit/modules/tests/chrome/test_bug544442_checkCert.xul
toolkit/modules/tests/moz.build
toolkit/modules/tests/xpcshell/propertyLists/bug710259_propertyListBinary.plist
toolkit/modules/tests/xpcshell/propertyLists/bug710259_propertyListXML.plist
toolkit/modules/tests/xpcshell/test_FileUtils.js
toolkit/modules/tests/xpcshell/test_dict.js
toolkit/modules/tests/xpcshell/test_propertyListsUtils.js
toolkit/modules/tests/xpcshell/test_readCertPrefs.js
toolkit/modules/tests/xpcshell/test_task.js
toolkit/modules/tests/xpcshell/xpcshell.ini
toolkit/moz.build
toolkit/mozapps/shared/CertUtils.jsm
toolkit/mozapps/shared/FileUtils.jsm
toolkit/mozapps/shared/Makefile.in
toolkit/mozapps/shared/moz.build
toolkit/mozapps/shared/test/chrome/Makefile.in
toolkit/mozapps/shared/test/chrome/moz.build
toolkit/mozapps/shared/test/chrome/test_bug544442_checkCert.xul
toolkit/mozapps/shared/test/unit/test_FileUtils.js
toolkit/mozapps/shared/test/unit/test_readCertPrefs.js
toolkit/mozapps/shared/test/unit/xpcshell.ini
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -4193,9 +4193,9 @@ var engineUpdateService = {
       // otherwise use the existing engine object.
       (testEngine || engine)._setIcon(engine._iconUpdateURL, true);
     }
   }
 };
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SearchService]);
 
-#include ../../../toolkit/content/debug.js
+#include ../../../toolkit/modules/debug.js
--- a/toolkit/content/Makefile.in
+++ b/toolkit/content/Makefile.in
@@ -41,38 +41,9 @@ endif
 source_repo ?= $(call getSourceRepo)
 ifneq (,$(filter http%,$(source_repo)))
   DEFINES += -DSOURCE_REPO="$(source_repo)"
 endif
 
 BUILD_HOSTNAME = $(shell hostname -s || hostname)
 DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)"
 
-ifdef MOZ_TOOLKIT_SEARCH
-DEFINES += -DMOZ_TOOLKIT_SEARCH
-endif
-
-EXTRA_JS_MODULES = \
-  debug.js \
-  DeferredTask.jsm \
-  Deprecated.jsm \
-  Dict.jsm \
-  Geometry.jsm \
-  InlineSpellChecker.jsm \
-  PageMenu.jsm \
-  PopupNotifications.jsm \
-  PropertyListUtils.jsm \
-  Task.jsm \
-  PrivateBrowsingUtils.jsm \
-  $(NULL)
-
-EXTRA_PP_JS_MODULES = \
-  Services.jsm \
-  WindowDraggingUtils.jsm \
-  Troubleshoot.jsm \
-  UpdateChannel.jsm \
-  $(NULL)
-
-ifneq (Android,$(OS_TARGET))
-EXTRA_PP_JS_MODULES += LightweightThemeConsumer.jsm
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/content/tests/browser/Makefile.in
+++ b/toolkit/content/tests/browser/Makefile.in
@@ -10,21 +10,15 @@ VPATH          = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_BROWSER_FILES = \
   browser_keyevents_during_autoscrolling.js \
   browser_bug295977_autoscroll_overflow.js \
   browser_bug594509.js \
-  browser_Geometry.js \
-  browser_InlineSpellChecker.js \
   browser_save_resend_postdata.js \
   browser_browserDrop.js \
-  browser_Services.js \
-  browser_DeferredTask.js \
   browser_default_image_filename.js \
-  browser_Troubleshoot.js \
-  browser_Deprecated.js \
   browser_input_file_tooltips.js \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/content/tests/unit/xpcshell.ini
+++ b/toolkit/content/tests/unit/xpcshell.ini
@@ -1,8 +1,5 @@
 [DEFAULT]
 head = 
 tail = 
 
 [test_contentAreaUtils.js]
-[test_dict.js]
-[test_propertyListsUtils.js]
-[test_task.js]
rename from toolkit/mozapps/shared/CertUtils.jsm
rename to toolkit/modules/CertUtils.jsm
rename from toolkit/content/DeferredTask.jsm
rename to toolkit/modules/DeferredTask.jsm
rename from toolkit/content/Deprecated.jsm
rename to toolkit/modules/Deprecated.jsm
rename from toolkit/content/Dict.jsm
rename to toolkit/modules/Dict.jsm
rename from toolkit/mozapps/shared/FileUtils.jsm
rename to toolkit/modules/FileUtils.jsm
rename from toolkit/content/Geometry.jsm
rename to toolkit/modules/Geometry.jsm
rename from toolkit/content/InlineSpellChecker.jsm
rename to toolkit/modules/InlineSpellChecker.jsm
rename from toolkit/content/LightweightThemeConsumer.jsm
rename to toolkit/modules/LightweightThemeConsumer.jsm
--- a/toolkit/modules/Makefile.in
+++ b/toolkit/modules/Makefile.in
@@ -4,18 +4,46 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_TOOLKIT_SEARCH
+DEFINES += -DMOZ_TOOLKIT_SEARCH
+endif
+
 EXTRA_JS_MODULES := \
+  debug.js \
+  DeferredTask.jsm \
+  Deprecated.jsm \
+  Dict.jsm \
+  FileUtils.jsm \
+  Geometry.jsm \
+  InlineSpellChecker.jsm \
   NewTabUtils.jsm \
+  PageMenu.jsm \
+  PopupNotifications.jsm \
   Preferences.jsm \
+  PrivateBrowsingUtils.jsm \
+  PropertyListUtils.jsm \
   RemoteWebProgress.jsm \
   Sqlite.jsm \
+  Task.jsm \
   TelemetryTimestamps.jsm \
   Timer.jsm \
   $(NULL)
 
+EXTRA_PP_JS_MODULES = \
+  CertUtils.jsm \
+  Services.jsm \
+  Troubleshoot.jsm \
+  UpdateChannel.jsm \
+  WindowDraggingUtils.jsm \
+  $(NULL)
+
+ifneq (Android,$(OS_TARGET))
+EXTRA_PP_JS_MODULES += LightweightThemeConsumer.jsm
+endif
+
 include $(topsrcdir)/config/rules.mk
rename from toolkit/content/PageMenu.jsm
rename to toolkit/modules/PageMenu.jsm
rename from toolkit/content/PopupNotifications.jsm
rename to toolkit/modules/PopupNotifications.jsm
rename from toolkit/content/PrivateBrowsingUtils.jsm
rename to toolkit/modules/PrivateBrowsingUtils.jsm
rename from toolkit/content/PropertyListUtils.jsm
rename to toolkit/modules/PropertyListUtils.jsm
rename from toolkit/content/Services.jsm
rename to toolkit/modules/Services.jsm
rename from toolkit/content/Task.jsm
rename to toolkit/modules/Task.jsm
rename from toolkit/content/Troubleshoot.jsm
rename to toolkit/modules/Troubleshoot.jsm
rename from toolkit/content/UpdateChannel.jsm
rename to toolkit/modules/UpdateChannel.jsm
rename from toolkit/content/WindowDraggingUtils.jsm
rename to toolkit/modules/WindowDraggingUtils.jsm
rename from toolkit/content/debug.js
rename to toolkit/modules/debug.js
new file mode 100644
--- /dev/null
+++ b/toolkit/modules/tests/browser/Makefile.in
@@ -0,0 +1,24 @@
+#
+# 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/.
+
+DEPTH          = @DEPTH@
+topsrcdir      = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
+relativesrcdir = @relativesrcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MOCHITEST_BROWSER_FILES = \
+  browser_DeferredTask.js \
+  browser_Deprecated.js \
+  browser_Geometry.js \
+  browser_InlineSpellChecker.js \
+  browser_Services.js \
+  browser_Troubleshoot.js \
+  
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk
rename from toolkit/content/tests/browser/browser_DeferredTask.js
rename to toolkit/modules/tests/browser/browser_DeferredTask.js
rename from toolkit/content/tests/browser/browser_Deprecated.js
rename to toolkit/modules/tests/browser/browser_Deprecated.js
rename from toolkit/content/tests/browser/browser_Geometry.js
rename to toolkit/modules/tests/browser/browser_Geometry.js
rename from toolkit/content/tests/browser/browser_InlineSpellChecker.js
rename to toolkit/modules/tests/browser/browser_InlineSpellChecker.js
rename from toolkit/content/tests/browser/browser_Services.js
rename to toolkit/modules/tests/browser/browser_Services.js
rename from toolkit/content/tests/browser/browser_Troubleshoot.js
rename to toolkit/modules/tests/browser/browser_Troubleshoot.js
new file mode 100644
--- /dev/null
+++ b/toolkit/modules/tests/browser/moz.build
@@ -0,0 +1,6 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
rename from toolkit/mozapps/shared/test/chrome/Makefile.in
rename to toolkit/modules/tests/chrome/Makefile.in
rename from toolkit/mozapps/shared/test/chrome/moz.build
rename to toolkit/modules/tests/chrome/moz.build
rename from toolkit/mozapps/shared/test/chrome/test_bug544442_checkCert.xul
rename to toolkit/modules/tests/chrome/test_bug544442_checkCert.xul
--- a/toolkit/modules/tests/moz.build
+++ b/toolkit/modules/tests/moz.build
@@ -1,7 +1,11 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
+DIRS += ['browser']
+
+MODULE = 'test_toolkit_general'
+
 XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
rename from toolkit/content/tests/unit/propertyLists/bug710259_propertyListBinary.plist
rename to toolkit/modules/tests/xpcshell/propertyLists/bug710259_propertyListBinary.plist
rename from toolkit/content/tests/unit/propertyLists/bug710259_propertyListXML.plist
rename to toolkit/modules/tests/xpcshell/propertyLists/bug710259_propertyListXML.plist
rename from toolkit/mozapps/shared/test/unit/test_FileUtils.js
rename to toolkit/modules/tests/xpcshell/test_FileUtils.js
rename from toolkit/content/tests/unit/test_dict.js
rename to toolkit/modules/tests/xpcshell/test_dict.js
rename from toolkit/content/tests/unit/test_propertyListsUtils.js
rename to toolkit/modules/tests/xpcshell/test_propertyListsUtils.js
rename from toolkit/mozapps/shared/test/unit/test_readCertPrefs.js
rename to toolkit/modules/tests/xpcshell/test_readCertPrefs.js
rename from toolkit/content/tests/unit/test_task.js
rename to toolkit/modules/tests/xpcshell/test_task.js
--- a/toolkit/modules/tests/xpcshell/xpcshell.ini
+++ b/toolkit/modules/tests/xpcshell/xpcshell.ini
@@ -1,9 +1,14 @@
 [DEFAULT]
 head =
 tail =
 
+[test_dict.js]
+[test_FileUtils.js]
 [test_newtab-migrate-v1.js]
 [test_Preferences.js]
+[test_propertyListsUtils.js]
+[test_readCertPrefs.js]
 [test_sqlite.js]
+[test_task.js]
 [test_TelemetryTimestamps.js]
 [test_timer.js]
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -12,17 +12,16 @@ PARALLEL_DIRS += [
     'identity',
     'locales',
     'modules',
     'mozapps/downloads',
     'mozapps/extensions',
     'mozapps/handling',
     'mozapps/preferences',
     'mozapps/plugins',
-    'mozapps/shared',
     'obsolete',
     'profile',
     'themes',
     'webapps',
 ]
 
 DIRS += ['mozapps/update']
 
deleted file mode 100644
--- a/toolkit/mozapps/shared/Makefile.in
+++ /dev/null
@@ -1,21 +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/.
-
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_PP_JS_MODULES = \
-  CertUtils.jsm \
-  $(NULL)
-
-EXTRA_JS_MODULES = \
-  FileUtils.jsm \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/mozapps/shared/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-TEST_DIRS += ['test/chrome']
-
-MODULE = 'toolkitShared'
-
-if CONFIG['ENABLE_TESTS']:
-    XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
deleted file mode 100644
--- a/toolkit/mozapps/shared/test/unit/xpcshell.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-head = 
-tail = 
-
-[test_FileUtils.js]
-
-[test_readCertPrefs.js]