Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 925382. Error out of unified bindings if one of them includes windows.h. r=froydnj

Browse Source
This commit is contained in:
Boris Zbarsky 2013-11-01 15:39:24 -04:00
parent 112660e810
commit 630ef811f7
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
python/mozbuild/mozbuild/backend/recursivemake.py
View File

@ -563,7 +563,8 @@ class RecursiveMakeBackend(CommonBackend):
unified_suffix='cpp',
extra_dependencies=[],
unified_files_makefile_variable='unified_files',
include_curdir_build_rules=True):
include_curdir_build_rules=True,
poison_windows_h=False):
files_per_unified_file = 16
explanation = "\n" \
@ -609,7 +610,15 @@ class RecursiveMakeBackend(CommonBackend):
# handle source files being added/removed/renamed. Therefore, we
# generate them here also to make sure everything's up-to-date.
with self._write_file(os.path.join(output_directory, unified_file)) as f:
f.write('\n'.join(['#include "%s"' % s for s in source_filenames]))
includeTemplate = '#include "%(cppfile)s"'
if poison_windows_h:
includeTemplate += (
'\n'
'#ifdef _WINDOWS_\n'
'#error "%(cppfile)s included windows.h"\n'
"#endif")
f.write('\n'.join(includeTemplate % { "cppfile": s } for
s in source_filenames))
if include_curdir_build_rules:
makefile.add_statement('\n'
@ -715,7 +724,8 @@ class RecursiveMakeBackend(CommonBackend):
self._add_unified_build_rules(mk, all_webidl_sources,
bindings_dir,
unified_prefix='UnifiedBindings',
unified_files_makefile_variable='unified_binding_cpp_files')
unified_files_makefile_variable='unified_binding_cpp_files',
poison_windows_h=True)
# Assume that Somebody Else has responsibility for correctly
# specifying removal dependencies for |all_webidl_sources|.