Bug 1332639 - Remove the RDF "standalone" library which isn't used, r=glandium
authorBenjamin Smedberg <benjamin@smedbergs.us>
Mon, 27 Feb 2017 13:07:28 -0500
changeset 345307 9825f34adc3d0d69a769c74391d25107d6d54cd8
parent 345306 1bcada51f54b230f9a4f6a0d41ae8695accc2d20
child 345308 ab3684fe0488e10a65389a271fcd78c7987f7e6d
push id31436
push userkwierso@gmail.com
push dateThu, 02 Mar 2017 01:18:52 +0000
treeherdermozilla-central@e91de6fb2b3d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1332639
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1332639 - Remove the RDF "standalone" library which isn't used, r=glandium MozReview-Commit-ID: 69CSBBqLrPs
rdf/base/moz.build
rdf/base/nsRDFResource.cpp
rdf/base/nsRDFResource.h
rdf/moz.build
rdf/util/internal/moz.build
rdf/util/moz.build
rdf/util/nsRDFResource.cpp
rdf/util/nsRDFResource.h
rdf/util/objs.mozbuild
--- a/rdf/base/moz.build
+++ b/rdf/base/moz.build
@@ -27,28 +27,30 @@ XPIDL_SOURCES += [
     'rdfIDataSource.idl',
     'rdfITripleVisitor.idl',
 ]
 
 XPIDL_MODULE = 'rdf'
 
 EXPORTS += [
     'nsIRDFContentSink.h',
+    'nsRDFResource.h',
     'rdf.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsCompositeDataSource.cpp',
     'nsContainerEnumerator.cpp',
     'nsDefaultResourceFactory.cpp',
     'nsInMemoryDataSource.cpp',
     'nsNameSpaceMap.cpp',
     'nsRDFContainer.cpp',
     'nsRDFContainerUtils.cpp',
     'nsRDFContentSink.cpp',
+    'nsRDFResource.cpp',
     'nsRDFService.cpp',
     'nsRDFXMLDataSource.cpp',
     'nsRDFXMLParser.cpp',
     'nsRDFXMLSerializer.cpp',
     'rdfutil.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
rename from rdf/util/nsRDFResource.cpp
rename to rdf/base/nsRDFResource.cpp
rename from rdf/util/nsRDFResource.h
rename to rdf/base/nsRDFResource.h
--- a/rdf/moz.build
+++ b/rdf/moz.build
@@ -1,9 +1,9 @@
 # -*- Mode: python; 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 += ['base', 'util', 'datasource', 'build']
+DIRS += ['base', 'datasource', 'build']
 TEST_DIRS += ['tests']
 
deleted file mode 100644
--- a/rdf/util/internal/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Mode: python; 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/.
-
-include('../objs.mozbuild')
-
-SOURCES += rdf_util_src_cppsrcs
-
-FINAL_LIBRARY = 'xul'
deleted file mode 100644
--- a/rdf/util/moz.build
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- Mode: python; 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/.
-
-# This file builds the rdfutil_external_s library which should be used
-# by frozen (dependent) linkage components. The internal-linkage code
-# should use rdfutil_s which is built in the internal/ subdirectory.
-
-DIRS += ['internal']
-
-EXPORTS += [
-    'nsRDFResource.h',
-]
-
-include('objs.mozbuild')
-
-SOURCES += rdf_util_src_cppsrcs
-
-Library('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
-
-DIST_INSTALL = True
deleted file mode 100644
--- a/rdf/util/objs.mozbuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Mode: python; 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/.
-
-rdf_util_src_cppsrcs = [
-    '/rdf/util/nsRDFResource.cpp',
-]