Bug 956609 - Land the IM front-end in comm-central: Revert build system in chat/: remove/revert Makefile.in, revert moz.build, r=florian.
authorPatrick Cloke <clokep@gmail.com>
Thu, 09 Jan 2014 22:09:59 -0500
changeset 19277 714d7b91360ade0ee9fa259ac08884129bf139aa
parent 19276 f390498ca74f25241c991540babc169a29951eaf
child 19278 bd40ffb0777d6150f11d49d8ab30e88f277dcdce
push id1103
push usermbanner@mozilla.com
push dateTue, 18 Mar 2014 07:44:06 +0000
treeherdercomm-beta@50c6279a0af0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian
bugs956609
Bug 956609 - Land the IM front-end in comm-central: Revert build system in chat/: remove/revert Makefile.in, revert moz.build, r=florian.
chat/components/public/Makefile.in
chat/components/public/moz.build
chat/components/src/Makefile.in
chat/components/src/moz.build
chat/content/Makefile.in
chat/content/moz.build
chat/locales/moz.build
chat/modules/Makefile.in
chat/modules/moz.build
chat/moz.build
chat/protocols/facebook/Makefile.in
chat/protocols/facebook/moz.build
chat/protocols/gtalk/Makefile.in
chat/protocols/gtalk/moz.build
chat/protocols/irc/Makefile.in
chat/protocols/irc/moz.build
chat/protocols/jsTest/Makefile.in
chat/protocols/jsTest/moz.build
chat/protocols/odnoklassniki/Makefile.in
chat/protocols/odnoklassniki/moz.build
chat/protocols/twitter/Makefile.in
chat/protocols/twitter/moz.build
chat/protocols/xmpp/Makefile.in
chat/protocols/xmpp/moz.build
chat/protocols/yahoo/Makefile.in
chat/protocols/yahoo/moz.build
chat/themes/Makefile.in
chat/themes/moz.build
deleted file mode 100644
--- a/chat/components/public/Makefile.in
+++ /dev/null
@@ -1,33 +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@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= chat
-
-XPIDLSRCS	= \
-		imIAccount.idl \
-		imIAccountsService.idl \
-		imICommandsService.idl \
-		imIContactsService.idl \
-		imIConversationsService.idl \
-		imICoreService.idl \
-		imILogger.idl \
-		imIStatusInfo.idl \
-		imITagsService.idl \
-		imIUserStatusInfo.idl \
-		prplIConversation.idl \
-		prplIMessage.idl \
-		prplIPref.idl \
-		prplIProtocol.idl \
-		prplIRequest.idl \
-		prplITooltipInfo.idl \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/chat/components/public/moz.build
+++ b/chat/components/public/moz.build
@@ -1,4 +1,26 @@
 # 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/.
+
+XPIDL_SOURCES += [
+    'imIAccount.idl',
+    'imIAccountsService.idl',
+    'imICommandsService.idl',
+    'imIContactsService.idl',
+    'imIConversationsService.idl',
+    'imICoreService.idl',
+    'imILogger.idl',
+    'imIStatusInfo.idl',
+    'imITagsService.idl',
+    'imIUserStatusInfo.idl',
+    'prplIConversation.idl',
+    'prplIMessage.idl',
+    'prplIPref.idl',
+    'prplIProtocol.idl',
+    'prplIRequest.idl',
+    'prplITooltipInfo.idl',
+]
+
+XPIDL_MODULE = 'chat'
+
deleted file mode 100644
--- a/chat/components/src/Makefile.in
+++ /dev/null
@@ -1,27 +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@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS = \
-		imAccounts.js imAccounts.manifest \
-		imCommands.js imCommands.manifest \
-		imContacts.js imContacts.manifest \
-		imConversations.js imConversations.manifest \
-		imCore.js imCore.manifest \
-		logger.js logger.manifest \
-		smileProtocolHandler.js smileProtocolHandler.manifest \
-		$(NULL)
-
-ifdef ENABLE_TESTS
-relativesrcdir = @relativesrcdir@
-XPCSHELL_TESTS = test
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/chat/components/src/moz.build
+++ b/chat/components/src/moz.build
@@ -1,4 +1,24 @@
 # 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/.
