Bug 914272 - Move IS_COMPONENT to mozbuild. r=joey

dothq · Sep 19, 2013 · f093a0d · f093a0d
1 parent 9c55b6d
commit f093a0d
Show file tree

Hide file tree

Showing 28 changed files with 28 additions and 20 deletions.
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SHORT_LIBNAME = brwsrcmp
-IS_COMPONENT = 1
 MODULE_NAME = nsBrowserCompsModule
 FORCE_SHARED_LIB = 1
 

diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build
@@ -16,3 +16,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'browsercomps'
 
+IS_COMPONENT = True
+
diff --git a/config/rules.mk b/config/rules.mk
@@ -31,6 +31,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   GTEST_CSRCS \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
+  IS_COMPONENT \
   LIBRARY_NAME \
   LIBXUL_LIBRARY \
   MODULE \

diff --git a/extensions/gnomevfs/Makefile.in b/extensions/gnomevfs/Makefile.in
@@ -4,8 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SHORT_LIBNAME	= nkgnomevfs
-IS_COMPONENT	= 1
-
 
 LOCAL_INCLUDES	= $(MOZ_GNOMEVFS_CFLAGS)
 

diff --git a/extensions/gnomevfs/moz.build b/extensions/gnomevfs/moz.build
@@ -12,3 +12,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'nkgnomevfs'
 
+IS_COMPONENT = True
+
diff --git a/extensions/widgetutils/src/Makefile.in b/extensions/widgetutils/src/Makefile.in
@@ -6,7 +6,6 @@
 XPI_NAME	= widgetutils
 SHORT_LIBNAME = widgetutils
 FORCE_SHARED_LIB = 1
-IS_COMPONENT = 1
 
 EXTRA_DSO_LDOPTS = \
   $(XPCOM_GLUE_LDOPTS) \

diff --git a/extensions/widgetutils/src/moz.build b/extensions/widgetutils/src/moz.build
@@ -12,3 +12,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'widgetutils'
 
+IS_COMPONENT = True
+
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
@@ -31,6 +31,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   GTEST_CSRCS \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
+  IS_COMPONENT \
   LIBRARY_NAME \
   LIBXUL_LIBRARY \
   MODULE \

diff --git a/js/xpconnect/tests/components/js/Makefile.in b/js/xpconnect/tests/components/js/Makefile.in
@@ -3,7 +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/.
 
-IS_COMPONENT = 1
 MODULE_NAME = xpconnect_test
 
 JS_FILES = \

diff --git a/js/xpconnect/tests/components/js/moz.build b/js/xpconnect/tests/components/js/moz.build
@@ -9,3 +9,5 @@ NO_DIST_INSTALL = True
 
 LIBRARY_NAME = 'xpctest'
 
+IS_COMPONENT = True
+
diff --git a/js/xpconnect/tests/components/native/Makefile.in b/js/xpconnect/tests/components/native/Makefile.in
@@ -3,7 +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/.
 
-IS_COMPONENT = 1
 MODULE_NAME = xpconnect_test
 FORCE_SHARED_LIB = 1
 

diff --git a/js/xpconnect/tests/components/native/moz.build b/js/xpconnect/tests/components/native/moz.build
@@ -15,3 +15,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'xpctest'
 
+IS_COMPONENT = True
+
diff --git a/rdf/tests/dsds/Makefile.in b/rdf/tests/dsds/Makefile.in
@@ -5,10 +5,6 @@
 
 MOZILLA_INTERNAL_API = 1
 
-
-
-IS_COMPONENT	= 1
-
 SAMPLES_DIR	= $(DIST)/bin/res/samples/rdf
 
 RESOURCE_SAMPLES = \

diff --git a/rdf/tests/dsds/moz.build b/rdf/tests/dsds/moz.build
@@ -13,3 +13,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'rdfdsds'
 
+IS_COMPONENT = True
+
diff --git a/toolkit/system/dbus/Makefile.in b/toolkit/system/dbus/Makefile.in
@@ -2,10 +2,8 @@
 # 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/.
 
-IS_COMPONENT = 1
 FORCE_SHARED_LIB = 1
 
-
 EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \

diff --git a/toolkit/system/dbus/moz.build b/toolkit/system/dbus/moz.build
@@ -14,3 +14,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'dbusservice'
 
+IS_COMPONENT = True
+
diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 FORCE_SHARED_LIB = 1
-IS_COMPONENT	= 1
 EXTRA_DSO_LDOPTS += \
 		$(XPCOM_GLUE_LDOPTS) \
 		$(XPCOM_FROZEN_LDOPTS) \

