Bug 944961 - Build rdf in unified mode. r=bsmedberg

--HG--
extra : rebase_source : 02d0dda613da55539f8fdb69ffd8c03e576e5ce9

rdf/base/src/moz.build

@@ -4,7 +4,7 @@
 # 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/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsCompositeDataSource.cpp',
     'nsContainerEnumerator.cpp',
     'nsDefaultResourceFactory.cpp',

rdf/base/src/nsCompositeDataSource.cpp

@@ -49,8 +49,6 @@
 PRLogModuleInfo* nsRDFLog = nullptr;
 #endif
 
-static NS_DEFINE_IID(kISupportsIID,           NS_ISUPPORTS_IID);
-
 //----------------------------------------------------------------------
 //
 // CompositeDataSourceImpl

rdf/base/src/nsContainerEnumerator.cpp

@@ -36,11 +36,6 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-static NS_DEFINE_CID(kRDFServiceCID,        NS_RDFSERVICE_CID);
-static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
-
-////////////////////////////////////////////////////////////////////////
-
 class ContainerEnumeratorImpl : public nsISimpleEnumerator {
 private:
     // pseudo-constants
@@ -84,6 +79,8 @@ ContainerEnumeratorImpl::Init()
 {
     if (gRefCnt++ == 0) {
         nsresult rv;
+
+        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
         nsCOMPtr<nsIRDFService> rdf = do_GetService(kRDFServiceCID);
         NS_ASSERTION(rdf != nullptr, "unable to acquire resource manager");
         if (! rdf)
@@ -93,6 +90,7 @@ ContainerEnumeratorImpl::Init()
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource");
         if (NS_FAILED(rv)) return rv;
 
+        NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
         rv = CallGetService(kRDFContainerUtilsCID, &gRDFC);
         if (NS_FAILED(rv)) return rv;
     }

rdf/base/src/nsInMemoryDataSource.cpp

@@ -69,11 +69,6 @@
 #include "rdfIDataSource.h"
 #include "rdfITripleVisitor.h"
 
-#ifdef PR_LOGGING
-static PRLogModuleInfo* gLog = nullptr;
-#endif
-
-
 // This struct is used as the slot value in the forward and reverse
 // arcs hash tables.
 //
@@ -365,8 +360,17 @@ public:
 #endif
 
     bool    mPropagateChanges;
+
+private:
+#ifdef PR_LOGGING
+    static PRLogModuleInfo* gLog;
+#endif
 };
 
+#ifdef PR_LOGGING
+PRLogModuleInfo* InMemoryDataSource::gLog;
+#endif
+
 //----------------------------------------------------------------------
 //
 // InMemoryAssertionEnumeratorImpl

rdf/base/src/nsRDFContainer.cpp

@@ -45,10 +45,6 @@
 #include "nsXPIDLString.h"
 #include "rdf.h"
 
-static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
-static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
-static const char kRDFNameSpaceURI[] = RDF_NAMESPACE_URI;
-
 #define RDF_SEQ_LIST_LIMIT   8
 
 class RDFContainerImpl : public nsIRDFContainer
@@ -381,6 +377,7 @@ RDFContainerImpl::Init()
     if (gRefCnt++ == 0) {
         nsresult rv;
 
+        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
         rv = CallGetService(kRDFServiceCID, &gRDFService);
         if (NS_FAILED(rv)) {
             NS_ERROR("unable to get RDF service");
@@ -391,6 +388,7 @@ RDFContainerImpl::Init()
                                       &kRDF_nextVal);
         if (NS_FAILED(rv)) return rv;
 
+        NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
         rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils);
         if (NS_FAILED(rv)) {
             NS_ERROR("unable to get RDF container utils service");
@@ -688,6 +686,7 @@ RDFContainerImpl::GetNextValue(nsIRDFResource** aResult)
         }
     }
 
+    static const char kRDFNameSpaceURI[] = RDF_NAMESPACE_URI;
     char buf[sizeof(kRDFNameSpaceURI) + 16];
     nsFixedCString nextValStr(buf, sizeof(buf), 0);
     nextValStr = kRDFNameSpaceURI;

rdf/base/src/nsRDFContainerUtils.cpp

@@ -23,9 +23,6 @@
 #include "rdf.h"
 #include "rdfutil.h"
 
-static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
-static const char kRDFNameSpaceURI[] = RDF_NAMESPACE_URI;
-
 class RDFContainerUtilsImpl : public nsIRDFContainerUtils
 {
 public:
@@ -57,9 +54,9 @@ private:
     static nsIRDFResource* kRDF_Seq;
     static nsIRDFResource* kRDF_Alt;
     static nsIRDFLiteral* kOne;
+    static const char kRDFNameSpaceURI[];
 };
 
