Bug 891632 - Port NO_DIST_INSTALL to moz.build; r=joey

Many of the moved variables are likely not needed. moz.build should one day validate the sandbox's output and error if "useless" variables are present.
mozilla-spidermonkey · Jul 10, 2013 · 8340ca7 · 8340ca7
1 parent ebd9527
commit 8340ca7
Show file tree

Hide file tree

Showing 60 changed files with 46 additions and 28 deletions.
diff --git a/build/unix/elfhack/Makefile.in b/build/unix/elfhack/Makefile.in
@@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 INTERNAL_TOOLS = 1
 
 HOST_PROGRAM = elfhack
-NO_DIST_INSTALL = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 VPATH += $(topsrcdir)/build

diff --git a/build/unix/elfhack/moz.build b/build/unix/elfhack/moz.build
@@ -4,3 +4,4 @@
 # 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/.
 
+NO_DIST_INSTALL = True
diff --git a/config/rules.mk b/config/rules.mk
@@ -23,6 +23,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
   MODULE \
+  NO_DIST_INSTALL \
   PARALLEL_DIRS \
   TEST_DIRS \
   TIERS \

diff --git a/dom/plugins/test/testplugin/moz.build b/dom/plugins/test/testplugin/moz.build
@@ -7,6 +7,7 @@
 DIRS += ['secondplugin']
 
 MODULE = 'nptest'
+NO_DIST_INSTALL = True
 
 LIBRARY_NAME = 'nptest'
 
diff --git a/dom/plugins/test/testplugin/testplugin.mk b/dom/plugins/test/testplugin/testplugin.mk
@@ -12,7 +12,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install plugins
-NO_DIST_INSTALL	= 1
 NO_INSTALL = 1
 
 VPATH += $(topsrcdir)/build

diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
@@ -23,6 +23,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
   MODULE \
+  NO_DIST_INSTALL \
   PARALLEL_DIRS \
   TEST_DIRS \
   TIERS \

diff --git a/js/xpconnect/tests/components/js/Makefile.in b/js/xpconnect/tests/components/js/Makefile.in
@@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME = xpctest
 IS_COMPONENT = 1
 MODULE_NAME = xpconnect_test
-NO_DIST_INSTALL = 1
 
 JS_FILES = \
   xpctest_attributes.js \

diff --git a/js/xpconnect/tests/components/js/moz.build b/js/xpconnect/tests/components/js/moz.build
@@ -5,4 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'xpctest'
+NO_DIST_INSTALL = True
 
diff --git a/js/xpconnect/tests/components/native/Makefile.in b/js/xpconnect/tests/components/native/Makefile.in
@@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME = xpctest
 IS_COMPONENT = 1
 MODULE_NAME = xpconnect_test
-NO_DIST_INSTALL = 1
 FORCE_SHARED_LIB = 1
 
 include $(topsrcdir)/config/config.mk

