bug 875549: move HOST_CSRCS to mozbuild (file batch #1). r=mshal
authorJoey Armstrong <joey@mozilla.com>
Tue, 11 Jun 2013 11:31:11 -0400
changeset 134655 3e73c00a7db1b29bf69116839bc72facf9ebf0f7
parent 134654 9aa012a41d0d9e80ffc9e0c3dc3bc9c9a88f39b5
child 134656 3f3ab64fea609645aafa1dce55ba2a6c842a4d93
push idunknown
push userunknown
push dateunknown
reviewersmshal
bugs875549
milestone24.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 875549: move HOST_CSRCS to mozbuild (file batch #1). r=mshal
config/Makefile.in
config/moz.build
js/src/config/Makefile.in
js/src/config/moz.build
media/libvpx/Makefile.in
media/libvpx/moz.build
modules/libbz2/src/Makefile.in
modules/libbz2/src/moz.build
modules/libmar/src/Makefile.in
modules/libmar/src/moz.build
modules/libmar/tool/Makefile.in
modules/libmar/tool/moz.build
other-licenses/bsdiff/Makefile.in
other-licenses/bsdiff/moz.build
toolkit/crashreporter/google-breakpad/src/common/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/moz.build
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -16,17 +16,17 @@ include $(DEPTH)/config/autoconf.mk
 VISIBILITY_FLAGS =
 
 # STDCXX_COMPAT is not needed here, and will actually fail because
 # libstdc++-compat is not built yet.
 STDCXX_COMPAT =
 
 ifneq (WINNT,$(HOST_OS_ARCH))
 HOST_PROGRAM	= nsinstall_real$(HOST_BIN_SUFFIX)
-HOST_CSRCS	= nsinstall.c pathsub.c
+DISABLED_HOST_CSRCS	= nsinstall.c pathsub.c
 endif
 
 ifndef CROSS_COMPILE
 ifdef USE_ELF_DYNSTR_GC
 export:: elf-dynstr-gc
 endif
 endif
 
--- a/config/moz.build
+++ b/config/moz.build
@@ -8,8 +8,13 @@ CONFIGURE_SUBST_FILES += [
     'autoconf.mk',
     'doxygen.cfg',
     'emptyvars.mk',
     'makefiles/test/Makefile',
     'tests/makefiles/autodeps/Makefile',
     'tests/src-simple/Makefile',
 ]
 
+if CONFIG['HOST_OS_ARCH'] != 'WINNT':
+    HOST_CSRCS += [
+        'nsinstall.c',
+        'pathsub.c',
+    ]
--- a/js/src/config/Makefile.in
+++ b/js/src/config/Makefile.in
@@ -11,17 +11,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 # For sanity's sake, we compile nsinstall without the wrapped system
 # headers, so that we can use it to set up the wrapped system headers.
 VISIBILITY_FLAGS =
 
 ifneq (WINNT,$(HOST_OS_ARCH))
 HOST_PROGRAM	= nsinstall_real$(HOST_BIN_SUFFIX)
-HOST_CSRCS	= nsinstall.c pathsub.c
+DISABLED_HOST_CSRCS	= nsinstall.c pathsub.c
 endif
 
 # IMPORTANT: Disable NSBUILDROOT for this directory only, otherwise we have
 # a recursive rule for finding nsinstall and the Perl scripts.
 ifdef NSBUILDROOT
 override NSBUILDROOT :=
 endif
 
--- a/js/src/config/moz.build
+++ b/js/src/config/moz.build
@@ -1,6 +1,12 @@
 # -*- 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/.
 
+
+if CONFIG['HOST_OS_ARCH'] != 'WINNT':
+    HOST_CSRCS += [
+        'nsinstall.c',
+        'pathsub.c',
+    ]
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -405,17 +405,17 @@ ifdef VPX_NEED_OBJ_INT_EXTRACT
 # parse that format, and so only has limited support for cross-compilation.
 
 ifdef VPX_ARM_ASM
 VPX_OIE_FORMAT := rvds
 else
 VPX_OIE_FORMAT := gas
 endif
 
-HOST_CSRCS = obj_int_extract.c
+DISABLED_HOST_CSRCS = obj_int_extract.c
 HOST_PROGRAM = host_obj_int_extract$(HOST_BIN_SUFFIX)
 
 CSRCS += asm_com_offsets.c
 
 GARBAGE += asm_com_offsets.$(OBJ_SUFFIX) asm_com_offsets.asm
 
 ifdef MOZ_VP8_ENCODER
 CSRCS += asm_enc_offsets.c
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -26,8 +26,13 @@ EXPORTS.vpx += [
     'vpx_mem_intrnl.h',
     'vpx_timer.h',
     'vpxscale.h',
     'x86.h',
     'yv12config.h',
     'yv12extend.h',
 ]
 
+
+if CONFIG['VPX_NEED_OBJ_INT_EXTRACT']:
+    HOST_CSRCS += [
+        'obj_int_extract.c',
+    ]
--- a/modules/libbz2/src/Makefile.in
+++ b/modules/libbz2/src/Makefile.in
@@ -29,16 +29,16 @@ CSRCS		= \
 		bzlib.c \
 		compress.c \
 		crctable.c \
 		decompress.c \
 		huffman.c \
 		randtable.c \
 		$(NULL)
 
-HOST_CSRCS	= $(CSRCS)
+DISABLED_HOST_CSRCS	= $(CSRCS)
 
 include $(topsrcdir)/config/rules.mk
 
 # The intermediate (.ii/.s) files for host and target can have the same name...
 # disable parallel builds
 .NOTPARALLEL:
 
--- a/modules/libbz2/src/moz.build
+++ b/modules/libbz2/src/moz.build
@@ -5,9 +5,21 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libbz2'
 
 EXPORTS += [
     'bzlib.h',
 ]
 
+# Placeholder for CSRCS= conversion.
+csrcs = [
+    'blocksort.c',
+    'bzlib.c',
+    'compress.c',
+    'crctable.c',
+    'decompress.c',
+    'huffman.c',
+    'randtable.c',
+]
+
+HOST_CSRCS += csrcs
 HOST_LIBRARY_NAME = 'hostbz2'
--- a/modules/libmar/src/Makefile.in
+++ b/modules/libmar/src/Makefile.in
@@ -16,17 +16,17 @@ DISABLED_HOST_LIBRARY_NAME = hostmar
 FORCE_STATIC_LIB = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
 
 # This makefile just builds support for reading archives.
 
 
-HOST_CSRCS	= \
+DISABLED_HOST_CSRCS	= \
 		mar_create.c \
 		mar_extract.c \
 		mar_read.c \
 		$(NULL)
 
 CSRCS		= \
 		$(HOST_CSRCS) \
 		$(NULL)
--- a/modules/libmar/src/moz.build
+++ b/modules/libmar/src/moz.build
@@ -6,9 +6,14 @@
 
 MODULE = 'libmar'
 
 EXPORTS += [
     'mar.h',
     'mar_cmdline.h',
 ]
 
+HOST_CSRCS += [
+    'mar_create.c',
+    'mar_extract.c',
+    'mar_read.c',
+]
 HOST_LIBRARY_NAME = 'hostmar'
--- a/modules/libmar/tool/Makefile.in
+++ b/modules/libmar/tool/Makefile.in
@@ -35,17 +35,17 @@ DEFINES += \
   $(NULL)
 endif
 
 HOST_CFLAGS += \
   -DNO_SIGN_VERIFY \
   $(DEFINES) \
   $(NULL)
 
-HOST_CSRCS = \
+DISABLED_HOST_CSRCS = \
   mar.c \
   $(NULL)
 DISABLED_CSRCS = $(HOST_CSRCS)
 
 HOST_LIBS = $(DIST)/host/lib/$(LIB_PREFIX)hostmar.$(LIB_SUFFIX)
 LIBS = $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX)
 
 ifdef MOZ_ENABLE_SIGNMAR
--- a/modules/libmar/tool/moz.build
+++ b/modules/libmar/tool/moz.build
@@ -4,13 +4,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/.
 
 MODULE = 'mar'
 
 if CONFIG['MOZ_ENABLE_SIGNMAR']:
     PROGRAM = 'signmar'
 
-# bug 875549: Temporarly break dep on HOST_CSRCS= so CSRCS can convert.
-host_csrcs = [
+CSRCS = [
     'mar.c',
 ]
-CSRCS += host_csrcs
+HOST_CSRCS += CSRCS
--- a/other-licenses/bsdiff/Makefile.in
+++ b/other-licenses/bsdiff/Makefile.in
@@ -27,17 +27,17 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # This program is output to dist/host/bin because it is only needed by the
 # build system and is not intended to be included in Mozilla distributions.
 HOST_PROGRAM = mbsdiff$(BIN_SUFFIX)
-HOST_CSRCS = bsdiff.c
+DISABLED_HOST_CSRCS = bsdiff.c
 
 ifdef MOZ_NATIVE_BZ2
 HOST_LIBS += $(MOZ_BZ2_LIBS)
 else
 HOST_LIBS += $(DIST)/host/lib/$(LIB_PREFIX)hostbz2.$(LIB_SUFFIX)
 endif
 
 ifeq ($(HOST_OS_ARCH),WINNT)
--- a/other-licenses/bsdiff/moz.build
+++ b/other-licenses/bsdiff/moz.build
@@ -1,6 +1,9 @@
 # -*- 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/.
 
+HOST_CSRCS += [
+    'bsdiff.c',
+]
--- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -72,17 +72,17 @@ OS_CXXFLAGS += -DHAVE_A_OUT_H
 endif
 ifeq (Darwin,$(OS_ARCH))
 HOST_CXXFLAGS += -DHAVE_MACH_O_NLIST_H
 OS_CXXFLAGS += -DHAVE_MACH_O_NLIST_H
 endif
 
 ifneq (WINNT,$(OS_TARGET))
 ifdef MOZ_CRASHREPORTER
-HOST_CSRCS = $(CSRCS)
+DISABLED_HOST_CSRCS = $(CSRCS)
 endif
 endif
 
 # need static lib
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/toolkit/crashreporter/google-breakpad/src/common/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build
@@ -44,14 +44,17 @@ if CONFIG['OS_TARGET'] == 'Android':
 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'
 
 if CONFIG['OS_ARCH'] == 'Darwin':
     CMMSRCS += [
         'mac/dump_syms.mm',
     ]