Bug 1043692 - Move DIST_INSTALL to moz.build. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 09 May 2015 08:37:22 +0900
changeset 243444 9bc266372d00ad5c1c93d901059bb47e18806330
parent 243443 59e335c30dfd53671cf2aad4dca095910ebc7864
child 243445 5f41e73779e8ab75e2214c7353cbfb5c27f7a5b8
push id28738
push usercbook@mozilla.com
push dateTue, 12 May 2015 14:11:31 +0000
treeherderautoland@bedce1b405a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1043692
milestone40.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 1043692 - Move DIST_INSTALL to moz.build. r=gps
dom/plugins/ipc/interpose/Makefile.in
dom/plugins/ipc/interpose/moz.build
intl/unicharutil/util/Makefile.in
intl/unicharutil/util/internal/Makefile.in
intl/unicharutil/util/internal/moz.build
intl/unicharutil/util/moz.build
js/src/Makefile.in
js/src/moz.build
memory/build/Makefile.in
memory/build/moz.build
memory/jemalloc/Makefile.in
memory/jemalloc/moz.build
memory/mozalloc/Makefile.in
memory/mozalloc/moz.build
mozglue/build/Makefile.in
mozglue/build/moz.build
python/mozbuild/mozbuild/backend/recursivemake.py
rdf/util/Makefile.in
rdf/util/moz.build
xpcom/glue/Makefile.in
xpcom/glue/moz.build
xpcom/glue/standalone/Makefile.in
xpcom/glue/standalone/moz.build
xpcom/glue/standalone/staticruntime/Makefile.in
xpcom/glue/standalone/staticruntime/moz.build
xpcom/glue/staticruntime/Makefile.in
xpcom/glue/staticruntime/moz.build
xpcom/typelib/xpt/Makefile.in
xpcom/typelib/xpt/moz.build
deleted file mode 100644
--- a/dom/plugins/ipc/interpose/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DIST_INSTALL     = 1
--- a/dom/plugins/ipc/interpose/moz.build
+++ b/dom/plugins/ipc/interpose/moz.build
@@ -10,8 +10,10 @@ UNIFIED_SOURCES += [ "%s.mm" % (LIBRARY_
 
 UNIFIED_SOURCES += [
     'plugin_child_quirks.mm',
 ]
 
 OS_LIBS += ['-framework Carbon']
 
 FAIL_ON_WARNINGS = True
+
+DIST_INSTALL = True
deleted file mode 100644
--- a/intl/unicharutil/util/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# 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 makefile builds the unicharutil_external_s library which should be used
-# by frozen (dependent) linkage components. Internal-linkage code should use
-# unicharutil_s which is built in the internal/ subdirectory.
-
-DIST_INSTALL = 1
--- a/intl/unicharutil/util/internal/Makefile.in
+++ b/intl/unicharutil/util/internal/Makefile.in
@@ -1,14 +1,8 @@
 #
 # 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 makefile builds the version of unicharutils_s static library which uses
-# internal linkage. Components that use frozen (external) linkage should use
-# unicharutil_external_s.
-
 ifdef ENABLE_INTL_API
 LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
 endif
-
-DIST_INSTALL = 1
--- a/intl/unicharutil/util/internal/moz.build
+++ b/intl/unicharutil/util/internal/moz.build
@@ -1,17 +1,23 @@
 # -*- 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/.
 
+# This file builds the version of unicharutils_s static library which uses
+# internal linkage. Components that use frozen (external) linkage should use
+# unicharutil_external_s.
+
 include('../objs.mozbuild')
 
 UNIFIED_SOURCES += intl_unicharutil_util_cppsrcs
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '..',
 ]
 
 FAIL_ON_WARNINGS = True
+
+DIST_INSTALL = True
--- a/intl/unicharutil/util/moz.build
+++ b/intl/unicharutil/util/moz.build
@@ -1,14 +1,18 @@
 # -*- 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/.
 
+# This file builds the unicharutil_external_s library which should be used
+# by frozen (dependent) linkage components. Internal-linkage code should use
+# unicharutil_s which is built in the internal/ subdirectory.
+
 DIRS += ['internal', 'standalone']
 
 EXPORTS += [
     'GreekCasing.h',
     'ICUUtils.h',
     'IrishCasing.h',
     'nsBidiUtils.h',
     'nsSpecialCasingData.h',
@@ -35,8 +39,10 @@ if CONFIG['_MSC_VER']:
     CFLAGS += ['-Zl']
     CXXFLAGS += ['-Zl']
 
 if CONFIG['ENABLE_INTL_API']:
     CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
 
 if CONFIG['GNU_CXX']:
     FAIL_ON_WARNINGS = True
+
+DIST_INSTALL = True
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -11,18 +11,16 @@ make_min_ver := 3.81
 ifneq ($(make_min_ver),$(firstword $(sort $(make_min_ver) $(MAKE_VERSION))))
 $(error GNU Make $(make_min_ver) or higher is required)
 endif
 
 TOPLEVEL_BUILD := 1
 
 run_for_side_effects := $(shell echo 'MAKE: $(MAKE)')
 
-DIST_INSTALL = 1
-
 ifdef JS_HAS_CTYPES
 ifdef MOZ_NATIVE_FFI
 LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
 endif
 
 # Windows needs this to be linked with a static library.
 ifndef MOZ_NATIVE_FFI
 DEFINES += -DFFI_BUILDING
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -563,8 +563,10 @@ if CONFIG['OS_ARCH'] == 'SunOS':
         'nsl',
         'socket',
     ]
 
 if CONFIG['GNU_CXX']:
     FAIL_ON_WARNINGS = True
 
 NO_EXPAND_LIBS = True
+
+DIST_INSTALL = True
--- a/memory/build/Makefile.in
+++ b/memory/build/Makefile.in
@@ -1,8 +1,5 @@
 # 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/.
 
 STLFLAGS =
-ifdef MOZ_GLUE_IN_PROGRAM
-DIST_INSTALL = 1
-endif
--- a/memory/build/moz.build
+++ b/memory/build/moz.build
@@ -47,16 +47,17 @@ if CONFIG['MOZ_JEMALLOC3']:
         ]
 else:
     USE_LIBS += [
         'mozjemalloc',
     ]
 
 if CONFIG['MOZ_GLUE_IN_PROGRAM']:
     SDK_LIBRARY = True
