bug 888009: move HOST_CPPSRCS to mozbuild (batch #2) r=mshal
authorJoey Armstrong <joey@mozilla.com>
Thu, 12 Sep 2013 13:32:27 -0400
changeset 146869 2f41b8eb22b566cdca02952786c519e81fb2a6d9
parent 146868 ac1bcd6c981dd02d66b0bf0092e4d2e1405c32d7
child 146870 8c1931a68abc7f11da09e1504ef12df29b29d2df
push id2635
push userryanvm@gmail.com
push dateFri, 13 Sep 2013 02:29:47 +0000
treeherderfx-team@7b85565949af [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs888009
milestone26.0a1
bug 888009: move HOST_CPPSRCS to mozbuild (batch #2) r=mshal
build/unix/elfhack/Makefile.in
build/unix/elfhack/moz.build
build/unix/stdc++compat/Makefile.in
build/unix/stdc++compat/moz.build
js/src/Makefile.in
js/src/moz.build
layout/style/test/Makefile.in
layout/style/test/moz.build
mozglue/linker/Makefile.in
mozglue/linker/moz.build
toolkit/crashreporter/google-breakpad/src/common/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build
toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
toolkit/crashreporter/google-breakpad/src/common/moz.build
toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build
--- a/build/unix/elfhack/Makefile.in
+++ b/build/unix/elfhack/Makefile.in
@@ -5,21 +5,16 @@
 
 INTERNAL_TOOLS = 1
 
 HOST_PROGRAM = elfhack
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 VPATH += $(topsrcdir)/build
 
-HOST_CPPSRCS = \
-  elf.cpp \
-  elfhack.cpp \
-  $(NULL)
-
 OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
 
 ifndef CROSS_COMPILE
 CSRCS += dummy.c
 endif
 
 WRAP_LDFLAGS=
 
--- a/build/unix/elfhack/moz.build
+++ b/build/unix/elfhack/moz.build
@@ -7,8 +7,12 @@
 NO_DIST_INSTALL = True
 DIRS += ['inject']
 
 CSRCS += [
     'test-array.c',
     'test-ctors.c',
 ]
 
+HOST_CPPSRCS += [
+    'elf.cpp',
+    'elfhack.cpp',
+]
--- a/build/unix/stdc++compat/Makefile.in
+++ b/build/unix/stdc++compat/Makefile.in
@@ -2,16 +2,12 @@
 # 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/.
 
 FORCE_STATIC_LIB= 1
 STL_FLAGS =
 NO_EXPAND_LIBS = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
-ifdef MOZ_LIBSTDCXX_HOST_VERSION
-HOST_CPPSRCS = stdc++compat.cpp
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += -DMOZ_LIBSTDCXX_VERSION=$(MOZ_LIBSTDCXX_TARGET_VERSION)
 HOST_CXXFLAGS += -DMOZ_LIBSTDCXX_VERSION=$(MOZ_LIBSTDCXX_HOST_VERSION)
--- a/build/unix/stdc++compat/moz.build
+++ b/build/unix/stdc++compat/moz.build
@@ -7,9 +7,12 @@
 MODULE = 'build'
 
 if CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION']:
     LIBRARY_NAME = 'stdc++compat'
     CPP_SOURCES += ['stdc++compat.cpp']
 
 if CONFIG['MOZ_LIBSTDCXX_HOST_VERSION']:
     HOST_LIBRARY_NAME = 'host_stdc++compat'
+    HOST_CPPSRCS += [
+        'stdc++compat.cpp',
+    ]
 
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -146,21 +146,19 @@ ifeq (,$(MOZ_GLUE_PROGRAM_LDFLAGS))
 include $(MFBT_ROOT)/sources.mk
 DEFINES += -DIMPL_MFBT
 endif
 
 EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
 
 # Define keyword generator before rules.mk, see bug 323979 comment 50
 
-HOST_CPPSRCS += jskwgen.cpp
 HOST_SIMPLE_PROGRAMS += host_jskwgen$(HOST_BIN_SUFFIX)
 GARBAGE += jsautokw.h host_jskwgen$(HOST_BIN_SUFFIX)
 
-HOST_CPPSRCS += jsoplengen.cpp
 HOST_SIMPLE_PROGRAMS += host_jsoplengen$(HOST_BIN_SUFFIX)
 GARBAGE += jsautooplen.h host_jsoplengen$(HOST_BIN_SUFFIX)
 
 GARBAGE += selfhosted.out.h
 
 USE_HOST_CXX = 1
 
 ifdef HAVE_DTRACE
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -344,8 +344,12 @@ if CONFIG['HAVE_LINUX_PERF_EVENT_H']:
     ]
 else:
     CPP_SOURCES += [
         'pm_stub.cpp'
     ]
 
 MSVC_ENABLE_PGO = True
 
+HOST_CPPSRCS += [
+    'jskwgen.cpp',
+    'jsoplengen.cpp',
+]
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -1,18 +1,19 @@
 #
 # 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/.
 
-HOST_CPPSRCS	= \
+# Preserve until HOST_SIMPLE_PROGRAMS has been converted.
+host_cppsrcs	= \
 		ListCSSProperties.cpp \
 		$(NULL)
 
-HOST_SIMPLE_PROGRAMS	= $(addprefix host_, $(HOST_CPPSRCS:.cpp=$(HOST_BIN_SUFFIX)))
+HOST_SIMPLE_PROGRAMS	= $(addprefix host_, $(host_cppsrcs:.cpp=$(HOST_BIN_SUFFIX)))
 
 # ParseCSS.cpp used to be built as a test program, but it was not
 # being used for anything, and recent changes to the CSS loader have
 # made it fail to link.  Further changes are planned which should make
 # it buildable again.
 #
 # TestCSSPropertyLookup.cpp needs the internal XPCOM APIs and so cannot
 # be built with libxul enabled.
--- a/layout/style/test/moz.build
+++ b/layout/style/test/moz.build
@@ -3,8 +3,11 @@
 # 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/.
 
 TEST_DIRS += ['chrome']
 
 MODULE = 'layout'
 
+HOST_CPPSRCS += [
+    'ListCSSProperties.cpp',
+]
--- a/mozglue/linker/Makefile.in
+++ b/mozglue/linker/Makefile.in
@@ -2,21 +2,16 @@
 # 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/.
 
 FORCE_STATIC_LIB= 1
 STL_FLAGS =
 
 HOST_PROGRAM = szip
 
-HOST_CPPSRCS = \
-  szip.cpp \
-  SeekableZStream.cpp \
-  $(NULL)
-
 HOST_LIBS = -lz
 
 DEFINES += -DIMPL_MFBT
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq (arm,$(TARGET_CPU))
 ifdef MOZ_THUMB2
--- a/mozglue/linker/moz.build
+++ b/mozglue/linker/moz.build
@@ -11,8 +11,12 @@ CPP_SOURCES += [
     'ElfLoader.cpp',
     'Mappable.cpp',
     'SeekableZStream.cpp',
     'Zip.cpp',
 ]
 
 LIBRARY_NAME = 'linker'
 
+HOST_CPPSRCS += [
+    'SeekableZStream.cpp',
+    'szip.cpp',
+]
--- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -4,37 +4,16 @@
 
 ifneq (WINNT,$(OS_TARGET))
 ifdef MOZ_CRASHREPORTER
 endif
 endif
 
 LOCAL_INCLUDES 	= -I$(srcdir)/..
 
-ifneq (WINNT,$(OS_TARGET))
-ifdef MOZ_CRASHREPORTER
-HOST_CPPSRCS = \
-  string_conversion.cc \
-  module.cc \
-  unique_string.cc \
-  md5.cc \
-  dwarf_cfi_to_module.cc \
-  dwarf_cu_to_module.cc \
-  language.cc \
-  stabs_to_module.cc \
-  stabs_reader.cc \
-  dwarf_line_to_module.cc \
-  arm_ex_reader.cc \
-  arm_ex_to_module.cc \
-  pathname_stripper.cc \
-  logging.cc \
-  $(NULL)
-endif
-endif
-
 ifeq ($(OS_TARGET),Android)
 VPATH += $(srcdir)/android
 TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
 DEFINES += -DNO_STABS_SUPPORT
 endif
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DELFSIZE=32
--- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in
@@ -1,22 +1,16 @@
 # 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_CRASHREPORTER
 
 LOCAL_INCLUDES 	= -I$(srcdir)/../..
 
-HOST_CPPSRCS = \
-  bytereader.cc \
-  dwarf2diehandler.cc \
-  dwarf2reader.cc \
-  functioninfo.cc \
-  $(NULL)
 endif
 
 # This code is only compiled for build-time tools,
 # so enabling RTTI should be fine.
 HOST_CXXFLAGS := -funsigned-char $(filter-out -fno-rtti,$(HOST_CXXFLAGS))
 
 # need static lib
 FORCE_STATIC_LIB = 1
--- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build
@@ -3,8 +3,14 @@
 # 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/.
 
 MODULE = 'breakpad_dwarf'
 
 if CONFIG['MOZ_CRASHREPORTER']:
     HOST_LIBRARY_NAME = 'host_breakpad_dwarf_s'
+    HOST_CPPSRCS += [
+        'bytereader.cc',
+        'dwarf2diehandler.cc',
+        'dwarf2reader.cc',
+        'functioninfo.cc',
+    ]
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
@@ -1,41 +1,26 @@
 # 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_CRASHREPORTER
-endif
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \
   $(NULL)
 
 ifneq (Android,$(OS_TARGET))
 else
 TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
 endif
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DELFSIZE=32
 endif
 
 DEFINES += -DNO_STABS_SUPPORT
 
-ifdef MOZ_CRASHREPORTER
-HOST_CPPSRCS = \
-  dump_symbols.cc \
-  elf_symbols_to_module.cc \
-  elfutils.cc \
-  file_id.cc \
-  guid_creator.cc \
-  linux_libc_support.cc \
-  memory_mapped_file.cc \
-  $(NULL)
-endif
-
 # need static lib
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 # See https://bugzilla.mozilla.org/show_bug.cgi?id=741348#c11
 file_id.$(OBJ_SUFFIX): STL_FLAGS=
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
@@ -17,11 +17,20 @@ CPP_SOURCES += [
 
 if CONFIG['OS_TARGET'] != 'Android':
     CPP_SOURCES += [
         'http_upload.cc',
     ]
 
 if CONFIG['MOZ_CRASHREPORTER']:
     HOST_LIBRARY_NAME = 'host_breakpad_linux_common_s'
+    HOST_CPPSRCS += [
+        'dump_symbols.cc',
+        'elf_symbols_to_module.cc',
+        'elfutils.cc',
+        'file_id.cc',
+        'guid_creator.cc',
+        'linux_libc_support.cc',
+        'memory_mapped_file.cc',
+    ]
 
 LIBRARY_NAME = 'breakpad_linux_common_s'
 
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
@@ -6,19 +6,16 @@ LOCAL_INCLUDES 	= -I$(srcdir)/../..
 
 # This is a little weird, but we're building a host and a target lib here.
 # The host lib is used for dump_syms, and the target lib for the
 # crash reporter client.  Therefore, we don't need all the srcs in both.
 CMSRCS = \
   HTTPMultipartUpload.m \
   $(NULL)
 
-
-HOST_CPPSRCS = $(CPPSRCS)
-
 HOST_CMMSRCS = \
   dump_syms.mm \
   $(NULL)
 
 # need static lib
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
@@ -12,15 +12,17 @@ CPP_SOURCES += [
     'file_id.cc',
     'macho_id.cc',
     'macho_reader.cc',
     'macho_utilities.cc',
     'macho_walker.cc',
     'string_utilities.cc',
 ]
 
+HOST_CPPSRCS += CPP_SOURCES
+
 HOST_LIBRARY_NAME = 'host_breakpad_mac_common_s'
 CMMSRCS += [
     'MachIPC.mm',
 ]
 
 LIBRARY_NAME = 'breakpad_mac_common_s'
 
--- a/toolkit/crashreporter/google-breakpad/src/common/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build
@@ -47,19 +47,33 @@ else:
     if CONFIG['OS_TARGET'] != 'WINNT':
         CPP_SOURCES += [
             'stabs_to_module.cc',
             'stabs_reader.cc',
         ]
 
 if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_CRASHREPORTER']:
     HOST_CSRCS += CSRCS
-
-if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_CRASHREPORTER']:
     HOST_LIBRARY_NAME = 'host_breakpad_common_s'
+    HOST_CPPSRCS += [
+        'arm_ex_reader.cc',
+        'arm_ex_to_module.cc',
+        'dwarf_cfi_to_module.cc',
+        'dwarf_cu_to_module.cc',
+        'dwarf_line_to_module.cc',
+        'language.cc',
+        'logging.cc',
+        'md5.cc',
+        'module.cc',
+        'pathname_stripper.cc',
+        'stabs_reader.cc',
+        'stabs_to_module.cc',
+        'string_conversion.cc',
+        'unique_string.cc',
+    ]
 
 if CONFIG['OS_ARCH'] == 'Darwin':
     CMMSRCS += [
         'mac/dump_syms.mm',
     ]
 
 if CONFIG['OS_TARGET'] == 'Android':
     SSRCS += [
--- a/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
@@ -1,16 +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/.
 
 LOCAL_INCLUDES 	= -I$(srcdir)/../..
 
-# not compiling http_upload.cc currently
-# since it depends on libcurl
-HOST_CPPSRCS = \
-  dump_symbols.cc \
-  file_id.cc \
-  guid_creator.cc \
-  $(NULL)
-
 # need static lib
 FORCE_STATIC_LIB = 1
--- a/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build
@@ -11,8 +11,16 @@ CPP_SOURCES += [
     'file_id.cc',
     'guid_creator.cc',
 ]
 
 HOST_LIBRARY_NAME = 'host_breakpad_solaris_common_s'
 
 LIBRARY_NAME = 'breakpad_solaris_common_s'
 
+# not compiling http_upload.cc currently
+# since it depends on libcurl
+HOST_CPPSRCS += [
+    'dump_symbols.cc',
+    'file_id.cc',
+    'guid_creator.cc',
+]
+