Bug 420506 - Disable building of RDF code. r=jorgk
authorBen Campbell <benc@thunderbird.net>
Tue, 24 Sep 2019 17:20:58 +1200
changeset 36937 62176929a3c9aebc346b044da5caa233845b5f76
parent 36936 3970c1407633ddcc191872e8a411ee40c1c1ef42
child 36938 86a80299d215568ae2ab36526883a88dc735786b
push id395
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:38:57 +0000
reviewersjorgk
bugs420506
Bug 420506 - Disable building of RDF code. r=jorgk
common/src/nsCommonModule.cpp
mailnews/base/src/moz.build
mailnews/build/nsMailModule.cpp
mailnews/mailnews.mozbuild
taskcluster/ci/build/kind.yml
taskcluster/ci/test/kind.yml
--- a/common/src/nsCommonModule.cpp
+++ b/common/src/nsCommonModule.cpp
@@ -85,17 +85,16 @@ extern const mozilla::Module kLDAPProtoc
 #ifdef MOZ_THUNDERBIRD
 extern const mozilla::Module kMailCompsModule;
 #endif
 extern const mozilla::Module kMailNewsModule;
 extern const mozilla::Module kMailNewsImportModule;
 #ifdef MOZ_MAPI_SUPPORT
 extern const mozilla::Module kMAPIModule;
 #endif
-extern const mozilla::Module kRDFModule;
 #ifdef MOZ_SUITE
 extern const mozilla::Module kSuiteModule;
 #endif
 
 class ModulesInit {
  public:
   ModulesInit() {
     XRE_AddStaticComponent(&kCommonModule);
@@ -109,16 +108,15 @@ class ModulesInit {
 #ifdef MOZ_THUNDERBIRD
     XRE_AddStaticComponent(&kMailCompsModule);
 #endif
     XRE_AddStaticComponent(&kMailNewsModule);
     XRE_AddStaticComponent(&kMailNewsImportModule);
 #ifdef MOZ_MAPI_SUPPORT
     XRE_AddStaticComponent(&kMAPIModule);
 #endif
-    XRE_AddStaticComponent(&kRDFModule);
 #ifdef MOZ_SUITE
     XRE_AddStaticComponent(&kSuiteModule);
 #endif
   }
 };
 
 ModulesInit gInit;
--- a/mailnews/base/src/moz.build
+++ b/mailnews/base/src/moz.build
@@ -1,16 +1,15 @@
 # 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/.
 
 EXPORTS += [
     'nsMailDirServiceDefs.h',
-    'nsMsgRDFUtils.h',
 ]
 
 SOURCES += [
     'MailNewsDLF.cpp',
     'MailnewsLoadContextInfo.cpp',
     'nsCidProtocolHandler.cpp',
     'nsCopyMessageStreamListener.cpp',
     'nsMailDirProvider.cpp',
@@ -29,17 +28,16 @@ SOURCES += [
     'nsMsgFolderNotificationService.cpp',
     'nsMsgGroupThread.cpp',
     'nsMsgGroupView.cpp',
     'nsMsgMailSession.cpp',
     'nsMsgOfflineManager.cpp',
     'nsMsgProgress.cpp',
     'nsMsgPurgeService.cpp',
     'nsMsgQuickSearchDBView.cpp',
-    'nsMsgRDFUtils.cpp',
     'nsMsgSearchDBView.cpp',
     'nsMsgSpecialViews.cpp',
     'nsMsgStatusFeedback.cpp',
     'nsMsgTagService.cpp',
     'nsMsgThreadedDBView.cpp',
     'nsMsgWindow.cpp',
     'nsMsgXFViewThread.cpp',
     'nsMsgXFVirtualFolderDBView.cpp',
--- a/mailnews/build/nsMailModule.cpp
+++ b/mailnews/build/nsMailModule.cpp
@@ -44,17 +44,16 @@
 #include "nsCRT.h"
 #include "nsCOMPtr.h"
 #include "msgCore.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // mailnews base includes
 ////////////////////////////////////////////////////////////////////////////////
 #include "nsMsgBaseCID.h"
-#include "rdf.h"
 #include "nsMessengerBootstrap.h"
 #include "nsMessenger.h"
 #include "nsIContentViewer.h"
 #include "nsMsgMailSession.h"
 #include "nsMsgAccount.h"
 #include "nsMsgAccountManager.h"
 #include "nsMsgIdentity.h"
 #include "nsMsgIncomingServer.h"
--- a/mailnews/mailnews.mozbuild
+++ b/mailnews/mailnews.mozbuild
@@ -7,11 +7,10 @@ if CONFIG['MOZ_LDAP_XPCOM']:
     DIRS += [
         '/%s/ldap' % CONFIG['commreltopsrcdir'],
         '/%s/ldap/xpcom' % CONFIG['commreltopsrcdir'],
     ]
 
 DIRS += [
     '/%s/mailnews' % CONFIG['commreltopsrcdir'],
     '/%s/db' % CONFIG['commreltopsrcdir'],
-    '/%s/rdf' % CONFIG['commreltopsrcdir'],
 ]
 
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -30,17 +30,16 @@ job-defaults:
             - comm/common
             - comm/db
             - comm/editor
             - comm/ldap
             - comm/mail
             - comm/mailnews
             - comm/mozharness
             - comm/other-licenses
-            - comm/rdf
             - comm/taskcluster
             - comm/testing
             - comm/.gecko_rev.yml
             - comm/.taskcluster.yml
             - comm/moz.build
 
     run:
         mozconfig-variant:
--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@@ -33,14 +33,13 @@ job-defaults:
             - comm/common
             - comm/db
             - comm/editor
             - comm/ldap
             - comm/mail
             - comm/mailnews
             - comm/mozharness
             - comm/other-licenses
-            - comm/rdf
             - comm/taskcluster
             - comm/testing
             - comm/.gecko_rev.yml
             - comm/.taskcluster.yml
             - comm/moz.build