+
+XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
+
+EXTRA_COMPONENTS += [
+    'imAccounts.js',
+    'imAccounts.manifest',
+    'imCommands.js',
+    'imCommands.manifest',
+    'imContacts.js',
+    'imContacts.manifest',
+    'imConversations.js',
+    'imConversations.manifest',
+    'imCore.js',
+    'imCore.manifest',
+    'logger.js',
+    'logger.manifest',
+    'smileProtocolHandler.js',
+    'smileProtocolHandler.manifest',
+]
+
deleted file mode 100644
--- a/chat/content/Makefile.in
+++ /dev/null
@@ -1,12 +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@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
--- a/chat/content/moz.build
+++ b/chat/content/moz.build
@@ -1,4 +1,6 @@
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/chat/locales/moz.build
+++ b/chat/locales/moz.build
@@ -1,4 +1,6 @@
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']
--- a/chat/modules/Makefile.in
+++ b/chat/modules/Makefile.in
@@ -1,35 +1,17 @@
 # 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_JS_MODULES = \
-	ArrayBufferUtils.jsm \
-	imContentSink.jsm \
-	imServices.jsm \
-	imSmileys.jsm \
-	imStatusUtils.jsm \
-	imThemes.jsm \
-	imXPCOMUtils.jsm \
-	jsProtoHelper.jsm \
-	socket.jsm \
-	$(NULL)
-
-EXTRA_PP_JS_MODULES = \
-	hiddenWindow.jsm \
-	imTextboxUtils.jsm \
-	$(NULL)
-
 ifdef ENABLE_TESTS
-relativesrcdir = @relativesrcdir@
 TESTING_JS_MODULES := test/appInfoUtils.jsm
-XPCSHELL_TESTS = test
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/chat/modules/moz.build
+++ b/chat/modules/moz.build
@@ -1,4 +1,24 @@
 # 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/.
+
+XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
+
+EXTRA_JS_MODULES += [
+    'ArrayBufferUtils.jsm',
+    'imContentSink.jsm',
+    'imServices.jsm',
+    'imSmileys.jsm',
+    'imStatusUtils.jsm',
+    'imThemes.jsm',
+    'imXPCOMUtils.jsm',
+    'jsProtoHelper.jsm',
+    'socket.jsm',
+]
+
+EXTRA_PP_JS_MODULES += [
+    'hiddenWindow.jsm',
+    'imTextboxUtils.jsm',
+]
+
--- a/chat/moz.build
+++ b/chat/moz.build
@@ -16,8 +16,9 @@ PARALLEL_DIRS += [
     'protocols/odnoklassniki',
     'protocols/twitter',
     'protocols/xmpp',
     'protocols/yahoo',
 ]
 
 if CONFIG['MOZ_DEBUG']:
     PARALLEL_DIRS += ['protocols/jsTest']
+
deleted file mode 100644
--- a/chat/protocols/facebook/Makefile.in
+++ /dev/null
@@ -1,17 +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@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS = \
-		facebook.js \
-		facebook.manifest \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/chat/protocols/facebook/moz.build
+++ b/chat/protocols/facebook/moz.build
@@ -1,4 +1,11 @@
 # 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/.
+
+EXTRA_COMPONENTS += [
+    'facebook.js',
+    'facebook.manifest',
+]
+
+JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/chat/protocols/gtalk/Makefile.in
+++ /dev/null
@@ -1,17 +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@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS = \
-		gtalk.js \
-		gtalk.manifest \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/chat/protocols/gtalk/moz.build
+++ b/chat/protocols/gtalk/moz.build
@@ -1,4 +1,11 @@
 # 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/.
+
+EXTRA_COMPONENTS += [
+    'gtalk.js',
+    'gtalk.manifest',
+]
+
+JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/chat/protocols/irc/Makefile.in
+++ /dev/null
@@ -1,38 +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@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS = \
-		irc.js \
-		irc.manifest \
-		$(NULL)
-
-EXTRA_JS_MODULES = \
-		ircBase.jsm \
-		ircCAP.jsm \
-		ircCommands.jsm \
-		ircCTCP.jsm \
-		ircDCC.jsm \
-		ircHandlers.jsm \
-		ircISUPPORT.jsm \
-		ircMultiPrefix.jsm \
-		ircNonStandard.jsm \
-		ircSASL.jsm \
-		ircServices.jsm \
-		ircUtils.jsm \
-		ircWatchMonitor.jsm \
-		$(NULL)
-
-ifdef ENABLE_TESTS
-relativesrcdir = @relativesrcdir@
-XPCSHELL_TESTS = test
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/chat/protocols/irc/moz.build
+++ b/chat/protocols/irc/moz.build
@@ -1,4 +1,29 @@
 # 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/.
