From eedd146e9fcb8952242cbb2c3373b7395e91a1ea Mon Sep 17 00:00:00 2001
From: Jeong Han Lee <jeonghan.lee@gmail.com>
Date: Thu, 11 Apr 2019 00:38:52 +0200
Subject: [PATCH] rename local to cell, support .local files in order to
override
---
configure/modules/CONFIG | 6 +-----
configure/modules/CONFIG_CELL | 15 +++++++++++++++
configure/modules/RULES_E3 | 4 ++--
configure/modules/RULES_VARS | 1 +
tools/iocsh_functions | 2 +-
5 files changed, 20 insertions(+), 8 deletions(-)
create mode 100644 configure/modules/CONFIG_CELL
diff --git a/configure/modules/CONFIG b/configure/modules/CONFIG
index bd434649..67177777 100644
--- a/configure/modules/CONFIG
+++ b/configure/modules/CONFIG
@@ -1,11 +1,7 @@
# -*- mode: Makefile;-*-
include $(REQUIRE_CONFIG)/CONFIG_REQUIRE
-
-ifneq (,$(findstring local,$(MAKECMDGOALS)))
-E3_MODULES_PATH=$(TOP)/localMods
-endif
-
+include $(REQUIRE_CONFIG)/CONFIG_CELL
include $(REQUIRE_CONFIG)/CONFIG_E3_PATH
include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE
include $(REQUIRE_CONFIG)/CONFIG_EPICS
diff --git a/configure/modules/CONFIG_CELL b/configure/modules/CONFIG_CELL
new file mode 100644
index 00000000..b858f656
--- /dev/null
+++ b/configure/modules/CONFIG_CELL
@@ -0,0 +1,15 @@
+# TOP is e3-MODULENAME
+ifneq (,$(findstring cell,$(MAKECMDGOALS)))
+## Default is e3-MODULENAME/cellMods
+E3_CELL_PATH=$(TOP)/cellMods
+##
+## Allow local file in $(TOP)/configure
+## local file in $(TOP)/../
+##
+## Useful if one would like to install many different modules in
+## a specific directory for massive debugging purpose
+##
+-include $(TOP)/../CONFIG_CELL.local
+-include $(TOP)/configure/CONFIG_CELL.local
+E3_MODULES_PATH=$(E3_CELL_PATH)
+endif
diff --git a/configure/modules/RULES_E3 b/configure/modules/RULES_E3
index d5ec1113..c0afafb1 100644
--- a/configure/modules/RULES_E3
+++ b/configure/modules/RULES_E3
@@ -37,9 +37,9 @@ uninstall: conf
$(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) uninstall'
$(SUDO) find $(E3_SITELIBS_PATH) -xtype l -delete
-localinstall: install_module
+cellinstall: install_module
-localuninstall: conf
+celluninstall: conf
$(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) uninstall'
$(SUDO) rm -rf $(E3_MODULES_PATH)
diff --git a/configure/modules/RULES_VARS b/configure/modules/RULES_VARS
index 7d8b813a..76d7582f 100644
--- a/configure/modules/RULES_VARS
+++ b/configure/modules/RULES_VARS
@@ -28,3 +28,4 @@ else
$(QUIET)tree -L $(LEVEL) $(E3_MODULES_PATH)/$(E3_MODULE_NAME)
endif
+cellvars: vars
diff --git a/tools/iocsh_functions b/tools/iocsh_functions
index 0b486f25..b9c6f0d7 100644
--- a/tools/iocsh_functions
+++ b/tools/iocsh_functions
@@ -426,7 +426,7 @@ function loadFiles
;;
( -l )
shift
- printf "epicsEnvSet EPICS_DRIVER_PATH ${EPICS_DRIVER_PATH}:%s\n", $1
+ printf "epicsEnvSet EPICS_DRIVER_PATH %s:${EPICS_DRIVER_PATH}\n", $1
;;
( -* )
printf "Unknown option $1\n\n" >&2
--
GitLab