Bug 912438 - Part b: Fix paths in CSRCS; r=mshal
authorMs2ger <ms2ger@gmail.com>
Thu, 03 Oct 2013 09:10:01 +0200
changeset 149753 eac86a85a8da003bfe41123b2578a6d9da1e2dd6
parent 149752 6b7ec3be1e7e27a94f53de479c72bd154575bf47
child 149754 2864587e0c7cc0b950c609fefb8a335077b8725e
push id34665
push userMs2ger@gmail.com
push dateThu, 03 Oct 2013 09:10:09 +0000
treeherdermozilla-inbound@2121f97cf0ce [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs912438
milestone27.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 912438 - Part b: Fix paths in CSRCS; r=mshal
media/libvpx/moz.build
netwerk/sctp/src/moz.build
netwerk/srtp/src/moz.build
python/mozbuild/mozbuild/frontend/emitter.py
python/mozbuild/mozbuild/test/backend/data/variable_passthru/bar.c
python/mozbuild/mozbuild/test/backend/data/variable_passthru/foo.c
python/mozbuild/mozbuild/test/frontend/data/variable-passthru/fans.c
python/mozbuild/mozbuild/test/frontend/data/variable-passthru/tans.c
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -33,62 +33,67 @@ EXPORTS.vpx += [
 
 if CONFIG['VPX_NEED_OBJ_INT_EXTRACT']:
     HOST_CSRCS += [
         'obj_int_extract.c',
     ]
 
 LIBRARY_NAME = 'vpx'
 
-CSRCS += [
-    'alloccommon.c',
-    'blockd.c',
-    'dboolhuff.c',
-    'debugmodes.c',
-    'decodemv.c',
-    'decodframe.c',
-    'dequantize.c',
-    'detokenize.c',
-    'dsystemdependent.c',
-    'entropy.c',
-    'entropymode.c',
-    'entropymv.c',
-    'extend.c',
-    'filter.c',
-    'findnearmv.c',
-    'gen_scalers.c',
-    'idct_blk.c',
-    'idctllm.c',
-    'loopfilter.c',
-    'loopfilter_filters.c',
-    'mbpitch.c',
-    'modecont.c',
-    'modecontext.c',
-    'onyxd_if.c',
-    'postproc.c',
-    'quant_common.c',
-    'reconinter.c',
-    'reconintra.c',
-    'reconintra4x4.c',
-    'reconintra_mt.c',
-    'sad_c.c',
-    'scalesystemdependent.c',
-    'setupintrarecon.c',
-    'swapyv12buffer.c',
-    'systemdependent.c',
-    'threading.c',
-    'treecoder.c',
-    'variance_c.c',
-    'vp8_dx_iface.c',
-    'vpx_codec.c',
+def sorted(l):
+    l = l[:]
+    l.sort()
+    return l
+
+CSRCS += sorted([
+    'vp8/common/alloccommon.c',
+    'vp8/common/blockd.c',
+    'vp8/decoder/dboolhuff.c',
+    'vp8/common/debugmodes.c',
+    'vp8/decoder/decodemv.c',
+    'vp8/decoder/decodframe.c',
+    'vp8/common/dequantize.c',
+    'vp8/decoder/detokenize.c',
+    'vp8/decoder/generic/dsystemdependent.c',
+    'vp8/common/entropy.c',
+    'vp8/common/entropymode.c',
+    'vp8/common/entropymv.c',
+    'vp8/common/extend.c',
+    'vp8/common/filter.c',
+    'vp8/common/findnearmv.c',
+    'vpx_scale/generic/gen_scalers.c',
+    'vp8/common/idct_blk.c',
+    'vp8/common/idctllm.c',
+    'vp8/common/loopfilter.c',
+    'vp8/common/loopfilter_filters.c',
+    'vp8/common/mbpitch.c',
+    'vp8/common/modecont.c',
+    'vp8/common/modecontext.c',
+    'vp8/decoder/onyxd_if.c',
+    'vp8/common/postproc.c',
+    'vp8/common/quant_common.c',
+    'vp8/common/reconinter.c',
+    'vp8/common/reconintra.c',
+    'vp8/common/reconintra4x4.c',
+    'vp8/decoder/reconintra_mt.c',
+    'vp8/common/sad_c.c',
+    'vpx_scale/generic/scalesystemdependent.c',
+    'vp8/common/setupintrarecon.c',
+    'vp8/common/swapyv12buffer.c',
+    'vp8/common/generic/systemdependent.c',
+    'vp8/decoder/threading.c',
+    'vp8/common/treecoder.c',
+    'vp8/common/variance_c.c',
+    'vp8/vp8_dx_iface.c',
+    'vpx/src/vpx_codec.c',
     'vpx_config_c.c',
-    'vpx_decoder.c',
-    'vpx_decoder_compat.c',
-    'vpx_encoder.c',
-    'vpx_image.c',
-    'vpx_mem.c',
-    'vpxscale.c',
-    'yv12config.c',
-    'yv12extend.c',
-]
+    'vpx/src/vpx_decoder.c',
+    'vpx/src/vpx_decoder_compat.c',
+    'vpx/src/vpx_encoder.c',
+    'vpx/src/vpx_image.c',
+    'vpx_mem/vpx_mem.c',
+    'vpx_scale/generic/vpxscale.c',
+    'vpx_scale/generic/yv12config.c',
+    'vpx_scale/generic/yv12extend.c',
+])
 
 MSVC_ENABLE_PGO = True
 
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -7,43 +7,48 @@
 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',
+def sorted(l):
+    l = l[:]
+    l.sort()
+    return l
+
+CSRCS += sorted([
+    'netinet6/sctp6_usrreq.c',
+    'netinet/sctp_asconf.c',
+    'netinet/sctp_auth.c',
+    'netinet/sctp_bsd_addr.c',
+    'netinet/sctp_callout.c',
+    'netinet/sctp_cc_functions.c',
+    'netinet/sctp_crc32.c',
+    'netinet/sctp_hashdriver.c',
+    'netinet/sctp_indata.c',
+    'netinet/sctp_input.c',
+    'netinet/sctp_output.c',
+    'netinet/sctp_pcb.c',
+    'netinet/sctp_peeloff.c',
+    'netinet/sctp_sha1.c',
+    'netinet/sctp_ss_functions.c',
+    'netinet/sctp_sysctl.c',
+    'netinet/sctp_timer.c',
+    'netinet/sctp_userspace.c',
+    'netinet/sctp_usrreq.c',
+    'netinet/sctputil.c',
     'user_environment.c',
     'user_mbuf.c',
     'user_recv_thread.c',
     'user_sctp_timer_iterate.c',
     'user_socket.c',
-]
+])
 
 if CONFIG['OS_TARGET'] == 'Android':
     CPP_SOURCES += [
         'ifaddrs_android.cpp',
     ]
 
 LIBXUL_LIBRARY = True
 
--- a/netwerk/srtp/src/moz.build
+++ b/netwerk/srtp/src/moz.build
@@ -3,39 +3,44 @@
 # 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',
-]
+def sorted(l):
+    l = l[:]
+    l.sort()
+    return l
+
+CSRCS += sorted([
+    'crypto/cipher/aes.c',
+    'crypto/cipher/aes_cbc.c',
+    'crypto/cipher/aes_icm.c',
+    'crypto/kernel/alloc.c',
+    'crypto/hash/auth.c',
+    'crypto/cipher/cipher.c',
+    'crypto/kernel/crypto_kernel.c',
+    'crypto/rng/ctr_prng.c',
+    'crypto/math/datatypes.c',
+    'srtp/ekt.c',
+    'crypto/kernel/err.c',
+    'crypto/math/gf2_8.c',
+    'crypto/hash/hmac.c',
+    'crypto/kernel/key.c',
+    'crypto/hash/null_auth.c',
+    'crypto/cipher/null_cipher.c',
+    'crypto/rng/prng.c',
+    'crypto/rng/rand_source.c',
+    'crypto/replay/rdb.c',
+    'crypto/replay/rdbx.c',
+    'crypto/hash/sha1.c',
+    'srtp/srtp.c',
+    'crypto/math/stat.c',
+    'crypto/replay/ut_sim.c',
+])
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'nksrtp_s'
 
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -121,22 +121,22 @@ class TreeMetadataEmitter(LoggingMixin):
             self.log(logging.WARN, 'mozbuild_warning', dict(
                 path=sandbox.main_path),
                 '{path}: NO_DIST_INSTALL has no effect on XPIDL_SOURCES.')
 
         for idl in sandbox['XPIDL_SOURCES']:
             yield XPIDLFile(sandbox, mozpath.join(sandbox['SRCDIR'], idl),
                 xpidl_module)
 
-        if sandbox['CPP_SOURCES']:
-            for src in sandbox['CPP_SOURCES']:
+        for symbol in ('CPP_SOURCES', 'CSRCS'):
+            for src in (sandbox[symbol] or []):
                 if not os.path.exists(os.path.join(sandbox['SRCDIR'], src)):
                     raise SandboxValidationError('Reference to a file that '
-                        'doesn\'t exist in CPP_SOURCES (%s) in %s'
-                        % (src, sandbox['RELATIVEDIR']))
+                        'doesn\'t exist in %s (%s) in %s'
+                        % (symbol, src, sandbox['RELATIVEDIR']))
 
         # Proxy some variables as-is until we have richer classes to represent
         # them. We should aim to keep this set small because it violates the
         # desired abstraction of the build definition away from makefiles.
         passthru = VariablePassthru(sandbox)
         varmap = dict(
             # Makefile.in : moz.build
             ASFILES='ASFILES',
new file mode 100644
new file mode 100644
new file mode 100644
new file mode 100644