diff --git a/js/xpconnect/tests/components/native/moz.build b/js/xpconnect/tests/components/native/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'xpctest'
+NO_DIST_INSTALL = True
 
 CPP_SOURCES += [
     'xpctest_attributes.cpp',

diff --git a/media/omx-plugin/Makefile.in b/media/omx-plugin/Makefile.in
@@ -29,7 +29,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/froyo/Makefile.in b/media/omx-plugin/froyo/Makefile.in
@@ -29,7 +29,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/froyo/moz.build b/media/omx-plugin/froyo/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'omxpluginfroyo'
+NO_DIST_INSTALL = True
 
 CPP_SOURCES += [
     'OmxPluginFroyo.cpp',

diff --git a/media/omx-plugin/gb/Makefile.in b/media/omx-plugin/gb/Makefile.in
@@ -29,7 +29,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/gb/moz.build b/media/omx-plugin/gb/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'omxplugingb'
+NO_DIST_INSTALL = True
 
 CPP_SOURCES += [
     'OmxPlugin236.cpp',

diff --git a/media/omx-plugin/gb235/Makefile.in b/media/omx-plugin/gb235/Makefile.in
@@ -29,7 +29,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/gb235/moz.build b/media/omx-plugin/gb235/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'omxplugingb235'
+NO_DIST_INSTALL = True
 
 CPP_SOURCES += [
     'OmxPlugin235.cpp',

diff --git a/media/omx-plugin/hc/Makefile.in b/media/omx-plugin/hc/Makefile.in
@@ -29,7 +29,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/hc/moz.build b/media/omx-plugin/hc/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'omxpluginhc'
+NO_DIST_INSTALL = True
 
 CPP_SOURCES += [
     'OmxPluginHoneycomb.cpp',

diff --git a/media/omx-plugin/jb-htc/Makefile.in b/media/omx-plugin/jb-htc/Makefile.in
@@ -29,7 +29,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/jb-htc/moz.build b/media/omx-plugin/jb-htc/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'omxpluginjb-htc'
+NO_DIST_INSTALL = True
 
 CPP_SOURCES += [
     'OmxPluginJB-HTC.cpp',

diff --git a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
@@ -28,7 +28,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/lib/froyo/libstagefright/moz.build b/media/omx-plugin/lib/froyo/libstagefright/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidstagefrightfroyo'
+NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [

diff --git a/media/omx-plugin/lib/gb/libstagefright/Makefile.in b/media/omx-plugin/lib/gb/libstagefright/Makefile.in
@@ -28,7 +28,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/lib/gb/libstagefright/moz.build b/media/omx-plugin/lib/gb/libstagefright/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidstagefrightgb'
+NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [

diff --git a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
@@ -28,7 +28,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build b/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libstagefright_color_conversion'
+NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [

diff --git a/media/omx-plugin/lib/gb/libutils/Makefile.in b/media/omx-plugin/lib/gb/libutils/Makefile.in
@@ -28,7 +28,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/lib/gb/libutils/moz.build b/media/omx-plugin/lib/gb/libutils/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidutilsgb'
+NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [

diff --git a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
@@ -28,7 +28,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/lib/gb235/libstagefright/moz.build b/media/omx-plugin/lib/gb235/libstagefright/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidstagefrightgb234'
+NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [

diff --git a/media/omx-plugin/lib/hc/libstagefright/Makefile.in b/media/omx-plugin/lib/hc/libstagefright/Makefile.in
@@ -28,7 +28,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/lib/hc/libstagefright/moz.build b/media/omx-plugin/lib/hc/libstagefright/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidstagefrighthc'
+NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [

diff --git a/media/omx-plugin/lib/ics/libstagefright/Makefile.in b/media/omx-plugin/lib/ics/libstagefright/Makefile.in
@@ -28,7 +28,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/lib/ics/libstagefright/moz.build b/media/omx-plugin/lib/ics/libstagefright/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidstagefright'
+NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [

diff --git a/media/omx-plugin/lib/ics/libutils/Makefile.in b/media/omx-plugin/lib/ics/libutils/Makefile.in
@@ -28,7 +28,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/lib/ics/libutils/moz.build b/media/omx-plugin/lib/ics/libutils/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidutils'
+NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [

diff --git a/media/omx-plugin/moz.build b/media/omx-plugin/moz.build
@@ -15,6 +15,7 @@
 # limitations under the License.
 
 MODULE = 'omxplugin'
+NO_DIST_INSTALL = True
 
 CPP_SOURCES += [
     'OmxPlugin.cpp',

diff --git a/media/omx-plugin/sony/Makefile.in b/media/omx-plugin/sony/Makefile.in
@@ -29,7 +29,6 @@ STL_FLAGS =
 USE_STATIC_LIBS = 1
 
 # Need to custom install OMX media plugin
-NO_DIST_INSTALL = 1
 NO_INSTALL = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/media/omx-plugin/sony/moz.build b/media/omx-plugin/sony/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'omxpluginsony'
+NO_DIST_INSTALL = True
 
 CPP_SOURCES += [
     'OmxPluginSony.cpp',

diff --git a/memory/replace/dummy/Makefile.in b/memory/replace/dummy/Makefile.in
@@ -10,7 +10,6 @@ VPATH           = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_SHARED_LIB = 1
-NO_DIST_INSTALL = 1
 
 DISABLED_CSRCS = dummy_replace_malloc.c
 

diff --git a/memory/replace/dummy/moz.build b/memory/replace/dummy/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'memory'
+NO_DIST_INSTALL = True
 
 CSRCS += [
     'dummy_replace_malloc.c',

diff --git a/memory/replace/jemalloc/Makefile.in b/memory/replace/jemalloc/Makefile.in
@@ -10,7 +10,6 @@ VPATH           = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_SHARED_LIB = 1
-NO_DIST_INSTALL = 1
 
 SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
 DEFINES += -DMOZ_JEMALLOC3 -DMOZ_REPLACE_JEMALLOC

diff --git a/memory/replace/jemalloc/moz.build b/memory/replace/jemalloc/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'memory'
+NO_DIST_INSTALL = True
 
 CSRCS += [
     'jemalloc_config.c',

diff --git a/mozglue/tests/Makefile.in b/mozglue/tests/Makefile.in
@@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_LINKER
 SIMPLE_PROGRAMS := TestZip$(BIN_SUFFIX)
-NO_DIST_INSTALL = 1
 STL_FLAGS =
 
 LOCAL_INCLUDES += -I$(srcdir)/../linker

diff --git a/mozglue/tests/moz.build b/mozglue/tests/moz.build
@@ -4,6 +4,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/.
 
+NO_DIST_INSTALL = True
+
 if CONFIG['MOZ_LINKER']:
     CPP_SOURCES += [
         'TestZip.cpp',

diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -110,6 +110,9 @@ def emit_from_sandbox(self, sandbox):
             if sandbox[moz]:
                 passthru.variables[mak] = sandbox[moz]
 
+        if sandbox['NO_DIST_INSTALL']:
+            passthru.variables['NO_DIST_INSTALL'] = '1'
+
         if passthru.variables:
             yield passthru
 

diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
@@ -316,6 +316,13 @@ def doc_to_paragraphs(doc):
         exist. These generally have .cpp, .cc, or .cxx extensions.
         """),
 
+    'NO_DIST_INSTALL': (bool, bool, False,
+        """Disable installing certain files into the distribution directory.
+
+        If present, some files defined by other variables won't be
+        distributed/shipped with the produced build.
+        """),
+
     # IDL Generation.
     'XPIDL_SOURCES': (StrictOrderingOnAppendList, list, [],
         """XPCOM Interface Definition Files (xpidl).

diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
@@ -36,3 +36,5 @@ CSRCS += ['fans.c', 'tans.c']
 CMMSRCS = ['fans.mm', 'tans.mm']
 
 SSRCS = ['fans.S', 'tans.S']
+
+NO_DIST_INSTALL = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@
		# 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/.

		NO_DIST_INSTALL = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,5 @@
		# file, You can obtain one at http://mozilla.org/MPL/2.0/.

		MODULE = 'xpctest'
		NO_DIST_INSTALL = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,3 +36,5 @@ CSRCS += ['fans.c', 'tans.c']
		CMMSRCS = ['fans.mm', 'tans.mm']

		SSRCS = ['fans.S', 'tans.S']

		NO_DIST_INSTALL = True