diff options
author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-04-04 20:46:49 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-04-04 20:46:49 +0000 |
commit | 75c3c92f197406d14eb213e30a07955928517399 (patch) | |
tree | 6ec908c62bfc2115e32c3e747e90ad14f3552744 | |
parent | 02e0b847f15c5045bbf15b13d555c619fc8b36c9 (diff) |
Add a "-build" argument to checkAPIs.pl. Use that argument when building
from makefiles (and thus from the buildbot).
The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.
As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.
svn path=/trunk/; revision=41943
68 files changed, 80 insertions, 76 deletions
diff --git a/Makefile.am b/Makefile.am index cb64112c2d..aa805123ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1029,7 +1029,7 @@ dumpabi: $(MAKE) -C wsutil dumpabi checkapi_local: - $(PERL) tools/checkAPIs.pl \ + $(PERL) tools/checkAPIs.pl -build \ $(TSHARK_TAP_SRC) \ $(wireshark_SOURCES) # $(EXTRA_wireshark_SOURCES) diff --git a/Makefile.nmake b/Makefile.nmake index 371092770e..ad93477b2c 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1182,7 +1182,7 @@ install-all: install-generated-files cd .. checkapi_local: - $(PERL) tools/checkAPIs.pl \ + $(PERL) tools/checkAPIs.pl -build \ $(wireshark_SOURCES) \ $(TSHARK_TAP_SRC) \ # $(EXTRA_wireshark_SOURCES) diff --git a/asn1/camel/Makefile.nmake b/asn1/camel/Makefile.nmake index 6aa21c4986..031542845c 100644 --- a/asn1/camel/Makefile.nmake +++ b/asn1/camel/Makefile.nmake @@ -28,6 +28,6 @@ include Makefile.common include ../Makefile.inc.nmake checkapi: - $(PERL) ../../tools/checkAPIs.pl \ + $(PERL) ../../tools/checkAPIs.pl -build \ $(PROTOCOL_NAME).cnf \ packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file diff --git a/asn1/h225/Makefile.nmake b/asn1/h225/Makefile.nmake index 6aa21c4986..031542845c 100644 --- a/asn1/h225/Makefile.nmake +++ b/asn1/h225/Makefile.nmake @@ -28,6 +28,6 @@ include Makefile.common include ../Makefile.inc.nmake checkapi: - $(PERL) ../../tools/checkAPIs.pl \ + $(PERL) ../../tools/checkAPIs.pl -build \ $(PROTOCOL_NAME).cnf \ packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file diff --git a/asn1/h235/Makefile.nmake b/asn1/h235/Makefile.nmake index 6aa21c4986..031542845c 100644 --- a/asn1/h235/Makefile.nmake +++ b/asn1/h235/Makefile.nmake @@ -28,6 +28,6 @@ include Makefile.common include ../Makefile.inc.nmake checkapi: - $(PERL) ../../tools/checkAPIs.pl \ + $(PERL) ../../tools/checkAPIs.pl -build \ $(PROTOCOL_NAME).cnf \ packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file diff --git a/asn1/h450/Makefile.nmake b/asn1/h450/Makefile.nmake index 7a5709b5e0..73f481fcd8 100644 --- a/asn1/h450/Makefile.nmake +++ b/asn1/h450/Makefile.nmake @@ -28,7 +28,7 @@ include Makefile.common include ../Makefile.inc.nmake checkapi: - $(PERL) ../../tools/checkAPIs.pl \ + $(PERL) ../../tools/checkAPIs.pl -build \ $(PROTOCOL_NAME).cnf \ packet-$(PROTOCOL_NAME)-template.c diff --git a/asn1/mpeg-pes/Makefile.nmake b/asn1/mpeg-pes/Makefile.nmake index 6aa21c4986..031542845c 100644 --- a/asn1/mpeg-pes/Makefile.nmake +++ b/asn1/mpeg-pes/Makefile.nmake @@ -28,6 +28,6 @@ include Makefile.common include ../Makefile.inc.nmake checkapi: - $(PERL) ../../tools/checkAPIs.pl \ + $(PERL) ../../tools/checkAPIs.pl -build \ $(PROTOCOL_NAME).cnf \ packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file diff --git a/asn1/q932/Makefile.nmake b/asn1/q932/Makefile.nmake index 6aa21c4986..031542845c 100644 --- a/asn1/q932/Makefile.nmake +++ b/asn1/q932/Makefile.nmake @@ -28,6 +28,6 @@ include Makefile.common include ../Makefile.inc.nmake checkapi: - $(PERL) ../../tools/checkAPIs.pl \ + $(PERL) ../../tools/checkAPIs.pl -build \ $(PROTOCOL_NAME).cnf \ packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file diff --git a/asn1/qsig/Makefile.nmake b/asn1/qsig/Makefile.nmake index 6aa21c4986..031542845c 100644 --- a/asn1/qsig/Makefile.nmake +++ b/asn1/qsig/Makefile.nmake @@ -28,6 +28,6 @@ include Makefile.common include ../Makefile.inc.nmake checkapi: - $(PERL) ../../tools/checkAPIs.pl \ + $(PERL) ../../tools/checkAPIs.pl -build \ $(PROTOCOL_NAME).cnf \ packet-$(PROTOCOL_NAME)-template.c
\ No newline at end of file diff --git a/codecs/Makefile.am b/codecs/Makefile.am index 0c66ca6a91..8a4de6c8f0 100644 --- a/codecs/Makefile.am +++ b/codecs/Makefile.am @@ -45,6 +45,6 @@ EXTRA_DIST = \ CMakeLists.txt checkapi: - $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \ + $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \ G711a/G711adecode.c \ G711u/G711udecode.c diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake index 880b39ed4d..3d76ded410 100644 --- a/codecs/Makefile.nmake +++ b/codecs/Makefile.nmake @@ -36,6 +36,6 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \ + $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \ G711a/G711adecode.c \ G711u/G711udecode.c diff --git a/epan/Makefile.am b/epan/Makefile.am index af858a483f..9dd0b16a65 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -327,4 +327,4 @@ dumpabi: all abi-descriptor.xml cd .libs; ln -sf libwireshark_*.abi.tar.gz libwireshark.abi.tar.gz checkapi: - $(PERL) ../tools/checkAPIs.pl -g termoutput $(LIBWIRESHARK_SRC) + $(PERL) ../tools/checkAPIs.pl -g termoutput -build $(LIBWIRESHARK_SRC) diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index bb924501b1..c0c2d2a696 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -333,4 +333,4 @@ dtd_grammar.c: $(LEMON)\lemon.exe $(LEMON)\lempar.c dtd_grammar.lemon $(LEMON)\lemon t=$(LEMON)\lempar.c dtd_grammar.lemon checkapi: - $(PERL) ../tools/checkAPIs.pl -g termoutput $(LIBWIRESHARK_SRC) + $(PERL) ../tools/checkAPIs.pl -g termoutput -build $(LIBWIRESHARK_SRC) diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am index 8db3475004..4d29a4a5ca 100644 --- a/epan/crypt/Makefile.am +++ b/epan/crypt/Makefile.am @@ -50,5 +50,5 @@ EXTRA_DIST = \ Makefile.nmake checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ $(LIBAIRPDCAP_SRC) diff --git a/epan/crypt/Makefile.nmake b/epan/crypt/Makefile.nmake index 381acac43b..701a41c3b1 100644 --- a/epan/crypt/Makefile.nmake +++ b/epan/crypt/Makefile.nmake @@ -27,5 +27,5 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ $(LIBAIRPDCAP_SRC) diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index fa83f5d510..f9327a425b 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -81,6 +81,6 @@ grammar.c : $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/gramma (rm -f grammar.c grammar.h ; false) checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ $(GENERATOR_FILES) \ $(NONGENERATED_C_FILES) diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake index 97b8ba6739..47adb3cb39 100644 --- a/epan/dfilter/Makefile.nmake +++ b/epan/dfilter/Makefile.nmake @@ -67,6 +67,6 @@ $(LEMON)\lemon.exe: cd ../epan/dfilter checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ $(GENERATOR_FILES) \ $(NONGENERATED_C_FILES) diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am index 0d5a39434b..10f2415103 100644 --- a/epan/dissectors/Makefile.am +++ b/epan/dissectors/Makefile.am @@ -143,6 +143,6 @@ MAINTAINERCLEANFILES = \ Makefile.in checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ $(ALL_DISSECTORS_SRC) $(DISSECTOR_INCLUDES) \ packet-dcerpc-nt.c diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake index 3e6a1d9c2a..a9299422bd 100644 --- a/epan/dissectors/Makefile.nmake +++ b/epan/dissectors/Makefile.nmake @@ -115,6 +115,6 @@ maintainer-clean: distclean rm -f $(GENERATED_FILES) checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ $(ALL_DISSECTORS_SRC) $(DISSECTOR_INCLUDES) \ packet-dcerpc-nt.c diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am index ffb0cf4b7a..ca2f40e56e 100644 --- a/epan/ftypes/Makefile.am +++ b/epan/ftypes/Makefile.am @@ -47,5 +47,5 @@ EXTRA_DIST = \ Makefile.nmake checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ $(NONGENERATED_C_FILES) diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake index 647d8f8c23..4506b9a2ed 100644 --- a/epan/ftypes/Makefile.nmake +++ b/epan/ftypes/Makefile.nmake @@ -29,5 +29,5 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ $(NONGENERATED_C_FILES) diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am index 954b76e2b3..583c5c0f9b 100644 --- a/epan/wslua/Makefile.am +++ b/epan/wslua/Makefile.am @@ -116,7 +116,7 @@ init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wt $(PERL) $(srcdir)/make-init-lua.pl $(top_srcdir) $(srcdir)/template-init.lua > init.lua checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ init_wslua.c \ register_wslua.c \ taps_wslua.c \ diff --git a/epan/wslua/Makefile.nmake b/epan/wslua/Makefile.nmake index b7cf9de532..c5c13be985 100644 --- a/epan/wslua/Makefile.nmake +++ b/epan/wslua/Makefile.nmake @@ -84,7 +84,7 @@ init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wt $(PERL) make-init-lua.pl "../.." template-init.lua > init.lua checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ $(MODULES) \ init_wslua.c \ register_wslua.c \ diff --git a/epan/wspython/Makefile.nmake b/epan/wspython/Makefile.nmake index a50ec26b38..0f837a759c 100644 --- a/epan/wspython/Makefile.nmake +++ b/epan/wspython/Makefile.nmake @@ -27,5 +27,5 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ $(LIBWSPYTHON_OBJECTS) diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am index acaa8a29f0..69b88a23db 100644 --- a/plugins/asn1/Makefile.am +++ b/plugins/asn1/Makefile.am @@ -124,4 +124,4 @@ EXTRA_DIST = \ CMakeLists.txt checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake index 756dfdc697..19371224f5 100644 --- a/plugins/asn1/Makefile.nmake +++ b/plugins/asn1/Makefile.nmake @@ -102,4 +102,4 @@ maintainer-clean: distclean checkapi: # TODO: Fix api's :) -# $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) +# $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am index 9c5a90ccf2..8deaea68b9 100644 --- a/plugins/docsis/Makefile.am +++ b/plugins/docsis/Makefile.am @@ -127,4 +127,4 @@ EXTRA_DIST = \ CMakeLists.txt checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake index 022ed92102..b415b1e7a1 100644 --- a/plugins/docsis/Makefile.nmake +++ b/plugins/docsis/Makefile.nmake @@ -101,4 +101,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/easy_codec/Makefile.nmake b/plugins/easy_codec/Makefile.nmake index cb2767b4d6..374c642f37 100644 --- a/plugins/easy_codec/Makefile.nmake +++ b/plugins/easy_codec/Makefile.nmake @@ -65,4 +65,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index f34cc49f43..a9185071d1 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -126,4 +126,4 @@ EXTRA_DIST = \ CMakeLists.txt checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/ethercat/Makefile.nmake b/plugins/ethercat/Makefile.nmake index 694be2366f..a6527a6b72 100644 --- a/plugins/ethercat/Makefile.nmake +++ b/plugins/ethercat/Makefile.nmake @@ -101,4 +101,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/giop/Makefile.am b/plugins/giop/Makefile.am index 7a7c9d456a..beff767cc3 100644 --- a/plugins/giop/Makefile.am +++ b/plugins/giop/Makefile.am @@ -67,7 +67,7 @@ EXTRA_DIST = \ CMakeLists.txt checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ packet-cosnaming.c \ packet-coseventcomm.c \ packet-tango.c \ diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake index c20a919ad9..b921cd105b 100644 --- a/plugins/giop/Makefile.nmake +++ b/plugins/giop/Makefile.nmake @@ -52,7 +52,7 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ packet-cosnaming.c \ packet-coseventcomm.c \ packet-tango.c \ diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am index b04438c0af..0ea3e7f5e6 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/gryphon/Makefile.am @@ -128,4 +128,4 @@ EXTRA_DIST = \ CMakeLists.txt checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake index 022ed92102..b415b1e7a1 100644 --- a/plugins/gryphon/Makefile.nmake +++ b/plugins/gryphon/Makefile.nmake @@ -101,4 +101,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am index 4da6359188..5539930969 100644 --- a/plugins/irda/Makefile.am +++ b/plugins/irda/Makefile.am @@ -126,4 +126,4 @@ EXTRA_DIST = \ CMakeLists.txt checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake index 022ed92102..b415b1e7a1 100644 --- a/plugins/irda/Makefile.nmake +++ b/plugins/irda/Makefile.nmake @@ -101,4 +101,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am index cd7d7bec1c..887bb07f81 100644 --- a/plugins/m2m/Makefile.am +++ b/plugins/m2m/Makefile.am @@ -126,4 +126,4 @@ EXTRA_DIST = \ CMakeLists.txt checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/m2m/Makefile.nmake b/plugins/m2m/Makefile.nmake index c3694400a0..7f294db023 100644 --- a/plugins/m2m/Makefile.nmake +++ b/plugins/m2m/Makefile.nmake @@ -101,4 +101,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index 92ee3edb98..5a4c4dcf33 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -146,4 +146,4 @@ mate_grammar.c : mate_grammar.lemon mate.h mate_util.h $(LEMON)/lemon$(EXEEXT) (rm -f grammar.c grammar.h ; false) checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake index 5510bc57d2..6de4d76314 100644 --- a/plugins/mate/Makefile.nmake +++ b/plugins/mate/Makefile.nmake @@ -134,4 +134,4 @@ $(LEMON)\lemon.exe: cd ../plugins/mate checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am index 0dd9d18ac3..a57dea798a 100644 --- a/plugins/opcua/Makefile.am +++ b/plugins/opcua/Makefile.am @@ -128,4 +128,4 @@ EXTRA_DIST = \ CMakeLists.txt checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/opcua/Makefile.nmake b/plugins/opcua/Makefile.nmake index 022ed92102..b415b1e7a1 100644 --- a/plugins/opcua/Makefile.nmake +++ b/plugins/opcua/Makefile.nmake @@ -101,4 +101,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am index 1c746510c8..9b881272d3 100644 --- a/plugins/profinet/Makefile.am +++ b/plugins/profinet/Makefile.am @@ -126,4 +126,4 @@ EXTRA_DIST = \ CMakeLists.txt checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake index 022ed92102..b415b1e7a1 100644 --- a/plugins/profinet/Makefile.nmake +++ b/plugins/profinet/Makefile.nmake @@ -101,4 +101,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am index 7a1d6aea60..5b7c3e0de3 100644 --- a/plugins/stats_tree/Makefile.am +++ b/plugins/stats_tree/Makefile.am @@ -58,4 +58,4 @@ EXTRA_DIST = \ CMakeLists.txt checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(TAP_SRC) $(TAP_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(TAP_SRC) $(TAP_INCLUDES) diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake index 516dc93c25..a600a68a86 100644 --- a/plugins/stats_tree/Makefile.nmake +++ b/plugins/stats_tree/Makefile.nmake @@ -55,4 +55,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(TAP_SRC) $(TAP_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(TAP_SRC) $(TAP_INCLUDES) diff --git a/plugins/tpg/Makefile.am b/plugins/tpg/Makefile.am index 8da8254974..0d492c6893 100644 --- a/plugins/tpg/Makefile.am +++ b/plugins/tpg/Makefile.am @@ -76,4 +76,4 @@ http-parser.c: http.tpg $(TPG)/tpg.pl $(TPG)/TPG.pm $(PERL) -I$(TPG) $(TPG)/tpg.pl http.tpg checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake index 1cec105221..22c9334564 100644 --- a/plugins/tpg/Makefile.nmake +++ b/plugins/tpg/Makefile.nmake @@ -66,4 +66,4 @@ $(LEMON)\lemon.exe: cd ../plugins/mate checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am index 3b513569ef..5ee3b9b5b3 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/unistim/Makefile.am @@ -128,4 +128,4 @@ EXTRA_DIST = \ checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/unistim/Makefile.nmake b/plugins/unistim/Makefile.nmake index 022ed92102..b415b1e7a1 100644 --- a/plugins/unistim/Makefile.nmake +++ b/plugins/unistim/Makefile.nmake @@ -101,4 +101,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am index 393966c85e..4e037493c2 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/wimax/Makefile.am @@ -126,7 +126,7 @@ EXTRA_DIST = \ CMakeLists.txt checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput \ + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ $(DISSECTOR_SRC) \ $(DISSECTOR_INCLUDES) \ $(DISSECTOR_SUPPORT_SRC) diff --git a/plugins/wimax/Makefile.nmake b/plugins/wimax/Makefile.nmake index 59b1daaf25..e3aab04d53 100644 --- a/plugins/wimax/Makefile.nmake +++ b/plugins/wimax/Makefile.nmake @@ -101,7 +101,7 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput \ + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ $(DISSECTOR_SRC) \ $(DISSECTOR_INCLUDES) \ $(DISSECTOR_SUPPORT_SRC) diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index e889806f9b..a0b75e9d1d 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -146,4 +146,4 @@ wimaxasncpdir = $(pkgdatadir)/wimaxasncp checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/wimaxasncp/Makefile.nmake b/plugins/wimaxasncp/Makefile.nmake index 36ea8784eb..6dd709c805 100644 --- a/plugins/wimaxasncp/Makefile.nmake +++ b/plugins/wimaxasncp/Makefile.nmake @@ -114,4 +114,4 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) + $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/tools/checkAPIs.pl b/tools/checkAPIs.pl index a31f3d5be6..536fc910c5 100755 --- a/tools/checkAPIs.pl +++ b/tools/checkAPIs.pl @@ -1324,7 +1324,7 @@ sub checkAddTextCalls($$) $okay_add_text_count++; } # Then count how many proto_tree_add_*() calls there are - while (${$fileContentsRef} =~ m/ \W proto_tree_add_[a-z]+ \W* \( /gox) { + while (${$fileContentsRef} =~ m/ \W proto_tree_add_[a-z0-9]+ \W* \( /gox) { $add_xxx_count++; } @@ -1633,6 +1633,7 @@ my $check_value_string_array_null_termination = 1; # default: enabled my $machine_readable_output = 0; # default: disabled my $check_hf = 1; # default: enabled my $debug_flag = 0; +my $buildbot_flag = 0; my $result = GetOptions( 'group=s' => \@apiGroups, @@ -1640,6 +1641,7 @@ my $result = GetOptions( 'check-value-string-array-null-termination!' => \$check_value_string_array_null_termination, 'Machine-readable' => \$machine_readable_output, 'nohf' => \$check_hf, + 'build' => \$buildbot_flag, 'debug' => \$debug_flag ); if (!$result) { @@ -1730,7 +1732,9 @@ while ($_ = $ARGV[0]) # print STDERR "Found APIs with embedded tvb_get_ptr() calls in ".$filename.": ".join(',', @foundAPIs)."\n" #} - #checkAddTextCalls(\$fileContents, $filename); + if (! $buildbot_flag) { + checkAddTextCalls(\$fileContents, $filename); + } # Brute force check for value_string arrays which are missing {0, NULL} as the final (terminating) array entry if ($check_value_string_array_null_termination) { diff --git a/ui/Makefile.am b/ui/Makefile.am index 95044ab1e0..0c35557921 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -62,11 +62,11 @@ endif # HAVE_DOXYGEN checkapi: checkapi-base checkapi-todo checkapi-base: - $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk \ + $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk -build \ $(WIRESHARK_UI_SRC) checkapi-todo: - $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo \ + $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ $(WIRESHARK_UI_SRC) EXTRA_DIST = \ diff --git a/ui/Makefile.nmake b/ui/Makefile.nmake index fd2ab05f71..e4e0caa9c3 100644 --- a/ui/Makefile.nmake +++ b/ui/Makefile.nmake @@ -72,9 +72,9 @@ doxygen: doxygen.cfg doxygen-run doxygen.chm checkapi: checkapi-base checkapi-todo checkapi-base: - $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk \ + $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk -build \ $(WIRESHARK_UI_SRC) checkapi-todo: - $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo \ + $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ $(WIRESHARK_UI_SRC) diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am index 407aa90d0c..ed525ef4e8 100644 --- a/ui/cli/Makefile.am +++ b/ui/cli/Makefile.am @@ -79,11 +79,11 @@ endif # HAVE_DOXYGEN checkapi: checkapi-base checkapi-todo checkapi-base: - $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk \ + $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk -build \ $(TSHARK_TAP_SRC) checkapi-todo: - $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo \ + $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ $(TSHARK_TAP_SRC) EXTRA_DIST = \ diff --git a/ui/cli/Makefile.nmake b/ui/cli/Makefile.nmake index 12d81b079e..f87766fb76 100644 --- a/ui/cli/Makefile.nmake +++ b/ui/cli/Makefile.nmake @@ -65,9 +65,9 @@ maintainer-clean: distclean checkapi: checkapi-base checkapi-todo checkapi-base: - $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk \ + $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk -build \ $(TSHARK_TAP_SRC) checkapi-todo: - $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo \ + $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ $(TSHARK_TAP_SRC) diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am index a7b6316d84..4294a8f860 100644 --- a/ui/gtk/Makefile.am +++ b/ui/gtk/Makefile.am @@ -92,12 +92,12 @@ endif # HAVE_DOXYGEN checkapi: checkapi-base checkapi-todo checkapi-base: - $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk \ + $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk -build \ $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \ capture_if_details_dlg_win32.c checkapi-todo: - $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo \ + $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ $(WIRESHARK_GTK_SRC) \ $(WIRESHARK_TAP_SRC) \ capture_if_details_dlg_win32.c diff --git a/ui/gtk/Makefile.nmake b/ui/gtk/Makefile.nmake index 89c6ccdad2..36fbb8f8b1 100644 --- a/ui/gtk/Makefile.nmake +++ b/ui/gtk/Makefile.nmake @@ -178,11 +178,11 @@ doxygen: doxygen.cfg doxygen-run doxygen.chm checkapi: checkapi-base checkapi-todo checkapi-base: - $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk \ + $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk -build \ $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \ $(WIRESHARK_TAP_SRC) checkapi-todo: - $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo \ + $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \ $(WIRESHARK_TAP_SRC) diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index a47e37f635..c143eaacca 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -89,13 +89,13 @@ endif # HAVE_DOXYGEN checkapi: checkapi-base checkapi-todo checkapi-base: - $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk \ + $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk -build \ $(WIRESHARK_GTK_SRC) \ $(WIRESHARK_TAP_SRC) \ capture_if_details_dlg_win32.c checkapi-todo: - $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo \ + $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ $(WIRESHARK_GTK_SRC) \ $(WIRESHARK_TAP_SRC) \ capture_if_details_dlg_win32.c diff --git a/ui/win32/Makefile.nmake b/ui/win32/Makefile.nmake index 6865a2aa8a..55809d6a78 100644 --- a/ui/win32/Makefile.nmake +++ b/ui/win32/Makefile.nmake @@ -36,5 +36,5 @@ distclean: clean maintainer-clean: distclean checkapi: - $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk \ + $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk -build \ $(WIRESHARK_WIN32_SRC) diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 1dabf1ee1a..0ee92af674 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -102,4 +102,4 @@ dumpabi: all abi-descriptor.xml checkapi: ## 'abort' checking disabled for now pending resolution of existing use of g_assert & g_error ## $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput $(NONGENERATED_C_FILES) $(GENERATOR_FILES) - $(PERL) ../tools/checkAPIs.pl -g termoutput $(NONGENERATED_C_FILES) $(GENERATOR_FILES) + $(PERL) ../tools/checkAPIs.pl -g termoutput -build $(NONGENERATED_C_FILES) $(GENERATOR_FILES) diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index ca6d4b8406..b2c9e4247b 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -78,4 +78,4 @@ maintainer-clean: distclean checkapi: ## 'abort' checking disabled for now pending resolution of existing use of g_assert & g_error ## $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput $(NONGENERATED_C_FILES) $(GENERATOR_FILES) - $(PERL) ../tools/checkAPIs.pl -g termoutput $(NONGENERATED_C_FILES) $(GENERATOR_FILES) + $(PERL) ../tools/checkAPIs.pl -g termoutput -build $(NONGENERATED_C_FILES) $(GENERATOR_FILES) diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index 4401d0b874..f7398a6348 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -138,6 +138,6 @@ dumpabi: all abi-descriptor.xml checkapi: # $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \ - $(PERL) ../tools/checkAPIs.pl -g termoutput \ + $(PERL) ../tools/checkAPIs.pl -g termoutput -build \ $(LIBWSUTIL_SRC) # file_util.c unicode-utils.c diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake index ac99984a82..7be40f6d7b 100644 --- a/wsutil/Makefile.nmake +++ b/wsutil/Makefile.nmake @@ -56,6 +56,6 @@ maintainer-clean: distclean checkapi: ## $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \ - $(PERL) ../tools/checkAPIs.pl -g termoutput \ + $(PERL) ../tools/checkAPIs.pl -g termoutput -build \ $(LIBWSUTIL_SRC) \ # file_util.c unicode-utils.c |