From b4ca4d9a11928a507b6a6ddc27d306f7ebb165a8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 10 Nov 2021 19:46:04 +0100 Subject: [PATCH] remove unused ebusfeed --- make_debian.sh | 1 - src/tools/CMakeLists.txt | 7 ------- src/tools/Makefile.am | 9 --------- test_coverage.sh | 9 --------- 4 files changed, 26 deletions(-) diff --git a/make_debian.sh b/make_debian.sh index 50e467b8..a9dad295 100755 --- a/make_debian.sh +++ b/make_debian.sh @@ -91,7 +91,6 @@ echo " pack" echo "*************" echo mkdir -p $RELEASE/DEBIAN $RELEASE/etc/default $RELEASE/etc/logrotate.d || exit 1 -rm $RELEASE/usr/bin/ebusfeed mkdir -p $RELEASE/lib/systemd/system || exit 1 cp contrib/debian/systemd/ebusd.service $RELEASE/lib/systemd/system/ebusd.service || exit 1 mkdir -p $RELEASE/etc/init.d || exit 1 diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 27f5f0a4..f24b1f2b 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -1,20 +1,13 @@ set(ebusctl_SOURCES ebusctl.cpp) -set(ebusfeed_SOURCES ebusfeed.cpp) set(ebuspicloader_SOURCES ebuspicloader.cpp intelhex/intelhexclass.cpp) -if(HAVE_CONTRIB) - set(ebusfeed_LIBS ${ebusfeed_LIBS} ebuscontrib) -endif(HAVE_CONTRIB) - include_directories(../lib/ebus) include_directories(../lib/utils) include_directories(intelhex) add_executable(ebusctl ${ebusctl_SOURCES}) -add_executable(ebusfeed ${ebusfeed_SOURCES}) add_executable(ebuspicloader ${ebuspicloader_SOURCES}) target_link_libraries(ebusctl utils ebus ${LIB_ARGP} ${ebusctl_LIBS}) -target_link_libraries(ebusfeed ebus ${LIB_ARGP} ${ebusfeed_LIBS}) target_link_libraries(ebuspicloader ${LIB_ARGP}) install(TARGETS ebusctl ebuspicloader EXPORT ebusd DESTINATION usr/bin) diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index cd095d2a..49d31551 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -2,22 +2,13 @@ AM_CXXFLAGS = -I$(top_srcdir)/src \ -isystem$(top_srcdir) bin_PROGRAMS = ebusctl \ - ebusfeed \ ebuspicloader ebusctl_SOURCES = ebusctl.cpp ebusctl_LDADD = ../lib/utils/libutils.a -ebusfeed_SOURCES = ebusfeed.cpp -ebusfeed_LDADD = ../lib/utils/libutils.a \ - ../lib/ebus/libebus.a - ebuspicloader_SOURCES = ebuspicloader.cpp intelhex/intelhexclass.cpp -if CONTRIB -ebusfeed_LDADD += ../lib/ebus/contrib/libebuscontrib.a -endif - distclean-local: -rm -f Makefile.in -rm -rf .libs diff --git a/test_coverage.sh b/test_coverage.sh index 74a13521..8f25bc19 100755 --- a/test_coverage.sh +++ b/test_coverage.sh @@ -63,15 +63,6 @@ EOF ./src/ebusd/ebusd -c contrib/etc/ebusd --checkconfig >/dev/null rm -f contrib/etc/ebusd/bad.csv echo > dump -./src/tools/ebusfeed -d tcp:127.0.0.1:8876 -t 10000 dump >/dev/null 2>/dev/null -./src/tools/ebusfeed -d tcp:127.0.0.1:99999 dump >/dev/null 2>/dev/null -./src/tools/ebusfeed -d udp:127.0.0.1:8876 -t 10000 dump >/dev/null 2>/dev/null -./src/tools/ebusfeed -d udp:127.0.0.1:8876 -t 10000 nonexistdump >/dev/null 2>/dev/null -./src/tools/ebusfeed -d "" >/dev/null 2>/dev/null -./src/tools/ebusfeed -t 1 >/dev/null 2>/dev/null -./src/tools/ebusfeed "" >/dev/null 2>/dev/null -./src/tools/ebusfeed 1 2 >/dev/null 2>/dev/null -./src/tools/ebusfeed -x >/dev/null 2>/dev/null ./src/tools/ebusctl -s testserver -p 100000 >/dev/null 2>/dev/null ./src/tools/ebusctl -s "" >/dev/null 2>/dev/null ./src/tools/ebusctl -p "" >/dev/null 2>/dev/null