Skip to content
Snippets Groups Projects
Commit 64b67f73 authored by Simon Rose's avatar Simon Rose
Browse files

E3-894: Some further removal of FETCH_BUILD_NUMBER

parent 8601a15d
No related branches found
No related tags found
1 merge request!95E3-894: Fix issue where non-existent versions would cause the build to hang
Pipeline #117595 passed with warnings
Stage: check
    Stage: build
      Stage: test
        Hide whitespace changes
        Inline Side-by-side
        require-ess/tools/driver.makefile
        + 2
        − 2
        View file @ 64b67f73
        ...@@ -457,7 +457,7 @@ INSTALL_INCLUDES = ...@@ -457,7 +457,7 @@ INSTALL_INCLUDES =
        # shell script build_number.sh included with require. # shell script build_number.sh included with require.
        define ADD_INCLUDES_TEMPLATE define ADD_INCLUDES_TEMPLATE
        INSTALL_INCLUDES += $$(patsubst %,-I${2}/$(1)/%/include,$$(call FETCH_BUILD_NUMBER,$(2),$(1))) INSTALL_INCLUDES += $$(patsubst %,-I${2}/${1}/%/include,$${${1}_VERSION})
        endef endef
        $(foreach m,$(filter-out $(PRJ),$(notdir $(wildcard ${E3_SITEMODS_PATH}/*))),$(eval $(call ADD_INCLUDES_TEMPLATE,$m,$(E3_SITEMODS_PATH)))) $(foreach m,$(filter-out $(PRJ),$(notdir $(wildcard ${E3_SITEMODS_PATH}/*))),$(eval $(call ADD_INCLUDES_TEMPLATE,$m,$(E3_SITEMODS_PATH))))
        $(foreach m,$(filter-out $(PRJ),$(notdir $(wildcard ${EPICS_MODULES}/*))) ,$(eval $(call ADD_INCLUDES_TEMPLATE,$m,$(EPICS_MODULES)))) $(foreach m,$(filter-out $(PRJ),$(notdir $(wildcard ${EPICS_MODULES}/*))) ,$(eval $(call ADD_INCLUDES_TEMPLATE,$m,$(EPICS_MODULES))))
        ...@@ -522,7 +522,7 @@ DBDFILES += $(patsubst %.stt,%_snl.dbd,$(notdir $(filter %.stt,${SRCS}))) ...@@ -522,7 +522,7 @@ DBDFILES += $(patsubst %.stt,%_snl.dbd,$(notdir $(filter %.stt,${SRCS})))
        DBDFILES += $(patsubst %.gt,%.dbd,$(notdir $(filter %.gt,${SRCS}))) DBDFILES += $(patsubst %.gt,%.dbd,$(notdir $(filter %.gt,${SRCS})))
        # snc location # snc location
        SNCALL=$(shell ls -dv $(E3_SITEMODS_PATH)/sequencer/$(call FETCH_BUILD_NUMBER,$(E3_SITEMODS_PATH),sequencer)/bin/$(EPICS_HOST_ARCH) 2> /dev/null) SNCALL=$(shell ls -dv $(E3_SITEMODS_PATH)/sequencer/$(sequencer_VERSION)/bin/$(EPICS_HOST_ARCH) 2> /dev/null))
        SNC=$(lastword $(SNCALL))/snc SNC=$(lastword $(SNCALL))/snc
        ifneq (,$(strip $(VLIBS))) ifneq (,$(strip $(VLIBS)))
        ......
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment