From 29089e507218013bc2b1bbf781c596c9acf9a3fd Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Mon, 18 Jan 2021 11:29:46 +0100
Subject: [PATCH] Removed unnecessary sed regex from dependency generator
---
configure/E3/CONFIG_E3_MAKEFILE | 5 ++++-
require-ess/tools/driver.makefile | 8 ++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/configure/E3/CONFIG_E3_MAKEFILE b/configure/E3/CONFIG_E3_MAKEFILE
index a4975b1e..e7d188b6 100644
--- a/configure/E3/CONFIG_E3_MAKEFILE
+++ b/configure/E3/CONFIG_E3_MAKEFILE
@@ -11,8 +11,11 @@ E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += PROJECT="$(E3_MODULE_NAME)"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += EPICS_MODULES="$(E3_MODULES_PATH)"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += EPICS_LOCATION="$(EPICS_BASE)"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += BUILDCLASSES="Linux"
+E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITEMODS_PATH="$(E3_SITEMODS_PATH)"
+E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITEAPPS_PATH="$(E3_SITEAPPS_PATH)"
+E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITELIBS_PATH="$(E3_SITELIBS_PATH)"
-ifeq ($(shell git status > /dev/null 2>&1 ; echo $$?),0)
+ifeq ($(shell git status > /dev/null 2>&1; echo $$?),0)
GIT_REMOTE_NAME := $(shell git remote | head -n 1)
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_DESC="$(shell git describe --tags 2> /dev/null || git rev-parse HEAD 2> /dev/null || echo 'Not a git repository')"
diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile
index 427996ee..977895d8 100644
--- a/require-ess/tools/driver.makefile
+++ b/require-ess/tools/driver.makefile
@@ -102,8 +102,7 @@ CP = cp
# This is to allow for build numbers in recognized versions. First regex is for grep, second for sed.
VERSIONGLOB = +([0-9]).+([0-9]).+([0-9])?(-+([0-9]))
-VERSIONREGEX1 = [0-9]+\.[0-9]+\.[0-9]+(-[0-9]+)?
-VERSIONREGEX2 = [0-9]+\.[0-9]+\.[0-9]+\(-[0-9]+\)\?
+VERSIONREGEX = [0-9]+\.[0-9]+\.[0-9]+(-[0-9]+)?
# Some generated file names:
VERSIONFILE = ${PRJ}_version_${LIBVERSION}.c
@@ -476,7 +475,7 @@ else
O.%:
+$(MKDIR) $@
-ifeq ($(shell echo "${LIBVERSION}" | grep -v -E "^$(VERSIONREGEX1)\$$"),)
+ifeq ($(shell echo "${LIBVERSION}" | grep -v -E "^$(VERSIONREGEX)\$$"),)
install:: build
@test ! -d ${MODULE_LOCATION}/lib/${T_A} || \
(echo -e "Error: ${MODULE_LOCATION}/lib/${T_A} already exists.\nNote: If you really want to overwrite then uninstall first."; false)
@@ -1003,11 +1002,8 @@ ${METAFILE}:
@echo "module_diffs: $(${PRJ}_GIT_STATUS)" >> $@
define DEP_PARSER
-s%$(E3_SITEMODS_PATH)/*\([^/]*\)/\($(VERSIONREGEX2)\)/.*%\1 \2%p; \
s%$(E3_SITEMODS_PATH)/*\([^/]*\)/\([^/]*\)/.*%\1 \2%p; \
-s%$(E3_SITEAPPS_PATH)/*\([^/]*\)/\($(VERSIONREGEX2)\)/.*%\1 \2%p; \
s%$(E3_SITEAPPS_PATH)/*\([^/]*\)/\([^/]*\)/.*%\1 \2%p; \
-s%$(EPICS_MODULES)/*\([^/]*\)/\($(VERSIONREGEX2)\)/.*%\1 \2%p; \
s%$(EPICS_MODULES)/*\([^/]*\)/\([^/]*\)/.*%\1 \2%p
endef
--
GitLab