From dfc4bfb8ccf23d07ec094e74d44cfd1a8d4a3f4c Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Thu, 5 Nov 2015 09:39:55 +0100
Subject: [PATCH] write only major.minor without + into dep files. Dependencies
do not rely on patch levels. Skipping + makes it easier to handle test
versions and require adds the + itself to numeric versions
---
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 ce117c17..8e9a880a 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -485,7 +485,7 @@ $(eval $(foreach m,$(filter-out %/$(PRJ),$(wildcard ${EPICS_MODULES}/*)),$(call
# manually required modules
define ADD_MANUAL_DEPENDENCIES
-$(eval $(notdir $(1))_VERSION := $(patsubst $(1)/%/R${EPICSVERSION},%,$(lastword $(shell ls -dv $(1)/*.*.*/R${EPICSVERSION} 2>/dev/null))))
+$(eval $(notdir $(1))_VERSION := $(basename $(patsubst $(1)/%/R${EPICSVERSION},%,$(lastword $(shell ls -dv $(1)/*.*.*/R${EPICSVERSION} 2>/dev/null)))))
endef
$(eval $(foreach m,${REQ},$(call ADD_MANUAL_DEPENDENCIES,${EPICS_MODULES}/$m)))
@@ -910,8 +910,8 @@ ${DEPFILE}: ${LIBOBJS} $(USERMAKEFILE)
@echo "Collecting dependencies"
$(RM) $@
@echo "# Generated file. Do not edit." > $@
- cat *.d 2>/dev/null | sed 's/ /\n/g' | sed -n 's%${EPICS_MODULES}/*\([^/]*\)/\([0-9.]*\)/.*%\1 \2+%p;s%$(EPICS_MODULES)/*\([^/]*\)/\([^/]*\)/.*%\1 \2%p'| sort -u >> $@
- $(foreach m,${REQ},echo "$m ${$m_VERSION}$(if $(filter-out $(basename ${$m_VERSION}),${$m_VERSION}),+)" >> $@;)
+ cat *.d 2>/dev/null | sed 's/ /\n/g' | sed -n 's%${EPICS_MODULES}/*\([^/]*\)/\([0-9]*\.[0-9]*\)\.[0-9]*/.*%\1 \2%p;s%$(EPICS_MODULES)/*\([^/]*\)/\([^/]*\)/.*%\1 \2%p'| sort -u >> $@
+ $(foreach m,${REQ},echo "$m ${$m_VERSION}" >> $@;)
$(BUILDRULE)
$(RM) MakefileInclude
--
GitLab