Bug 973142 - Get rid of the MOZILLA_INTERNAL_API makefile variable; r…

…=glandium It's just as easy to directly set the preprocessor macro in the moz.build files. Using this variable doesn't really buy us anything. This patch also removes unused code from rdf/tests/dsds.
iaxat · Feb 18, 2014 · 44a05e2 · 44a05e2
1 parent 7ae701e
commit 44a05e2
Show file tree

Hide file tree

Showing 30 changed files with 17 additions and 711 deletions.
diff --git a/config/config.mk b/config/config.mk
@@ -420,8 +420,7 @@ ifdef _MSC_VER
 OS_LDFLAGS += $(DELAYLOAD_LDFLAGS)
 endif # _MSC_VER
 
-# Does the makefile specifies the internal XPCOM API linkage?
-ifneq (,$(MOZILLA_INTERNAL_API)$(LIBXUL_LIBRARY))
+ifneq (,$(LIBXUL_LIBRARY))
 DEFINES += -DMOZILLA_INTERNAL_API
 endif
 

diff --git a/intl/unicharutil/util/internal/Makefile.in b/intl/unicharutil/util/internal/Makefile.in
@@ -12,4 +12,3 @@ LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
 endif
 
 DIST_INSTALL = 1
-MOZILLA_INTERNAL_API = 1
diff --git a/intl/unicharutil/util/internal/moz.build b/intl/unicharutil/util/internal/moz.build
@@ -14,4 +14,3 @@ LOCAL_INCLUDES += [
     '..',
     '../../src',
 ]
-
diff --git a/profile/dirserviceprovider/src/Makefile.in b/profile/dirserviceprovider/src/Makefile.in
diff --git a/profile/dirserviceprovider/src/moz.build b/profile/dirserviceprovider/src/moz.build
@@ -12,3 +12,5 @@ LIBRARY_NAME = 'profdirserviceprovider_s'
 
 # we don't want the shared lib
 FORCE_STATIC_LIB = True
+
+DEFINES['MOZILLA_INTERNAL_API'] = True
diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
@@ -312,7 +312,8 @@ def __new__(cls, sandbox, value=""):
     'LIBXUL_LIBRARY': (bool, bool,
         """Whether the library in this directory is linked into libxul.
 
-        Implies ``MOZILLA_INTERNAL_API`` and ``FORCE_STATIC_LIB``.
+        Implies ``FORCE_STATIC_LIB`` and the ``MOZILLA_INTERNAL_API``
+        preprocessor macro.
         """, None),
 
     'LOCAL_INCLUDES': (StrictOrderingOnAppendList, list,

diff --git a/rdf/tests/dsds/Makefile.in b/rdf/tests/dsds/Makefile.in
@@ -3,8 +3,6 @@
 # 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/.
 
-MOZILLA_INTERNAL_API = 1
-
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		$(XPCOM_LIBS) \

diff --git a/rdf/tests/dsds/moz.build b/rdf/tests/dsds/moz.build
@@ -4,15 +4,6 @@
 # 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 += [
-    'nsRDFDataSourceDS.cpp',
-    'nsRDFDataSourceFactory.cpp',
-]
-
-LIBRARY_NAME = 'rdfdsds'
-
-IS_COMPONENT = True
-
 RESOURCE_FILES.samples.rdf += [
     'DataSourceViewer.css',
     'DataSourceViewer.xul',

diff --git a/rdf/tests/dsds/nsRDFDOMDataSource.cpp b/rdf/tests/dsds/nsRDFDOMDataSource.cpp
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,3 @@ LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
		endif

		DIST_INSTALL = 1
		MOZILLA_INTERNAL_API = 1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,3 @@ LOCAL_INCLUDES += [
		'..',
		'../../src',
		]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ LIBRARY_NAME = 'profdirserviceprovider_s'

		# we don't want the shared lib
		FORCE_STATIC_LIB = True

		DEFINES['MOZILLA_INTERNAL_API'] = True