+    DIST_INSTALL = True
 
 # Keep jemalloc separated when mozglue is statically linked
 if CONFIG['MOZ_MEMORY'] and (CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') or
                              CONFIG['MOZ_NATIVE_JEMALLOC']):
     FINAL_LIBRARY = 'mozglue'
 
 if CONFIG['MOZ_REPLACE_MALLOC'] and CONFIG['OS_TARGET'] == 'Darwin':
     # The zone allocator for OSX needs some jemalloc internal functions
--- a/memory/jemalloc/Makefile.in
+++ b/memory/jemalloc/Makefile.in
@@ -1,13 +1,9 @@
 # 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/.
 
-ifdef MOZ_GLUE_IN_PROGRAM
-DIST_INSTALL = 1
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef GNU_CC
 CFLAGS += -std=gnu99
 endif
--- a/memory/jemalloc/moz.build
+++ b/memory/jemalloc/moz.build
@@ -43,16 +43,17 @@ if CONFIG['OS_TARGET'] == 'Darwin' and n
     ]
 
 Library('jemalloc')
 
 FORCE_STATIC_LIB = True
 
 if CONFIG['MOZ_GLUE_IN_PROGRAM']:
     SDK_LIBRARY = True
+    DIST_INSTALL = True
 
 if CONFIG['_MSC_VER']:
     DEFINES['DLLEXPORT'] = True
     LOCAL_INCLUDES += ['src/include/msvc_compat']
     if not CONFIG['HAVE_INTTYPES_H']:
         LOCAL_INCLUDES += ['src/include/msvc_compat/C99']
 
 if CONFIG['OS_TARGET'] == 'Linux':