diff --git a/toolkit/system/gnome/moz.build b/toolkit/system/gnome/moz.build
@@ -29,4 +29,5 @@ if CONFIG['MOZ_ENABLE_GIO']:
 LIBRARY_NAME = 'mozgnome'
 
 FAIL_ON_WARNINGS = True
+IS_COMPONENT = True
 
diff --git a/xpcom/sample/Makefile.in b/xpcom/sample/Makefile.in
@@ -7,9 +7,6 @@
 # e.g. dist/bin/components/xpcomsmp.dll
 SHORT_LIBNAME	= xpcomsmp
 
-# IS_COMPONENT indicates that this makefile builds a component shared library.
-IS_COMPONENT	= 1
-
 # If this is Makefile builds a component, MODULE_NAME must match the module
 # name specified in NS_IMPL_NSGETMODULE
 MODULE_NAME	= nsSampleModule

diff --git a/xpcom/sample/moz.build b/xpcom/sample/moz.build
@@ -33,3 +33,6 @@ EXTRA_COMPONENTS += [
 # i.e. dist/bin/components/libxpcomsample.so
 LIBRARY_NAME = 'xpcomsample'
 
+# IS_COMPONENT indicates that this makefile builds a component shared library.
+IS_COMPONENT = True
+
diff --git a/xpcom/tests/bug656331_component/Makefile.in b/xpcom/tests/bug656331_component/Makefile.in
@@ -5,7 +5,6 @@
 
 # Blatantly copied from xpcom/tests/component.
 
-IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1
 
 MANIFEST_FILE = bug656331.manifest

diff --git a/xpcom/tests/bug656331_component/moz.build b/xpcom/tests/bug656331_component/moz.build
@@ -12,3 +12,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'test656331'
 
+IS_COMPONENT = True
+
diff --git a/xpcom/tests/component/Makefile.in b/xpcom/tests/component/Makefile.in
@@ -3,7 +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/.
 
-IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1
 
 MANIFEST_FILE = testcomponent.manifest

diff --git a/xpcom/tests/component/moz.build b/xpcom/tests/component/moz.build
@@ -12,3 +12,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'testcomponent'
 
+IS_COMPONENT = True
+
diff --git a/xpcom/tests/component_no_aslr/Makefile.in b/xpcom/tests/component_no_aslr/Makefile.in
@@ -3,7 +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/.
 
-IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1
 
 MANIFEST_FILE = testcompnoaslr.manifest

diff --git a/xpcom/tests/component_no_aslr/moz.build b/xpcom/tests/component_no_aslr/moz.build
@@ -12,3 +12,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'testcompnoaslr'
 
+IS_COMPONENT = True
+
diff --git a/xulrunner/examples/simple/components/src/Makefile.in b/xulrunner/examples/simple/components/src/Makefile.in
@@ -5,7 +5,6 @@
 
 XPI_NAME	= simple
 SHORT_LIBNAME = simpltst
-IS_COMPONENT	= 1
 
 EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \

diff --git a/xulrunner/examples/simple/components/src/moz.build b/xulrunner/examples/simple/components/src/moz.build
@@ -17,3 +17,5 @@ EXTRA_COMPONENTS += [
     'SimpleTest.manifest',
 ]
 
+IS_COMPONENT = True
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,5 @@ CPP_SOURCES += [

		LIBRARY_NAME = 'browsercomps'

		IS_COMPONENT = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ CPP_SOURCES += [

		LIBRARY_NAME = 'nkgnomevfs'

		IS_COMPONENT = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ CPP_SOURCES += [

		LIBRARY_NAME = 'widgetutils'

		IS_COMPONENT = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,5 @@ NO_DIST_INSTALL = True

		LIBRARY_NAME = 'xpctest'

		IS_COMPONENT = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,5 @@ CPP_SOURCES += [

		LIBRARY_NAME = 'xpctest'

		IS_COMPONENT = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,5 @@ CPP_SOURCES += [

		LIBRARY_NAME = 'rdfdsds'

		IS_COMPONENT = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,3 +14,5 @@ CPP_SOURCES += [

		LIBRARY_NAME = 'dbusservice'

		IS_COMPONENT = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,4 +29,5 @@ if CONFIG['MOZ_ENABLE_GIO']:
		LIBRARY_NAME = 'mozgnome'

		FAIL_ON_WARNINGS = True
		IS_COMPONENT = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ CPP_SOURCES += [

		LIBRARY_NAME = 'test656331'

		IS_COMPONENT = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ CPP_SOURCES += [

		LIBRARY_NAME = 'testcomponent'

		IS_COMPONENT = True