From cf9eb75a9a2928d458f7681dccb9343aba48108c Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 7 Dec 2018 15:53:38 +0100 Subject: [PATCH] fix problem with dependenies on test versions with dots in the name --- App/tools/driver.makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile index 48ba630..c450c94 100644 --- a/App/tools/driver.makefile +++ b/App/tools/driver.makefile @@ -1069,10 +1069,10 @@ ${DEPFILE}: ${LIBOBJS} $(USERMAKEFILE) @echo "Collecting dependencies" $(RM) $@ @echo "# Generated file. Do not edit." > $@ -# Check dependencies on ${REQ} and other module headers. - $(foreach m,$(sort ${REQ} $(shell cat *.d 2>/dev/null | sed 's/ /\n/g' | sed -n 's%${EPICS_MODULES}/*\([^/]*\)/.*%\1%p' | sort -u)),echo "$m $(or $(if $(wildcard ${EPICS_MODULES}/$m/use_exact_version),${$m_VERSION},$(basename ${$m_VERSION})),$(and $(wildcard ${EPICS_MODULES}/$m),$(error REQUIRED module $m has no numbered version. Set $m_VERSION)),$(warning REQUIRED module $m not found for ${T_A}.))" >> $@;) +# Check dependencies on ${REQ} and other module headers. + $(foreach m,$(sort ${REQ} $(shell cat *.d 2>/dev/null | sed 's/ /\n/g' | sed -n 's%${EPICS_MODULES}/*\([^/]*\)/.*%\1%p' | sort -u)),echo "$m $(or $(if $(strip $(wildcard ${EPICS_MODULES}/$m/use_exact_version)$(shell echo ${$m_VERSION}|sed 'y/0123456789./ /')),${$m_VERSION},$(basename ${$m_VERSION})),$(and $(wildcard ${EPICS_MODULES}/$m),$(error REQUIRED module $m has no numbered version. Set $m_VERSION)),$(warning REQUIRED module $m not found for ${T_A}.))" >> $@;) ifdef OLD_INCLUDE - # Check dependencies on old style driver headers. +# Check dependencies on old style driver headers. ${MAKEHOME}/getPrerequisites.tcl -dep ${OLD_INCLUDE} | grep -vw -e ${PRJ} -e ^$$ >> $@ && echo "Warning: dependency on old style driver"; true; endif