deleted file mode 100644
--- a/memory/mozalloc/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# 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/.
-
-DIST_INSTALL 	= 1
--- a/memory/mozalloc/moz.build
+++ b/memory/mozalloc/moz.build
@@ -51,8 +51,10 @@ if CONFIG['CLANG_CXX'] or CONFIG['_MSC_V
     FAIL_ON_WARNINGS = True
 
 DEFINES['IMPL_MFBT'] = True
 
 if CONFIG['_MSC_VER']:
     DIRS += ['staticruntime']
 
 LOCAL_INCLUDES += ['/memory/build']
+
+DIST_INSTALL = True
--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@@ -1,15 +1,13 @@
 #
 # 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/.
 
-DIST_INSTALL = 1
-
 # For FORCE_SHARED_LIB
 include $(topsrcdir)/config/config.mk
 
 ifeq (WINNT,$(OS_TARGET))
 mozglue.def: mozglue.def.in $(GLOBAL_DEPS)
 	$(call py_action,preprocessor,$(if $(MOZ_REPLACE_MALLOC),-DMOZ_REPLACE_MALLOC) $(ACDEFINES) $< -o $@)
 
 GARBAGE += mozglue.def
--- a/mozglue/build/moz.build
+++ b/mozglue/build/moz.build
@@ -96,8 +96,10 @@ if CONFIG['OS_TARGET'] == 'Darwin':
     # On OSX 10.10.3, a dead lock happens in some cases involving dynamic
     # symbol resolution for symbols that jemalloc itself uses. While it
     # might be possible to find a way to avoid all such symbol resolutions,
     # it's currently not possible because at the very least there's a call
     # to pthread_self from tsd_init_check_recursion, which is necessary
     # because somehow clang doesn't want to accept the __thread keyword
     # for TLS.
     LDFLAGS += ['-Wl,-bind_at_load']
+
+DIST_INSTALL = True
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -73,16 +73,17 @@ from ..makeutil import Makefile
 MOZBUILD_VARIABLES = [
     'ANDROID_GENERATED_RESFILES',
     'ANDROID_RES_DIRS',
     'ASFLAGS',
     'CMSRCS',
     'CMMSRCS',
     'CPP_UNIT_TESTS',
     'DIRS',
+    'DIST_INSTALL',
     'EXTRA_DSO_LDOPTS',
     'EXTRA_JS_MODULES',
     'EXTRA_PP_COMPONENTS',
     'EXTRA_PP_JS_MODULES',
     'FORCE_SHARED_LIB',
     'FORCE_STATIC_LIB',
     'FINAL_LIBRARY',
     'HOST_CSRCS',
deleted file mode 100644
--- a/rdf/util/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# 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 makefile 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. 
-
-DIST_INSTALL = 1
--- a/rdf/util/moz.build
+++ b/rdf/util/moz.build
@@ -1,22 +1,28 @@
 # -*- 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/.
 
+# 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
 
 FAIL_ON_WARNINGS = True
+
+DIST_INSTALL = True
deleted file mode 100644
--- a/xpcom/glue/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# 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/.
-
-DIST_INSTALL	= 1
--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -114,8 +114,10 @@ FAIL_ON_WARNINGS = True
 
 # Include fallible for third party code using the xpcom glue
 USE_LIBS += [
     'fallible',
 ]
 
 # Force to build a static library only
 NO_EXPAND_LIBS = True
+
+DIST_INSTALL = True
deleted file mode 100644
--- a/xpcom/glue/standalone/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# 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/.
-
-DIST_INSTALL	= 1
--- a/xpcom/glue/standalone/moz.build
+++ b/xpcom/glue/standalone/moz.build
@@ -47,8 +47,10 @@ FAIL_ON_WARNINGS = True
 
 # Include fallible for third party code using the xpcom glue
 USE_LIBS += [
     'fallible',
 ]
 
 # Force to build a static library only
 NO_EXPAND_LIBS = True
+
+DIST_INSTALL = True
deleted file mode 100644
--- a/xpcom/glue/standalone/staticruntime/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-DIST_INSTALL	= 1
--- a/xpcom/glue/standalone/staticruntime/moz.build
+++ b/xpcom/glue/standalone/staticruntime/moz.build
@@ -42,8 +42,10 @@ FAIL_ON_WARNINGS = True
 
 # Include fallible for third party code using the xpcom glue
 USE_LIBS += [
     'fallible',
 ]
 
 # Force to build a static library only
 NO_EXPAND_LIBS = True
+
+DIST_INSTALL = True
deleted file mode 100644
--- a/xpcom/glue/staticruntime/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# 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/.
-
-DIST_INSTALL	= 1
--- a/xpcom/glue/staticruntime/moz.build
+++ b/xpcom/glue/staticruntime/moz.build
@@ -40,8 +40,10 @@ FAIL_ON_WARNINGS = True
 
 # Include fallible for third party code using the xpcom glue
 USE_LIBS += [
     'fallible',
 ]
 
 # Force to build a static library only
 NO_EXPAND_LIBS = True
+
+DIST_INSTALL = True
deleted file mode 100644
--- a/xpcom/typelib/xpt/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# 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/.
-
-DIST_INSTALL	= 1
--- a/xpcom/typelib/xpt/moz.build
+++ b/xpcom/typelib/xpt/moz.build
@@ -31,8 +31,10 @@ if CONFIG['_MSC_VER']:
     CFLAGS += ['-Zl']
 
 # Code with FINAL_LIBRARY = 'xul' shouldn't do this, but the code
 # here doesn't use malloc functions anyways, while not setting
 # MOZ_NO_MOZALLOC makes the code include mozalloc.h, which includes
 # inline operator new definitions that MSVC linker doesn't strip
 # when linking the xpt tests.
 DEFINES['MOZ_NO_MOZALLOC'] = True
+
+DIST_INSTALL = True