aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-10-05 17:37:27 +0100
committerJoão Valverde <j@v6e.pt>2017-10-18 17:19:18 +0000
commit45fbb287b42c47d9fc84c1abc9158a7d24333c79 (patch)
tree6c68de666c7cab395d50317a62129944c6dbf46b
parentc703ba52adc02c83245a5d428e6943d4a4a0f995 (diff)
autotools: Remove abi-compliance-checker code
It's been broken for over a year, needs to be modernized and as implemented it's a maintenance nightmare. Get rid of it. Ping-Bug: 13036 Change-Id: I34a6e4c28b6d3b96dd6550dd21e9cbeaf050d58f Reviewed-on: https://code.wireshark.org/review/23967 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
-rw-r--r--Makefile.am5
-rw-r--r--Makefile.am.inc10
-rw-r--r--epan/Makefile.am42
-rw-r--r--wiretap/Makefile.am24
-rw-r--r--wsutil/Makefile.am20
5 files changed, 0 insertions, 101 deletions
diff --git a/Makefile.am b/Makefile.am
index 61dcd6b..f3d1802 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -971,11 +971,6 @@ rpm-package: dist
test-programs:
cd epan && $(MAKE) $@
-dumpabi:
- $(MAKE) -C wiretap dumpabi-libwiretap
- $(MAKE) -C epan dumpabi-libwireshark
- $(MAKE) -C wsutil dumpabi-libwsutil
-
checkapi_local:
$(PERL) $(top_srcdir)/tools/checkAPIs.pl -build \
-sourcedir=$(srcdir) \
diff --git a/Makefile.am.inc b/Makefile.am.inc
index 0b84361..8561380 100644
--- a/Makefile.am.inc
+++ b/Makefile.am.inc
@@ -76,13 +76,3 @@ am__v_YACC_0 = @echo " YACC " $@;
.l.c:
$(AM_V_LEX)$(LEX) -o$@ --header-file=$(@:.c=_lex.h) $<
-
-# abi-compliance-checker descriptor
-abi_incdirs = $(subst -I,NEWLINE,$(filter -I%,$(AM_CPPFLAGS) -I$(abs_top_srcdir) -I$(abs_srcdir)))
-abi_sysdirs = $(subst -isystem,NEWLINE,$(filter -isystem%,$(AM_CPPFLAGS)))
-abi_includes = $(abi_incdirs) $(abi_sysdirs)
-abi-descriptor.xml: ../abi-descriptor.template
- $(AM_V_SED)$(SED) \
- -e 's|@INCLUDE_DIRS@|$(abi_includes)|g' \
- -e 's/ *NEWLINE/\n /g' \
- -e 's|@LIBRARY_OUTPUT_PATH@|{RELPATH}/.libs|' $< > $@
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 09f5f3b..e1a0993 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -594,48 +594,6 @@ if HAVE_DOXYGEN
(umask 022 ; $(DOXYGEN) doxygen.cfg)
endif
-# ABI compliance checker can be obtained from
-# http://ispras.linux-foundation.org/index.php/ABI_compliance_checker
-# Checked using version 1.21.12
-# TODO: fix wrong headers and select ones providing external API
-dumpabi-libwireshark: all abi-descriptor.xml
- rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz
- mkdir abi-check-headers
- cp ../config.h ../register.h abi-check-headers/
- mkdir abi-check-headers/epan
- cp *.h abi-check-headers/epan
- mkdir abi-check-headers/crypt
- cp crypt/*.h abi-check-headers/crypt
- mkdir abi-check-headers/compress
- cp compress/*.h abi-check-headers/compress
- mkdir abi-check-headers/dfilter
- cp dfilter/*.h ../tools/lemon/cppmagic.h abi-check-headers/dfilter
- mkdir abi-check-headers/dissectors
- cp dissectors/*.h abi-check-headers/dissectors
- rm \
- abi-check-headers/*/*_lex.h \
- abi-check-headers/dissectors/x11-extension-implementation.h \
- abi-check-headers/dissectors/x11-glx-render-enum.h \
- abi-check-headers/dissectors/x11-register-info.h \
- abi-check-headers/dissectors/packet-lb* \
- abi-check-headers/dissectors/packet-idmp.h
- mkdir abi-check-headers/ftypes
- cp ftypes/*.h abi-check-headers/ftypes
- mkdir abi-check-headers/wmem
- cp wmem/*.h abi-check-headers/wmem
- abi-compliance-checker -log-path abi_logs/log.txt -l libwireshark -v1 `readlink .libs/libwireshark.so | sed 's/.*\.so\.//'` \
- -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \
- cat abi_logs/log.txt
- cp -f abi_dumps/libwireshark/libwireshark_* .libs/
- cd .libs && ln -sf libwireshark_*.abi.tar.gz libwireshark.abi.tar.gz
-
-maintainer-clean-local: clean-dumpabi-libwireshark
-
-.PHONY: clean-dumpabi-libwireshark
-
-clean-dumpabi-libwireshark:
- rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz abi_logs abi-descriptor.xml
-
checkapi:
$(AM_V_GEN)$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \
-sourcedir=$(srcdir) \
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 120de8a..e083b11 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -246,30 +246,6 @@ ascend.c: $(srcdir)/ascend.y ascend_scanner_lex.h
version_info.c: $(top_srcdir)/version_info.c
$(AM_V_LN_S)$(LN_S) $<
-# ABI compliance checker can be obtained from
-# http://ispras.linux-foundation.org/index.php/ABI_compliance_checker
-# Checked using version 1.21.12
-#
-# (f)lex generated headers are not part of API and may not include
-# all needed headers for used types
-dumpabi-libwiretap: all abi-descriptor.xml
- rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz
- mkdir abi-check-headers
- cp *.h ../ws_symbol_export.h abi-check-headers/
- rm abi-check-headers/*_lex.h abi-check-headers/ascend.h
- abi-compliance-checker -log-path abi_logs/log.txt -l libwiretap -v1 `readlink .libs/libwiretap.so | sed 's/.*\.so\.//'` \
- -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \
- cat abi_logs/log.txt
- cp -f abi_dumps/libwiretap/libwiretap_* .libs/
- cd .libs && ln -sf libwiretap_*.abi.tar.gz libwiretap.abi.tar.gz
-
-maintainer-clean-local: clean-dumpabi-libwiretap
-
-.PHONY: clean-dumpabi-libwiretap
-
-clean-dumpabi-libwiretap:
- rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz abi_logs abi-descriptor.xml
-
checkapi:
## 'abort' checking disabled for now pending resolution of existing use of g_assert & g_error
## $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput \
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index a0fcb5c..37a278a 100644
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -213,26 +213,6 @@ CLEANFILES = \
libwsutil.la \
*~
-# ABI compliance checker can be obtained from
-# http://ispras.linux-foundation.org/index.php/ABI_compliance_checker
-# Checked using version 1.21.12
-dumpabi-libwsutil: all abi-descriptor.xml
- rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz
- mkdir abi-check-headers
- cp ../config.h ../ws_symbol_export.h $(libwsutil_abi_INCLUDES) abi-check-headers/
- abi-compliance-checker -log-path abi_logs/log.txt -l libwsutil -v1 `readlink .libs/libwsutil.so | sed 's/.*\.so\.//'` \
- -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \
- cat abi_logs/log.txt
- cp -f abi_dumps/libwsutil/libwsutil_* .libs/
- cd .libs && ln -sf libwsutil_*.abi.tar.gz libwsutil.abi.tar.gz
-
-maintainer-clean-local: clean-dumpabi-libwsutil
-
-.PHONY: clean-dumpabi-libwsutil
-
-clean-dumpabi-libwsutil:
- rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz abi_logs abi-descriptor.xml
-
checkapi:
$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \
-sourcedir=$(srcdir) \