+
+XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
+
+EXTRA_COMPONENTS += [
+    'irc.js',
+    'irc.manifest',
+]
+
+EXTRA_JS_MODULES += [
+    'ircBase.jsm',
+    'ircCAP.jsm',
+    'ircCommands.jsm',
+    'ircCTCP.jsm',
+    'ircDCC.jsm',
+    'ircHandlers.jsm',
+    'ircISUPPORT.jsm',
+    'ircMultiPrefix.jsm',
+    'ircNonStandard.jsm',
+    'ircSASL.jsm',
+    'ircServices.jsm',
+    'ircUtils.jsm',
+    'ircWatchMonitor.jsm',
+]
+
+JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/chat/protocols/jsTest/Makefile.in
+++ /dev/null
@@ -1,16 +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@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifdef MOZ_DEBUG
-EXTRA_COMPONENTS += jsTestProtocol.js jsTestProtocol.manifest
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/chat/protocols/jsTest/moz.build
+++ b/chat/protocols/jsTest/moz.build
@@ -1,4 +1,11 @@
 # 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/.
+
+if CONFIG['MOZ_DEBUG']:
+    EXTRA_COMPONENTS += [
+        'jsTestProtocol.js',
+        'jsTestProtocol.manifest',
+    ]
+
deleted file mode 100644
--- a/chat/protocols/odnoklassniki/Makefile.in
+++ /dev/null
@@ -1,17 +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		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS = \
-		odnoklassniki.js \
-		odnoklassniki.manifest \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/chat/protocols/odnoklassniki/moz.build
+++ b/chat/protocols/odnoklassniki/moz.build
@@ -1,4 +1,11 @@
 # 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/.
+
+EXTRA_COMPONENTS += [
+    'odnoklassniki.js',
+    'odnoklassniki.manifest',
+]
+
+JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/chat/protocols/twitter/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@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS = \
-		twitter.js \
-		twitter.manifest \
-		$(NULL)
-
-EXTRA_JS_MODULES = \
-		twitter-text.jsm \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/chat/protocols/twitter/moz.build
+++ b/chat/protocols/twitter/moz.build
@@ -1,4 +1,14 @@
 # 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/.
+
+EXTRA_COMPONENTS += [
+    'twitter.js',
+    'twitter.manifest',
+]
+
+EXTRA_JS_MODULES += [
+    'twitter-text.jsm',
+]
+JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/chat/protocols/xmpp/Makefile.in
+++ /dev/null
@@ -1,24 +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@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS = \
-		xmpp.js \
-		xmpp.manifest \
-		$(NULL)
-
-EXTRA_JS_MODULES = \
-		xmpp.jsm \
-		xmpp-authmechs.jsm \
-		xmpp-session.jsm \
-		xmpp-xml.jsm \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/chat/protocols/xmpp/moz.build
+++ b/chat/protocols/xmpp/moz.build
@@ -1,4 +1,18 @@
 # 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/.
+
+EXTRA_COMPONENTS += [
+    'xmpp.js',
+    'xmpp.manifest',
+]
+
+EXTRA_JS_MODULES += [
+    'xmpp-authmechs.jsm',
+    'xmpp-session.jsm',
+    'xmpp-xml.jsm',
+    'xmpp.jsm',
+]
+
+JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/chat/protocols/yahoo/Makefile.in
+++ /dev/null
@@ -1,26 +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@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS += \
-		yahoo.js \
-		yahoo.manifest \
-		$(NULL)
-
-EXTRA_JS_MODULES = \
-		yahoo-session.jsm \
-		$(NULL)
-
-ifdef ENABLE_TESTS
-relativesrcdir = @relativesrcdir@
-XPCSHELL_TESTS = test
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/chat/protocols/yahoo/moz.build
+++ b/chat/protocols/yahoo/moz.build
@@ -1,4 +1,18 @@
 # 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/.
+
+if not CONFIG['MOZ_THUNDERBIRD']:
+    XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
+
+EXTRA_COMPONENTS += [
+    'yahoo.js',
+    'yahoo.manifest',
+]
+
+EXTRA_JS_MODULES += [
+    'yahoo-session.jsm',
+]
+
+JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/chat/themes/Makefile.in
+++ /dev/null
@@ -1,12 +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@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
--- a/chat/themes/moz.build
+++ b/chat/themes/moz.build
@@ -1,4 +1,6 @@
 # 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/.
+
+JAR_MANIFESTS += ['jar.mn']