-
 int32_t         RDFContainerUtilsImpl::gRefCnt = 0;
 nsIRDFService*  RDFContainerUtilsImpl::gRDFService;
 nsIRDFResource* RDFContainerUtilsImpl::kRDF_instanceOf;
@@ -68,6 +65,7 @@ nsIRDFResource* RDFContainerUtilsImpl::kRDF_Bag;
 nsIRDFResource* RDFContainerUtilsImpl::kRDF_Seq;
 nsIRDFResource* RDFContainerUtilsImpl::kRDF_Alt;
 nsIRDFLiteral*  RDFContainerUtilsImpl::kOne;
+const char      RDFContainerUtilsImpl::kRDFNameSpaceURI[] = RDF_NAMESPACE_URI;
 
 ////////////////////////////////////////////////////////////////////////
 // nsISupports interface
@@ -325,6 +323,7 @@ RDFContainerUtilsImpl::RDFContainerUtilsImpl()
     if (gRefCnt++ == 0) {
         nsresult rv;
 
+        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
         rv = CallGetService(kRDFServiceCID, &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");

rdf/base/src/nsRDFContentSink.cpp

@@ -68,25 +68,6 @@
 
 using namespace mozilla;
 
-////////////////////////////////////////////////////////////////////////
-// XPCOM IIDs
-
-static NS_DEFINE_IID(kIContentSinkIID,         NS_ICONTENT_SINK_IID); // XXX grr...
-static NS_DEFINE_IID(kIExpatSinkIID,           NS_IEXPATSINK_IID);
-static NS_DEFINE_IID(kIRDFServiceIID,          NS_IRDFSERVICE_IID);
-static NS_DEFINE_IID(kISupportsIID,            NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIXMLContentSinkIID,      NS_IXMLCONTENT_SINK_IID);
-static NS_DEFINE_IID(kIRDFContentSinkIID,      NS_IRDFCONTENTSINK_IID);
-
-static NS_DEFINE_CID(kRDFServiceCID,            NS_RDFSERVICE_CID);
-static NS_DEFINE_CID(kRDFContainerUtilsCID,     NS_RDFCONTAINERUTILS_CID);
-
-////////////////////////////////////////////////////////////////////////
-
-#ifdef PR_LOGGING
-static PRLogModuleInfo* gLog;
-#endif
-
 ///////////////////////////////////////////////////////////////////////
 
 enum RDFContentSinkState {
@@ -244,6 +225,11 @@ protected:
     nsAutoTArray<RDFContextStackElement, 8>* mContextStack;
 
     nsIURI*      mDocumentURL;
+
+private:
+#ifdef PR_LOGGING
+    static PRLogModuleInfo* gLog;
+#endif
 };
 
 int32_t         RDFContentSinkImpl::gRefCnt = 0;
@@ -256,6 +242,10 @@ nsIRDFResource* RDFContentSinkImpl::kRDF_Bag;
 nsIRDFResource* RDFContentSinkImpl::kRDF_Seq;
 nsIRDFResource* RDFContentSinkImpl::kRDF_nextVal;
 
+#ifdef PR_LOGGING
+PRLogModuleInfo* RDFContentSinkImpl::gLog;
+#endif
+
 ////////////////////////////////////////////////////////////////////////
 
 #define RDF_ATOM(name_, value_) nsIAtom* RDFContentSinkImpl::name_;
@@ -282,6 +272,7 @@ RDFContentSinkImpl::RDFContentSinkImpl()
       mDocumentURL(nullptr)
 {
     if (gRefCnt++ == 0) {
+        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
         nsresult rv = CallGetService(kRDFServiceCID, &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");
@@ -300,7 +291,7 @@ RDFContentSinkImpl::RDFContentSinkImpl()
                                           &kRDF_nextVal);
         }
 
-
+        NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
         rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils);
 
         NS_RegisterStaticAtoms(rdf_atoms);
@@ -381,6 +372,12 @@ RDFContentSinkImpl::QueryInterface(REFNSIID iid, void** result)
     if (! result)
         return NS_ERROR_NULL_POINTER;
 
+    NS_DEFINE_IID(kIContentSinkIID,    NS_ICONTENT_SINK_IID);
+    NS_DEFINE_IID(kIExpatSinkIID,      NS_IEXPATSINK_IID);
+    NS_DEFINE_IID(kISupportsIID,       NS_ISUPPORTS_IID);
+    NS_DEFINE_IID(kIXMLContentSinkIID, NS_IXMLCONTENT_SINK_IID);
+    NS_DEFINE_IID(kIRDFContentSinkIID, NS_IRDFCONTENTSINK_IID);
+
     *result = nullptr;
     if (iid.Equals(kIRDFContentSinkIID) ||
         iid.Equals(kIXMLContentSinkIID) ||

rdf/base/src/nsRDFService.cpp

@@ -70,10 +70,6 @@ static NS_DEFINE_IID(kIRDFIntIID,         NS_IRDFINT_IID);
 static NS_DEFINE_IID(kIRDFNodeIID,            NS_IRDFNODE_IID);
 static NS_DEFINE_IID(kISupportsIID,           NS_ISUPPORTS_IID);
 
-#ifdef PR_LOGGING
-static PRLogModuleInfo* gLog = nullptr;
-#endif
-
 class BlobImpl;
 
 // These functions are copied from nsprpub/lib/ds/plhash.c, with one
@@ -728,6 +724,10 @@ IntImpl::EqualsInt(nsIRDFInt* intValue, bool* result)
 ////////////////////////////////////////////////////////////////////////
 // RDFServiceImpl
 
+#ifdef PR_LOGGING
+PRLogModuleInfo* RDFServiceImpl::gLog;
+#endif
+
 RDFServiceImpl*
 RDFServiceImpl::gRDFService;
 

rdf/base/src/nsRDFService.h

@@ -28,6 +28,7 @@
 #include "nsString.h"
 
 struct PLHashTable;
+struct PRLogModuleInfo;
 class nsIRDFLiteral;
 class nsIRDFInt;
 class nsIRDFDate;
@@ -36,6 +37,10 @@ class BlobImpl;
 class RDFServiceImpl : public nsIRDFService,
                        public nsSupportsWeakReference
 {
+#ifdef PR_LOGGING
+    static PRLogModuleInfo* gLog;
+#endif
+
 protected:
     PLHashTable* mNamedDataSources;
     PLDHashTable mResources;

rdf/base/src/nsRDFXMLDataSource.cpp

@@ -97,15 +97,6 @@
 
 #include "rdfIDataSource.h"
 
-//----------------------------------------------------------------------
-
-static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID);
-static NS_DEFINE_CID(kRDFServiceCID,            NS_RDFSERVICE_CID);
-
-#ifdef PR_LOGGING
-static PRLogModuleInfo* gLog;
-#endif
-
 //----------------------------------------------------------------------
 //
 // RDFXMLDataSourceImpl
@@ -141,6 +132,10 @@ protected:
     static int32_t gRefCnt;
     static nsIRDFService* gRDFService;
 
+#ifdef PR_LOGGING
+    static PRLogModuleInfo* gLog;
+#endif
+
     nsresult Init();
     RDFXMLDataSourceImpl(void);
     virtual ~RDFXMLDataSourceImpl(void);
@@ -363,6 +358,10 @@ protected:
 int32_t         RDFXMLDataSourceImpl::gRefCnt = 0;
 nsIRDFService*  RDFXMLDataSourceImpl::gRDFService;
 
+#ifdef PR_LOGGING
+PRLogModuleInfo* RDFXMLDataSourceImpl::gLog;
+#endif
+
 static const char kFileURIPrefix[] = "file:";
 static const char kResourceURIPrefix[] = "resource:";
 
@@ -410,10 +409,12 @@ nsresult
 RDFXMLDataSourceImpl::Init()
 {
     nsresult rv;
+    NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID);
     mInner = do_CreateInstance(kRDFInMemoryDataSourceCID, &rv);
     if (NS_FAILED(rv)) return rv;
 
     if (gRefCnt++ == 0) {
+        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
         rv = CallGetService(kRDFServiceCID, &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");
@@ -742,6 +743,7 @@ RDFXMLDataSourceImpl::rdfXMLFlush(nsIURI *aURI)
         // we are, we're screwed: it's too late to serialize because
         // many of the services that we'll need to acquire to properly
         // write the file will be unaquirable.
+        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
         nsCOMPtr<nsIRDFService> dummy = do_GetService(kRDFServiceCID, &rv);
         if (NS_FAILED(rv)) {
             NS_WARNING("unable to Flush() dirty datasource during XPCOM shutdown");

rdf/datasource/src/moz.build

@@ -4,7 +4,7 @@
 # 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/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsFileSystemDataSource.cpp',
     'nsLocalStore.cpp',
 ]