Skip to content
Snippets Groups Projects
Commit e47c5336 authored by Wayne Lewis's avatar Wayne Lewis
Browse files

Add extra variable to store original version number

parent a1323df4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
configure/modules/CONFIG
+ 1
− 0
View file @ e47c5336
# -*- mode: Makefile;-*- # -*- mode: Makefile;-*-
# Update the module version (for numeric versions) with a build number of 0 if none is specified # Update the module version (for numeric versions) with a build number of 0 if none is specified
E3_MODULE_VERSION_ORIG:=$(E3_MODULE_VERSION)
E3_MODULE_VERSION:=$(E3_MODULE_VERSION)$(shell [[ "$(E3_MODULE_VERSION)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$$ ]] && echo +0) E3_MODULE_VERSION:=$(E3_MODULE_VERSION)$(shell [[ "$(E3_MODULE_VERSION)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$$ ]] && echo +0)
include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION
......
configure/modules/DEFINES_FT
+ 1
− 1
View file @ e47c5336
...@@ -15,7 +15,7 @@ git submodule update --remote --merge $@/ ...@@ -15,7 +15,7 @@ git submodule update --remote --merge $@/
endef endef
define patch_site define patch_site
patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION)-*.p0.patch 2> /dev/null); \ patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION_ORIG)-*.p0.patch 2> /dev/null); \
if [ -n "$$patches" ]; then \ if [ -n "$$patches" ]; then \
for i in $$patches; do \ for i in $$patches; do \
printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \ printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \
......
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