bug 870406: move to moz.build (config batch #1) r=mshal
authorJoey Armstrong <joey@mozilla.com>
Fri, 24 May 2013 17:21:14 -0700
changeset 132965 773937adfcacaafa0aded135ac9b95cc5b93b73c
parent 132964 f1a74d04600a0fae4f614f4d077060d8c0a2d70a
child 132966 affd9b74be002e6d111f009358c10e8cfcde5c9a
push id28535
push userjarmstrong@mozilla.com
push dateSat, 25 May 2013 00:21:26 +0000
treeherdermozilla-inbound@773937adfcac [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs870406
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 870406: move to moz.build (config batch #1) r=mshal
intl/uconv/tools/Makefile.in
intl/uconv/tools/moz.build
modules/libmar/tool/Makefile.in
modules/libmar/tool/moz.build
netwerk/dns/Makefile.in
netwerk/dns/moz.build
netwerk/sctp/src/Makefile.in
netwerk/sctp/src/moz.build
netwerk/srtp/src/Makefile.in
netwerk/srtp/src/moz.build
toolkit/crashreporter/google-breakpad/src/common/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/moz.build
tools/codesighs/Makefile.in
tools/codesighs/moz.build
--- a/intl/uconv/tools/Makefile.in
+++ b/intl/uconv/tools/Makefile.in
@@ -5,21 +5,21 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CSRCS		= \
+DISABLED_CSRCS		= \
 		umaptable.c \
 		$(NULL)
 
-SIMPLE_PROGRAMS	= $(CSRCS:.c=$(BIN_SUFFIX))
+SIMPLE_PROGRAMS	= $(DISABLED_CSRCS:.c=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		$(NULL)
 
 # needed for mac linux
 ifeq ($(OS_ARCH),Linux)
--- a/intl/uconv/tools/moz.build
+++ b/intl/uconv/tools/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/.
 
+CSRCS += [
+    'umaptable.c',
+]
--- a/modules/libmar/tool/Makefile.in
+++ b/modules/libmar/tool/Makefile.in
@@ -38,17 +38,17 @@ endif
 HOST_CFLAGS += \
   -DNO_SIGN_VERIFY \
   $(DEFINES) \
   $(NULL)
 
 HOST_CSRCS = \
   mar.c \
   $(NULL)
-CSRCS = $(HOST_CSRCS)
+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
 LIBS += \
   $(DEPTH)/modules/libmar/sign/$(LIB_PREFIX)signmar.$(LIB_SUFFIX) \
   $(DEPTH)/modules/libmar/verify/$(LIB_PREFIX)verifymar.$(LIB_SUFFIX) \
--- a/modules/libmar/tool/moz.build
+++ b/modules/libmar/tool/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 = 'mar'
 
 if CONFIG['MOZ_ENABLE_SIGNMAR']:
     PROGRAM = 'signmar'
+
+# bug 875549: Temporarly break dep on HOST_CSRCS= so CSRCS can convert.
+host_csrcs = [
+    'mar.c',
+]
+CSRCS += host_csrcs
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@@ -18,17 +18,17 @@ FAIL_ON_WARNINGS := 1
 CPPSRCS = \
   DNS.cpp \
   nsIDNService.cpp \
   nsHostResolver.cpp \
   nsDNSService2.cpp \
   nsEffectiveTLDService.cpp \
   $(NULL)
 
-CSRCS = \
+DISABLED_CSRCS = \
   race.c \
   nameprep.c \
   punycode.c \
   $(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -16,8 +16,13 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'necko_dns'
 
 MODULE = 'necko'
 
 EXPORTS.mozilla.net += [
     'DNS.h',
 ]
 
+CSRCS += [
+    'nameprep.c',
+    'punycode.c',
+    'race.c',
+]
--- a/netwerk/sctp/src/Makefile.in
+++ b/netwerk/sctp/src/Makefile.in
@@ -20,17 +20,17 @@ FORCE_STATIC_LIB = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
 
 ifeq ($(OS_TARGET),Android)
 CPPSRCS = \
   ifaddrs_android.cpp \
   $(NULL)
 endif
 
-CSRCS = \
+DISABLED_CSRCS = \
   user_environment.c \
   user_mbuf.c \
   user_recv_thread.c \
   user_sctp_timer_iterate.c \
   user_socket.c \
   sctp_asconf.c \
   sctp_auth.c \
   sctp_bsd_addr.c \
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -7,8 +7,35 @@
 XPIDL_MODULE = 'necko_sctp'
 
 MODULE = 'necko'
 
 EXPORTS.mozilla.net += [
     'usrsctp.h',
 ]
 
+CSRCS += [
+    'sctp6_usrreq.c',
+    'sctp_asconf.c',
+    'sctp_auth.c',
+    'sctp_bsd_addr.c',
+    'sctp_callout.c',
+    'sctp_cc_functions.c',
+    'sctp_crc32.c',
+    'sctp_hashdriver.c',
+    'sctp_indata.c',
+    'sctp_input.c',
+    'sctp_output.c',
+    'sctp_pcb.c',
+    'sctp_peeloff.c',
+    'sctp_sha1.c',
+    'sctp_ss_functions.c',
+    'sctp_sysctl.c',
+    'sctp_timer.c',
+    'sctp_userspace.c',
+    'sctp_usrreq.c',
+    'sctputil.c',
+    'user_environment.c',
+    'user_mbuf.c',
+    'user_recv_thread.c',
+    'user_sctp_timer_iterate.c',
+    'user_socket.c',
+]
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@@ -19,17 +19,17 @@ VPATH = \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = nksrtp_s
 LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 
-CSRCS := \
+DISABLED_CSRCS := \
   ekt.c \
   srtp.c \
   aes.c \
   aes_cbc.c \
   aes_icm.c \
   cipher.c \
   null_cipher.c \
   auth.c \
--- a/netwerk/srtp/src/moz.build
+++ b/netwerk/srtp/src/moz.build
@@ -3,8 +3,34 @@
 # 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/.
 
 XPIDL_MODULE = 'necko_srtp'
 
 MODULE = 'necko'
 
+CSRCS += [
+    'aes.c',
+    'aes_cbc.c',
+    'aes_icm.c',
+    'alloc.c',
+    'auth.c',
+    'cipher.c',
+    'crypto_kernel.c',
+    'ctr_prng.c',
+    'datatypes.c',
+    'ekt.c',
+    'err.c',
+    'gf2_8.c',
+    'hmac.c',
+    'key.c',
+    'null_auth.c',
+    'null_cipher.c',
+    'prng.c',
+    'rand_source.c',
+    'rdb.c',
+    'rdbx.c',
+    'sha1.c',
+    'srtp.c',
+    'stat.c',
+    'ut_sim.c',
+]
--- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -62,17 +62,17 @@ CPPSRCS += \
   linux/elf_symbols_to_module.cc
 endif
 
 ifeq ($(OS_ARCH),Darwin)
 CMMSRCS += \
   mac/dump_syms.mm
 endif
 
-CSRCS = \
+DISABLED_CSRCS = \
   convert_UTF.c \
   $(NULL)
 
 ifeq ($(OS_TARGET),Android)
 VPATH += $(srcdir)/android
 SSRCS := breakpad_getcontext.S
 TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
 DEFINES += -DNO_STABS_SUPPORT
--- a/toolkit/crashreporter/google-breakpad/src/common/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build
@@ -4,8 +4,11 @@
 # 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['OS_ARCH'] in ('Darwin', 'Linux'):
     DIRS += ['dwarf']
 
 MODULE = 'breakpad_common'
 
+CSRCS += [
+    'convert_UTF.c',
+]
--- a/tools/codesighs/Makefile.in
+++ b/tools/codesighs/Makefile.in
@@ -6,28 +6,28 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 
-CSRCS += \
+DISABLED_CSRCS += \
 		codesighs.c \
 		maptsvdifftool.c \
 		$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
-CSRCS += \
+DISABLED_CSRCS += \
 		msmap2tsv.c \
 		msdump2symdb.c \
 		$(NULL)
 else
-CSRCS += \
+DISABLED_CSRCS += \
 		nm2tsv.c \
 		$(NULL)
 endif
 
 SIMPLE_PROGRAMS	= $(CSRCS:.c=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/config.mk
 
--- a/tools/codesighs/moz.build
+++ b/tools/codesighs/moz.build
@@ -1,6 +1,20 @@
 # -*- 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/.
 
+CSRCS += [
+    'codesighs.c',
+    'maptsvdifftool.c',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    CSRCS += [
+        'msdump2symdb.c',
+        'msmap2tsv.c',
+    ]
+else:
+    CSRCS += [
+        'nm2tsv.c',
+    ]