From 2864f7996ac18c792ba00fd8fef1c83bc299763b Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Mon, 21 Jul 2014 06:01:08 -0700 Subject: [PATCH] Bug 1040774 - Flatten rdf/{base,datasource,util}/{idl,public,src}/ directories. r=pike --HG-- rename : rdf/base/src/nsCompositeDataSource.cpp => rdf/base/nsCompositeDataSource.cpp rename : rdf/base/src/nsContainerEnumerator.cpp => rdf/base/nsContainerEnumerator.cpp rename : rdf/base/src/nsDefaultResourceFactory.cpp => rdf/base/nsDefaultResourceFactory.cpp rename : rdf/base/idl/nsIRDFCompositeDataSource.idl => rdf/base/nsIRDFCompositeDataSource.idl rename : rdf/base/idl/nsIRDFContainer.idl => rdf/base/nsIRDFContainer.idl rename : rdf/base/idl/nsIRDFContainerUtils.idl => rdf/base/nsIRDFContainerUtils.idl rename : rdf/base/public/nsIRDFContentSink.h => rdf/base/nsIRDFContentSink.h rename : rdf/base/idl/nsIRDFDataSource.idl => rdf/base/nsIRDFDataSource.idl rename : rdf/base/idl/nsIRDFDelegateFactory.idl => rdf/base/nsIRDFDelegateFactory.idl rename : rdf/base/idl/nsIRDFInMemoryDataSource.idl => rdf/base/nsIRDFInMemoryDataSource.idl rename : rdf/base/idl/nsIRDFInferDataSource.idl => rdf/base/nsIRDFInferDataSource.idl rename : rdf/base/idl/nsIRDFLiteral.idl => rdf/base/nsIRDFLiteral.idl rename : rdf/base/idl/nsIRDFNode.idl => rdf/base/nsIRDFNode.idl rename : rdf/base/idl/nsIRDFObserver.idl => rdf/base/nsIRDFObserver.idl rename : rdf/base/idl/nsIRDFPropagatableDataSource.idl => rdf/base/nsIRDFPropagatableDataSource.idl rename : rdf/base/idl/nsIRDFPurgeableDataSource.idl => rdf/base/nsIRDFPurgeableDataSource.idl rename : rdf/base/idl/nsIRDFRemoteDataSource.idl => rdf/base/nsIRDFRemoteDataSource.idl rename : rdf/base/idl/nsIRDFResource.idl => rdf/base/nsIRDFResource.idl rename : rdf/base/idl/nsIRDFService.idl => rdf/base/nsIRDFService.idl rename : rdf/base/idl/nsIRDFXMLParser.idl => rdf/base/nsIRDFXMLParser.idl rename : rdf/base/idl/nsIRDFXMLSerializer.idl => rdf/base/nsIRDFXMLSerializer.idl rename : rdf/base/idl/nsIRDFXMLSink.idl => rdf/base/nsIRDFXMLSink.idl rename : rdf/base/idl/nsIRDFXMLSource.idl => rdf/base/nsIRDFXMLSource.idl rename : rdf/base/src/nsInMemoryDataSource.cpp => rdf/base/nsInMemoryDataSource.cpp rename : rdf/base/src/nsNameSpaceMap.cpp => rdf/base/nsNameSpaceMap.cpp rename : rdf/base/src/nsNameSpaceMap.h => rdf/base/nsNameSpaceMap.h rename : rdf/base/src/nsRDFBaseDataSources.h => rdf/base/nsRDFBaseDataSources.h rename : rdf/base/src/nsRDFContainer.cpp => rdf/base/nsRDFContainer.cpp rename : rdf/base/src/nsRDFContainerUtils.cpp => rdf/base/nsRDFContainerUtils.cpp rename : rdf/base/src/nsRDFContentSink.cpp => rdf/base/nsRDFContentSink.cpp rename : rdf/base/src/nsRDFContentSinkAtomList.h => rdf/base/nsRDFContentSinkAtomList.h rename : rdf/base/src/nsRDFService.cpp => rdf/base/nsRDFService.cpp rename : rdf/base/src/nsRDFService.h => rdf/base/nsRDFService.h rename : rdf/base/src/nsRDFXMLDataSource.cpp => rdf/base/nsRDFXMLDataSource.cpp rename : rdf/base/src/nsRDFXMLParser.cpp => rdf/base/nsRDFXMLParser.cpp rename : rdf/base/src/nsRDFXMLParser.h => rdf/base/nsRDFXMLParser.h rename : rdf/base/src/nsRDFXMLSerializer.cpp => rdf/base/nsRDFXMLSerializer.cpp rename : rdf/base/src/nsRDFXMLSerializer.h => rdf/base/nsRDFXMLSerializer.h rename : rdf/base/public/rdf.h => rdf/base/rdf.h rename : rdf/base/idl/rdfIDataSource.idl => rdf/base/rdfIDataSource.idl rename : rdf/base/idl/rdfISerializer.idl => rdf/base/rdfISerializer.idl rename : rdf/base/idl/rdfITripleVisitor.idl => rdf/base/rdfITripleVisitor.idl rename : rdf/base/src/rdfTriplesSerializer.cpp => rdf/base/rdfTriplesSerializer.cpp rename : rdf/base/src/rdfutil.cpp => rdf/base/rdfutil.cpp rename : rdf/base/src/rdfutil.h => rdf/base/rdfutil.h rename : rdf/datasource/src/nsFileSystemDataSource.cpp => rdf/datasource/nsFileSystemDataSource.cpp rename : rdf/datasource/src/nsFileSystemDataSource.h => rdf/datasource/nsFileSystemDataSource.h rename : rdf/datasource/public/nsILocalStore.h => rdf/datasource/nsILocalStore.h rename : rdf/datasource/public/nsIRDFFTP.h => rdf/datasource/nsIRDFFTP.h rename : rdf/datasource/src/nsLocalStore.cpp => rdf/datasource/nsLocalStore.cpp rename : rdf/datasource/src/nsRDFBuiltInDataSources.h => rdf/datasource/nsRDFBuiltInDataSources.h rename : rdf/util/src/Makefile.in => rdf/util/Makefile.in rename : rdf/util/src/internal/moz.build => rdf/util/internal/moz.build rename : rdf/util/src/nsRDFResource.cpp => rdf/util/nsRDFResource.cpp rename : rdf/util/public/nsRDFResource.h => rdf/util/nsRDFResource.h rename : rdf/util/src/objs.mozbuild => rdf/util/objs.mozbuild --- rdf/base/idl/moz.build | 33 ------------ rdf/base/moz.build | 52 ++++++++++++++++++- rdf/base/{src => }/nsCompositeDataSource.cpp | 0 rdf/base/{src => }/nsContainerEnumerator.cpp | 0 .../{src => }/nsDefaultResourceFactory.cpp | 0 .../{idl => }/nsIRDFCompositeDataSource.idl | 0 rdf/base/{idl => }/nsIRDFContainer.idl | 0 rdf/base/{idl => }/nsIRDFContainerUtils.idl | 0 rdf/base/{public => }/nsIRDFContentSink.h | 0 rdf/base/{idl => }/nsIRDFDataSource.idl | 0 rdf/base/{idl => }/nsIRDFDelegateFactory.idl | 0 .../{idl => }/nsIRDFInMemoryDataSource.idl | 0 rdf/base/{idl => }/nsIRDFInferDataSource.idl | 0 rdf/base/{idl => }/nsIRDFLiteral.idl | 0 rdf/base/{idl => }/nsIRDFNode.idl | 0 rdf/base/{idl => }/nsIRDFObserver.idl | 0 .../nsIRDFPropagatableDataSource.idl | 0 .../{idl => }/nsIRDFPurgeableDataSource.idl | 0 rdf/base/{idl => }/nsIRDFRemoteDataSource.idl | 0 rdf/base/{idl => }/nsIRDFResource.idl | 0 rdf/base/{idl => }/nsIRDFService.idl | 0 rdf/base/{idl => }/nsIRDFXMLParser.idl | 0 rdf/base/{idl => }/nsIRDFXMLSerializer.idl | 0 rdf/base/{idl => }/nsIRDFXMLSink.idl | 0 rdf/base/{idl => }/nsIRDFXMLSource.idl | 0 rdf/base/{src => }/nsInMemoryDataSource.cpp | 0 rdf/base/{src => }/nsNameSpaceMap.cpp | 0 rdf/base/{src => }/nsNameSpaceMap.h | 0 rdf/base/{src => }/nsRDFBaseDataSources.h | 0 rdf/base/{src => }/nsRDFContainer.cpp | 0 rdf/base/{src => }/nsRDFContainerUtils.cpp | 0 rdf/base/{src => }/nsRDFContentSink.cpp | 0 rdf/base/{src => }/nsRDFContentSinkAtomList.h | 0 rdf/base/{src => }/nsRDFService.cpp | 0 rdf/base/{src => }/nsRDFService.h | 0 rdf/base/{src => }/nsRDFXMLDataSource.cpp | 0 rdf/base/{src => }/nsRDFXMLParser.cpp | 0 rdf/base/{src => }/nsRDFXMLParser.h | 0 rdf/base/{src => }/nsRDFXMLSerializer.cpp | 0 rdf/base/{src => }/nsRDFXMLSerializer.h | 0 rdf/base/public/moz.build | 11 ---- rdf/base/{public => }/rdf.h | 0 rdf/base/{idl => }/rdfIDataSource.idl | 0 rdf/base/{idl => }/rdfISerializer.idl | 0 rdf/base/{idl => }/rdfITripleVisitor.idl | 0 rdf/base/{src => }/rdfTriplesSerializer.cpp | 0 rdf/base/{src => }/rdfutil.cpp | 0 rdf/base/{src => }/rdfutil.h | 0 rdf/base/src/moz.build | 25 --------- rdf/build/moz.build | 5 +- rdf/datasource/moz.build | 17 +++++- .../{src => }/nsFileSystemDataSource.cpp | 0 .../{src => }/nsFileSystemDataSource.h | 0 rdf/datasource/{public => }/nsILocalStore.h | 0 rdf/datasource/{public => }/nsIRDFFTP.h | 0 rdf/datasource/{src => }/nsLocalStore.cpp | 0 .../{src => }/nsRDFBuiltInDataSources.h | 0 rdf/datasource/public/moz.build | 10 ---- rdf/datasource/src/moz.build | 19 ------- rdf/util/{src => }/Makefile.in | 0 rdf/util/{src => }/internal/moz.build | 0 rdf/util/moz.build | 14 ++++- rdf/util/{src => }/nsRDFResource.cpp | 0 rdf/util/{public => }/nsRDFResource.h | 0 rdf/util/{src => }/objs.mozbuild | 2 +- rdf/util/public/moz.build | 10 ---- rdf/util/src/moz.build | 16 ------ 67 files changed, 83 insertions(+), 131 deletions(-) delete mode 100644 rdf/base/idl/moz.build rename rdf/base/{src => }/nsCompositeDataSource.cpp (100%) rename rdf/base/{src => }/nsContainerEnumerator.cpp (100%) rename rdf/base/{src => }/nsDefaultResourceFactory.cpp (100%) rename rdf/base/{idl => }/nsIRDFCompositeDataSource.idl (100%) rename rdf/base/{idl => }/nsIRDFContainer.idl (100%) rename rdf/base/{idl => }/nsIRDFContainerUtils.idl (100%) rename rdf/base/{public => }/nsIRDFContentSink.h (100%) rename rdf/base/{idl => }/nsIRDFDataSource.idl (100%) rename rdf/base/{idl => }/nsIRDFDelegateFactory.idl (100%) rename rdf/base/{idl => }/nsIRDFInMemoryDataSource.idl (100%) rename rdf/base/{idl => }/nsIRDFInferDataSource.idl (100%) rename rdf/base/{idl => }/nsIRDFLiteral.idl (100%) rename rdf/base/{idl => }/nsIRDFNode.idl (100%) rename rdf/base/{idl => }/nsIRDFObserver.idl (100%) rename rdf/base/{idl => }/nsIRDFPropagatableDataSource.idl (100%) rename rdf/base/{idl => }/nsIRDFPurgeableDataSource.idl (100%) rename rdf/base/{idl => }/nsIRDFRemoteDataSource.idl (100%) rename rdf/base/{idl => }/nsIRDFResource.idl (100%) rename rdf/base/{idl => }/nsIRDFService.idl (100%) rename rdf/base/{idl => }/nsIRDFXMLParser.idl (100%) rename rdf/base/{idl => }/nsIRDFXMLSerializer.idl (100%) rename rdf/base/{idl => }/nsIRDFXMLSink.idl (100%) rename rdf/base/{idl => }/nsIRDFXMLSource.idl (100%) rename rdf/base/{src => }/nsInMemoryDataSource.cpp (100%) rename rdf/base/{src => }/nsNameSpaceMap.cpp (100%) rename rdf/base/{src => }/nsNameSpaceMap.h (100%) rename rdf/base/{src => }/nsRDFBaseDataSources.h (100%) rename rdf/base/{src => }/nsRDFContainer.cpp (100%) rename rdf/base/{src => }/nsRDFContainerUtils.cpp (100%) rename rdf/base/{src => }/nsRDFContentSink.cpp (100%) rename rdf/base/{src => }/nsRDFContentSinkAtomList.h (100%) rename rdf/base/{src => }/nsRDFService.cpp (100%) rename rdf/base/{src => }/nsRDFService.h (100%) rename rdf/base/{src => }/nsRDFXMLDataSource.cpp (100%) rename rdf/base/{src => }/nsRDFXMLParser.cpp (100%) rename rdf/base/{src => }/nsRDFXMLParser.h (100%) rename rdf/base/{src => }/nsRDFXMLSerializer.cpp (100%) rename rdf/base/{src => }/nsRDFXMLSerializer.h (100%) delete mode 100644 rdf/base/public/moz.build rename rdf/base/{public => }/rdf.h (100%) rename rdf/base/{idl => }/rdfIDataSource.idl (100%) rename rdf/base/{idl => }/rdfISerializer.idl (100%) rename rdf/base/{idl => }/rdfITripleVisitor.idl (100%) rename rdf/base/{src => }/rdfTriplesSerializer.cpp (100%) rename rdf/base/{src => }/rdfutil.cpp (100%) rename rdf/base/{src => }/rdfutil.h (100%) delete mode 100644 rdf/base/src/moz.build rename rdf/datasource/{src => }/nsFileSystemDataSource.cpp (100%) rename rdf/datasource/{src => }/nsFileSystemDataSource.h (100%) rename rdf/datasource/{public => }/nsILocalStore.h (100%) rename rdf/datasource/{public => }/nsIRDFFTP.h (100%) rename rdf/datasource/{src => }/nsLocalStore.cpp (100%) rename rdf/datasource/{src => }/nsRDFBuiltInDataSources.h (100%) delete mode 100644 rdf/datasource/public/moz.build delete mode 100644 rdf/datasource/src/moz.build rename rdf/util/{src => }/Makefile.in (100%) rename rdf/util/{src => }/internal/moz.build (100%) rename rdf/util/{src => }/nsRDFResource.cpp (100%) rename rdf/util/{public => }/nsRDFResource.h (100%) rename rdf/util/{src => }/objs.mozbuild (84%) delete mode 100644 rdf/util/public/moz.build delete mode 100644 rdf/util/src/moz.build diff --git a/rdf/base/idl/moz.build b/rdf/base/idl/moz.build deleted file mode 100644 index f78f1ab34ae6..000000000000 --- a/rdf/base/idl/moz.build +++ /dev/null @@ -1,33 +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/. - -XPIDL_SOURCES += [ - 'nsIRDFCompositeDataSource.idl', - 'nsIRDFContainer.idl', - 'nsIRDFContainerUtils.idl', - 'nsIRDFDataSource.idl', - 'nsIRDFDelegateFactory.idl', - 'nsIRDFInferDataSource.idl', - 'nsIRDFInMemoryDataSource.idl', - 'nsIRDFLiteral.idl', - 'nsIRDFNode.idl', - 'nsIRDFObserver.idl', - 'nsIRDFPropagatableDataSource.idl', - 'nsIRDFPurgeableDataSource.idl', - 'nsIRDFRemoteDataSource.idl', - 'nsIRDFResource.idl', - 'nsIRDFService.idl', - 'nsIRDFXMLParser.idl', - 'nsIRDFXMLSerializer.idl', - 'nsIRDFXMLSink.idl', - 'nsIRDFXMLSource.idl', - 'rdfIDataSource.idl', - 'rdfISerializer.idl', - 'rdfITripleVisitor.idl', -] - -XPIDL_MODULE = 'rdf' - diff --git a/rdf/base/moz.build b/rdf/base/moz.build index ccafce8f3b97..94a4693706fd 100644 --- a/rdf/base/moz.build +++ b/rdf/base/moz.build @@ -4,4 +4,54 @@ # 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 += ['idl', 'public', 'src'] +XPIDL_SOURCES += [ + 'nsIRDFCompositeDataSource.idl', + 'nsIRDFContainer.idl', + 'nsIRDFContainerUtils.idl', + 'nsIRDFDataSource.idl', + 'nsIRDFDelegateFactory.idl', + 'nsIRDFInferDataSource.idl', + 'nsIRDFInMemoryDataSource.idl', + 'nsIRDFLiteral.idl', + 'nsIRDFNode.idl', + 'nsIRDFObserver.idl', + 'nsIRDFPropagatableDataSource.idl', + 'nsIRDFPurgeableDataSource.idl', + 'nsIRDFRemoteDataSource.idl', + 'nsIRDFResource.idl', + 'nsIRDFService.idl', + 'nsIRDFXMLParser.idl', + 'nsIRDFXMLSerializer.idl', + 'nsIRDFXMLSink.idl', + 'nsIRDFXMLSource.idl', + 'rdfIDataSource.idl', + 'rdfISerializer.idl', + 'rdfITripleVisitor.idl', +] + +XPIDL_MODULE = 'rdf' + +EXPORTS += [ + 'nsIRDFContentSink.h', + 'rdf.h', +] + +UNIFIED_SOURCES += [ + 'nsCompositeDataSource.cpp', + 'nsContainerEnumerator.cpp', + 'nsDefaultResourceFactory.cpp', + 'nsInMemoryDataSource.cpp', + 'nsNameSpaceMap.cpp', + 'nsRDFContainer.cpp', + 'nsRDFContainerUtils.cpp', + 'nsRDFContentSink.cpp', + 'nsRDFService.cpp', + 'nsRDFXMLDataSource.cpp', + 'nsRDFXMLParser.cpp', + 'nsRDFXMLSerializer.cpp', + 'rdfTriplesSerializer.cpp', + 'rdfutil.cpp', +] + +FAIL_ON_WARNINGS = True +FINAL_LIBRARY = 'rdf' diff --git a/rdf/base/src/nsCompositeDataSource.cpp b/rdf/base/nsCompositeDataSource.cpp similarity index 100% rename from rdf/base/src/nsCompositeDataSource.cpp rename to rdf/base/nsCompositeDataSource.cpp diff --git a/rdf/base/src/nsContainerEnumerator.cpp b/rdf/base/nsContainerEnumerator.cpp similarity index 100% rename from rdf/base/src/nsContainerEnumerator.cpp rename to rdf/base/nsContainerEnumerator.cpp diff --git a/rdf/base/src/nsDefaultResourceFactory.cpp b/rdf/base/nsDefaultResourceFactory.cpp similarity index 100% rename from rdf/base/src/nsDefaultResourceFactory.cpp rename to rdf/base/nsDefaultResourceFactory.cpp diff --git a/rdf/base/idl/nsIRDFCompositeDataSource.idl b/rdf/base/nsIRDFCompositeDataSource.idl similarity index 100% rename from rdf/base/idl/nsIRDFCompositeDataSource.idl rename to rdf/base/nsIRDFCompositeDataSource.idl diff --git a/rdf/base/idl/nsIRDFContainer.idl b/rdf/base/nsIRDFContainer.idl similarity index 100% rename from rdf/base/idl/nsIRDFContainer.idl rename to rdf/base/nsIRDFContainer.idl diff --git a/rdf/base/idl/nsIRDFContainerUtils.idl b/rdf/base/nsIRDFContainerUtils.idl similarity index 100% rename from rdf/base/idl/nsIRDFContainerUtils.idl rename to rdf/base/nsIRDFContainerUtils.idl diff --git a/rdf/base/public/nsIRDFContentSink.h b/rdf/base/nsIRDFContentSink.h similarity index 100% rename from rdf/base/public/nsIRDFContentSink.h rename to rdf/base/nsIRDFContentSink.h diff --git a/rdf/base/idl/nsIRDFDataSource.idl b/rdf/base/nsIRDFDataSource.idl similarity index 100% rename from rdf/base/idl/nsIRDFDataSource.idl rename to rdf/base/nsIRDFDataSource.idl diff --git a/rdf/base/idl/nsIRDFDelegateFactory.idl b/rdf/base/nsIRDFDelegateFactory.idl similarity index 100% rename from rdf/base/idl/nsIRDFDelegateFactory.idl rename to rdf/base/nsIRDFDelegateFactory.idl diff --git a/rdf/base/idl/nsIRDFInMemoryDataSource.idl b/rdf/base/nsIRDFInMemoryDataSource.idl similarity index 100% rename from rdf/base/idl/nsIRDFInMemoryDataSource.idl rename to rdf/base/nsIRDFInMemoryDataSource.idl diff --git a/rdf/base/idl/nsIRDFInferDataSource.idl b/rdf/base/nsIRDFInferDataSource.idl similarity index 100% rename from rdf/base/idl/nsIRDFInferDataSource.idl rename to rdf/base/nsIRDFInferDataSource.idl diff --git a/rdf/base/idl/nsIRDFLiteral.idl b/rdf/base/nsIRDFLiteral.idl similarity index 100% rename from rdf/base/idl/nsIRDFLiteral.idl rename to rdf/base/nsIRDFLiteral.idl diff --git a/rdf/base/idl/nsIRDFNode.idl b/rdf/base/nsIRDFNode.idl similarity index 100% rename from rdf/base/idl/nsIRDFNode.idl rename to rdf/base/nsIRDFNode.idl diff --git a/rdf/base/idl/nsIRDFObserver.idl b/rdf/base/nsIRDFObserver.idl similarity index 100% rename from rdf/base/idl/nsIRDFObserver.idl rename to rdf/base/nsIRDFObserver.idl diff --git a/rdf/base/idl/nsIRDFPropagatableDataSource.idl b/rdf/base/nsIRDFPropagatableDataSource.idl similarity index 100% rename from rdf/base/idl/nsIRDFPropagatableDataSource.idl rename to rdf/base/nsIRDFPropagatableDataSource.idl diff --git a/rdf/base/idl/nsIRDFPurgeableDataSource.idl b/rdf/base/nsIRDFPurgeableDataSource.idl similarity index 100% rename from rdf/base/idl/nsIRDFPurgeableDataSource.idl rename to rdf/base/nsIRDFPurgeableDataSource.idl diff --git a/rdf/base/idl/nsIRDFRemoteDataSource.idl b/rdf/base/nsIRDFRemoteDataSource.idl similarity index 100% rename from rdf/base/idl/nsIRDFRemoteDataSource.idl rename to rdf/base/nsIRDFRemoteDataSource.idl diff --git a/rdf/base/idl/nsIRDFResource.idl b/rdf/base/nsIRDFResource.idl similarity index 100% rename from rdf/base/idl/nsIRDFResource.idl rename to rdf/base/nsIRDFResource.idl diff --git a/rdf/base/idl/nsIRDFService.idl b/rdf/base/nsIRDFService.idl similarity index 100% rename from rdf/base/idl/nsIRDFService.idl rename to rdf/base/nsIRDFService.idl diff --git a/rdf/base/idl/nsIRDFXMLParser.idl b/rdf/base/nsIRDFXMLParser.idl similarity index 100% rename from rdf/base/idl/nsIRDFXMLParser.idl rename to rdf/base/nsIRDFXMLParser.idl diff --git a/rdf/base/idl/nsIRDFXMLSerializer.idl b/rdf/base/nsIRDFXMLSerializer.idl similarity index 100% rename from rdf/base/idl/nsIRDFXMLSerializer.idl rename to rdf/base/nsIRDFXMLSerializer.idl diff --git a/rdf/base/idl/nsIRDFXMLSink.idl b/rdf/base/nsIRDFXMLSink.idl similarity index 100% rename from rdf/base/idl/nsIRDFXMLSink.idl rename to rdf/base/nsIRDFXMLSink.idl diff --git a/rdf/base/idl/nsIRDFXMLSource.idl b/rdf/base/nsIRDFXMLSource.idl similarity index 100% rename from rdf/base/idl/nsIRDFXMLSource.idl rename to rdf/base/nsIRDFXMLSource.idl diff --git a/rdf/base/src/nsInMemoryDataSource.cpp b/rdf/base/nsInMemoryDataSource.cpp similarity index 100% rename from rdf/base/src/nsInMemoryDataSource.cpp rename to rdf/base/nsInMemoryDataSource.cpp diff --git a/rdf/base/src/nsNameSpaceMap.cpp b/rdf/base/nsNameSpaceMap.cpp similarity index 100% rename from rdf/base/src/nsNameSpaceMap.cpp rename to rdf/base/nsNameSpaceMap.cpp diff --git a/rdf/base/src/nsNameSpaceMap.h b/rdf/base/nsNameSpaceMap.h similarity index 100% rename from rdf/base/src/nsNameSpaceMap.h rename to rdf/base/nsNameSpaceMap.h diff --git a/rdf/base/src/nsRDFBaseDataSources.h b/rdf/base/nsRDFBaseDataSources.h similarity index 100% rename from rdf/base/src/nsRDFBaseDataSources.h rename to rdf/base/nsRDFBaseDataSources.h diff --git a/rdf/base/src/nsRDFContainer.cpp b/rdf/base/nsRDFContainer.cpp similarity index 100% rename from rdf/base/src/nsRDFContainer.cpp rename to rdf/base/nsRDFContainer.cpp diff --git a/rdf/base/src/nsRDFContainerUtils.cpp b/rdf/base/nsRDFContainerUtils.cpp similarity index 100% rename from rdf/base/src/nsRDFContainerUtils.cpp rename to rdf/base/nsRDFContainerUtils.cpp diff --git a/rdf/base/src/nsRDFContentSink.cpp b/rdf/base/nsRDFContentSink.cpp similarity index 100% rename from rdf/base/src/nsRDFContentSink.cpp rename to rdf/base/nsRDFContentSink.cpp diff --git a/rdf/base/src/nsRDFContentSinkAtomList.h b/rdf/base/nsRDFContentSinkAtomList.h similarity index 100% rename from rdf/base/src/nsRDFContentSinkAtomList.h rename to rdf/base/nsRDFContentSinkAtomList.h diff --git a/rdf/base/src/nsRDFService.cpp b/rdf/base/nsRDFService.cpp similarity index 100% rename from rdf/base/src/nsRDFService.cpp rename to rdf/base/nsRDFService.cpp diff --git a/rdf/base/src/nsRDFService.h b/rdf/base/nsRDFService.h similarity index 100% rename from rdf/base/src/nsRDFService.h rename to rdf/base/nsRDFService.h diff --git a/rdf/base/src/nsRDFXMLDataSource.cpp b/rdf/base/nsRDFXMLDataSource.cpp similarity index 100% rename from rdf/base/src/nsRDFXMLDataSource.cpp rename to rdf/base/nsRDFXMLDataSource.cpp diff --git a/rdf/base/src/nsRDFXMLParser.cpp b/rdf/base/nsRDFXMLParser.cpp similarity index 100% rename from rdf/base/src/nsRDFXMLParser.cpp rename to rdf/base/nsRDFXMLParser.cpp diff --git a/rdf/base/src/nsRDFXMLParser.h b/rdf/base/nsRDFXMLParser.h similarity index 100% rename from rdf/base/src/nsRDFXMLParser.h rename to rdf/base/nsRDFXMLParser.h diff --git a/rdf/base/src/nsRDFXMLSerializer.cpp b/rdf/base/nsRDFXMLSerializer.cpp similarity index 100% rename from rdf/base/src/nsRDFXMLSerializer.cpp rename to rdf/base/nsRDFXMLSerializer.cpp diff --git a/rdf/base/src/nsRDFXMLSerializer.h b/rdf/base/nsRDFXMLSerializer.h similarity index 100% rename from rdf/base/src/nsRDFXMLSerializer.h rename to rdf/base/nsRDFXMLSerializer.h diff --git a/rdf/base/public/moz.build b/rdf/base/public/moz.build deleted file mode 100644 index 56cdc593d7ed..000000000000 --- a/rdf/base/public/moz.build +++ /dev/null @@ -1,11 +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/. - -EXPORTS += [ - 'nsIRDFContentSink.h', - 'rdf.h', -] - diff --git a/rdf/base/public/rdf.h b/rdf/base/rdf.h similarity index 100% rename from rdf/base/public/rdf.h rename to rdf/base/rdf.h diff --git a/rdf/base/idl/rdfIDataSource.idl b/rdf/base/rdfIDataSource.idl similarity index 100% rename from rdf/base/idl/rdfIDataSource.idl rename to rdf/base/rdfIDataSource.idl diff --git a/rdf/base/idl/rdfISerializer.idl b/rdf/base/rdfISerializer.idl similarity index 100% rename from rdf/base/idl/rdfISerializer.idl rename to rdf/base/rdfISerializer.idl diff --git a/rdf/base/idl/rdfITripleVisitor.idl b/rdf/base/rdfITripleVisitor.idl similarity index 100% rename from rdf/base/idl/rdfITripleVisitor.idl rename to rdf/base/rdfITripleVisitor.idl diff --git a/rdf/base/src/rdfTriplesSerializer.cpp b/rdf/base/rdfTriplesSerializer.cpp similarity index 100% rename from rdf/base/src/rdfTriplesSerializer.cpp rename to rdf/base/rdfTriplesSerializer.cpp diff --git a/rdf/base/src/rdfutil.cpp b/rdf/base/rdfutil.cpp similarity index 100% rename from rdf/base/src/rdfutil.cpp rename to rdf/base/rdfutil.cpp diff --git a/rdf/base/src/rdfutil.h b/rdf/base/rdfutil.h similarity index 100% rename from rdf/base/src/rdfutil.h rename to rdf/base/rdfutil.h diff --git a/rdf/base/src/moz.build b/rdf/base/src/moz.build deleted file mode 100644 index 8fa043a0d073..000000000000 --- a/rdf/base/src/moz.build +++ /dev/null @@ -1,25 +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/. - -UNIFIED_SOURCES += [ - 'nsCompositeDataSource.cpp', - 'nsContainerEnumerator.cpp', - 'nsDefaultResourceFactory.cpp', - 'nsInMemoryDataSource.cpp', - 'nsNameSpaceMap.cpp', - 'nsRDFContainer.cpp', - 'nsRDFContainerUtils.cpp', - 'nsRDFContentSink.cpp', - 'nsRDFService.cpp', - 'nsRDFXMLDataSource.cpp', - 'nsRDFXMLParser.cpp', - 'nsRDFXMLSerializer.cpp', - 'rdfTriplesSerializer.cpp', - 'rdfutil.cpp', -] - -FAIL_ON_WARNINGS = True -FINAL_LIBRARY = 'rdf' diff --git a/rdf/build/moz.build b/rdf/build/moz.build index bc1d5d5c3b24..6e87dd95a2c4 100644 --- a/rdf/build/moz.build +++ b/rdf/build/moz.build @@ -17,7 +17,6 @@ LIBRARY_NAME = 'rdf' FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../base/src', - '../content/src', - '../datasource/src', + '/rdf/base', + '/rdf/datasource', ] diff --git a/rdf/datasource/moz.build b/rdf/datasource/moz.build index 8ff468534424..fe5c8869c643 100644 --- a/rdf/datasource/moz.build +++ b/rdf/datasource/moz.build @@ -4,4 +4,19 @@ # 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 += ['public', 'src'] +EXPORTS += [ + 'nsILocalStore.h', +] + +UNIFIED_SOURCES += [ + 'nsFileSystemDataSource.cpp', + 'nsLocalStore.cpp', +] + +FINAL_LIBRARY = 'rdf' + +# "This is a dependency on rdfutil.h: it'll go away once that becomes +# a first-class XPCOM interface." +LOCAL_INCLUDES += [ + '/rdf/base', +] diff --git a/rdf/datasource/src/nsFileSystemDataSource.cpp b/rdf/datasource/nsFileSystemDataSource.cpp similarity index 100% rename from rdf/datasource/src/nsFileSystemDataSource.cpp rename to rdf/datasource/nsFileSystemDataSource.cpp diff --git a/rdf/datasource/src/nsFileSystemDataSource.h b/rdf/datasource/nsFileSystemDataSource.h similarity index 100% rename from rdf/datasource/src/nsFileSystemDataSource.h rename to rdf/datasource/nsFileSystemDataSource.h diff --git a/rdf/datasource/public/nsILocalStore.h b/rdf/datasource/nsILocalStore.h similarity index 100% rename from rdf/datasource/public/nsILocalStore.h rename to rdf/datasource/nsILocalStore.h diff --git a/rdf/datasource/public/nsIRDFFTP.h b/rdf/datasource/nsIRDFFTP.h similarity index 100% rename from rdf/datasource/public/nsIRDFFTP.h rename to rdf/datasource/nsIRDFFTP.h diff --git a/rdf/datasource/src/nsLocalStore.cpp b/rdf/datasource/nsLocalStore.cpp similarity index 100% rename from rdf/datasource/src/nsLocalStore.cpp rename to rdf/datasource/nsLocalStore.cpp diff --git a/rdf/datasource/src/nsRDFBuiltInDataSources.h b/rdf/datasource/nsRDFBuiltInDataSources.h similarity index 100% rename from rdf/datasource/src/nsRDFBuiltInDataSources.h rename to rdf/datasource/nsRDFBuiltInDataSources.h diff --git a/rdf/datasource/public/moz.build b/rdf/datasource/public/moz.build deleted file mode 100644 index 8ec20014ca5b..000000000000 --- a/rdf/datasource/public/moz.build +++ /dev/null @@ -1,10 +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/. - -EXPORTS += [ - 'nsILocalStore.h', -] - diff --git a/rdf/datasource/src/moz.build b/rdf/datasource/src/moz.build deleted file mode 100644 index 1b58dcc7897f..000000000000 --- a/rdf/datasource/src/moz.build +++ /dev/null @@ -1,19 +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/. - -UNIFIED_SOURCES += [ - 'nsFileSystemDataSource.cpp', - 'nsLocalStore.cpp', -] - -FINAL_LIBRARY = 'rdf' - -# "This is a dependency on rdfutil.h: it'll go away once that becomes -# a first-class XPCOM interface." -LOCAL_INCLUDES += [ - '../../base/src', -] - diff --git a/rdf/util/src/Makefile.in b/rdf/util/Makefile.in similarity index 100% rename from rdf/util/src/Makefile.in rename to rdf/util/Makefile.in diff --git a/rdf/util/src/internal/moz.build b/rdf/util/internal/moz.build similarity index 100% rename from rdf/util/src/internal/moz.build rename to rdf/util/internal/moz.build diff --git a/rdf/util/moz.build b/rdf/util/moz.build index 76218104c014..917916bd2202 100644 --- a/rdf/util/moz.build +++ b/rdf/util/moz.build @@ -4,5 +4,17 @@ # 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 += ['public', 'src'] +DIRS += ['internal'] +EXPORTS += [ + 'nsRDFResource.h', +] + +include('objs.mozbuild') + +SOURCES += rdf_util_src_cppsrcs + +LIBRARY_NAME = 'rdfutil_external_s' + +# we don't want the shared lib, but we want to force the creation of a static lib. +FORCE_STATIC_LIB = True diff --git a/rdf/util/src/nsRDFResource.cpp b/rdf/util/nsRDFResource.cpp similarity index 100% rename from rdf/util/src/nsRDFResource.cpp rename to rdf/util/nsRDFResource.cpp diff --git a/rdf/util/public/nsRDFResource.h b/rdf/util/nsRDFResource.h similarity index 100% rename from rdf/util/public/nsRDFResource.h rename to rdf/util/nsRDFResource.h diff --git a/rdf/util/src/objs.mozbuild b/rdf/util/objs.mozbuild similarity index 84% rename from rdf/util/src/objs.mozbuild rename to rdf/util/objs.mozbuild index 7e13a18c3837..b69000024411 100644 --- a/rdf/util/src/objs.mozbuild +++ b/rdf/util/objs.mozbuild @@ -9,5 +9,5 @@ rdf_util_src_lcppsrcs = [ ] rdf_util_src_cppsrcs = [ - '%s/rdf/util/src/%s' % (TOPSRCDIR, s) for s in rdf_util_src_lcppsrcs + '%s/rdf/util/%s' % (TOPSRCDIR, s) for s in rdf_util_src_lcppsrcs ] diff --git a/rdf/util/public/moz.build b/rdf/util/public/moz.build deleted file mode 100644 index 18024e2629d1..000000000000 --- a/rdf/util/public/moz.build +++ /dev/null @@ -1,10 +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/. - -EXPORTS += [ - 'nsRDFResource.h', -] - diff --git a/rdf/util/src/moz.build b/rdf/util/src/moz.build deleted file mode 100644 index f2f53ce74693..000000000000 --- a/rdf/util/src/moz.build +++ /dev/null @@ -1,16 +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/. - -DIRS += ['internal'] - -include('objs.mozbuild') - -SOURCES += rdf_util_src_cppsrcs - -LIBRARY_NAME = 'rdfutil_external_s' - -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = True