From 1b9dbfc419132d5159d8f2ce550ad20e169ce1b3 Mon Sep 17 00:00:00 2001 From: Olli Pettay Date: Mon, 30 Jul 2012 23:10:26 +0300 Subject: [PATCH] Bug 777401 - DictionaryHelpers.* build problems, r=khuey --- js/xpconnect/src/Makefile.in | 20 +++----------------- js/xpconnect/src/event_impl_gen.py | 8 ++++---- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in index 4e597396ce5..0f660b6d0b9 100644 --- a/js/xpconnect/src/Makefile.in +++ b/js/xpconnect/src/Makefile.in @@ -166,24 +166,9 @@ dombindings_gen.cpp: $(srcdir)/dombindings.conf \ --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \ $(srcdir)/dombindings.conf -DictionaryHelpers.$(OBJ_SUFFIX): DictionaryHelpers.h \ - DictionaryHelpers.cpp +DictionaryHelpers.$(OBJ_SUFFIX): DictionaryHelpers.cpp -DictionaryHelpers.h: $(srcdir)/dictionary_helper_gen.conf \ - event_impl_gen.conf \ - $(srcdir)/dictionary_helper_gen.py \ - $(srcdir)/codegen.py \ - $(LIBXUL_DIST)/sdk/bin/header.py \ - $(LIBXUL_DIST)/sdk/bin/xpidl.py \ - $(DEPTH)/js/src/js-confdefs.h - $(PYTHON) $(topsrcdir)/config/pythonpath.py \ - $(PLY_INCLUDE) \ - -I$(LIBXUL_DIST)/sdk/bin \ - $(srcdir)/dictionary_helper_gen.py \ - -I $(DEPTH)/dist/idl \ - --header-output DictionaryHelpers.h \ - $(srcdir)/dictionary_helper_gen.conf \ - event_impl_gen.conf +DictionaryHelpers.h: DictionaryHelpers.cpp DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen.conf \ event_impl_gen.conf \ @@ -197,6 +182,7 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen.conf \ -I$(LIBXUL_DIST)/sdk/bin \ $(srcdir)/dictionary_helper_gen.py \ -I $(DEPTH)/dist/idl \ + --header-output DictionaryHelpers.h \ --stub-output DictionaryHelpers.cpp \ --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \ $(srcdir)/dictionary_helper_gen.conf \ diff --git a/js/xpconnect/src/event_impl_gen.py b/js/xpconnect/src/event_impl_gen.py index 21edeca935d..04f42e946cd 100644 --- a/js/xpconnect/src/event_impl_gen.py +++ b/js/xpconnect/src/event_impl_gen.py @@ -357,10 +357,6 @@ if __name__ == '__main__': conf = readConfigFile(filename) - if options.header_output is not None: - outfd = open(options.header_output, 'w') - print_header_file(outfd, conf) - outfd.close() if options.stub_output is not None: make_targets.append(options.stub_output) outfd = open(options.stub_output, 'w') @@ -368,4 +364,8 @@ if __name__ == '__main__': outfd.close() if options.makedepend_output is not None: writeMakeDependOutput(options.makedepend_output) + if options.header_output is not None: + outfd = open(options.header_output, 'w') + print_header_file(outfd, conf) + outfd.close()