Bug 1304136 - Use a single AccEventGen.py invocation; r=chmanchester

MozReview-Commit-ID: 84OjUxxK1lg

--HG--
extra : rebase_source : a4be9e540f95ea294ed8eacc005773aa3cff051f

accessible/xpcom/AccEventGen.py

@@ -219,10 +219,10 @@ def get_conf(conf_file):
     ]
     return conf, inc_dir
 
-def gen_header_file(fd, conf_file, xpidllex, xpidlyacc):
+def gen_files(fd, conf_file, xpidllex, xpidlyacc):
+    deps = set()
     conf, inc_dir = get_conf(conf_file)
-    return print_header_file(fd, conf, inc_dir)
-
-def gen_cpp_file(fd, conf_file, xpidllex, xpidlyacc):
-    conf, inc_dir = get_conf(conf_file)
-    return print_cpp_file(fd, conf, inc_dir)
+    deps.update(print_header_file(fd, conf, inc_dir))
+    with open('xpcAccEvents.cpp', 'w') as cpp_fd:
+        deps.update(print_cpp_file(cpp_fd, conf, inc_dir))
+    return deps

accessible/xpcom/moz.build

@@ -52,18 +52,11 @@ else:
         '/accessible/other',
     ]
 
-GENERATED_FILES += [
-    'xpcAccEvents.cpp',
-    'xpcAccEvents.h',
-]
+GENERATED_FILES += [('xpcAccEvents.h', 'xpcAccEvents.cpp')]
 
-xpc_acc_events_h = GENERATED_FILES['xpcAccEvents.h']
-xpc_acc_events_h.script = 'AccEventGen.py:gen_header_file'
-xpc_acc_events_h.inputs += ['AccEvents.conf', '!/xpcom/idl-parser/xpidl/xpidllex.py', '!/xpcom/idl-parser/xpidl/xpidlyacc.py']
-
-xpc_acc_events_cpp = GENERATED_FILES['xpcAccEvents.cpp']
-xpc_acc_events_cpp.script = 'AccEventGen.py:gen_cpp_file'
-xpc_acc_events_cpp.inputs += ['AccEvents.conf', '!/xpcom/idl-parser/xpidl/xpidllex.py', '!/xpcom/idl-parser/xpidl/xpidlyacc.py']
+xpc_acc = GENERATED_FILES[('xpcAccEvents.h', 'xpcAccEvents.cpp')]
+xpc_acc.script = 'AccEventGen.py:gen_files'
+xpc_acc.inputs += ['AccEvents.conf', '!/xpcom/idl-parser/xpidl/xpidllex.py', '!/xpcom/idl-parser/xpidl/xpidlyacc.py']
 
 FINAL_LIBRARY = 'xul'