diff --git a/configure/E3/RULES_REQUIRE b/configure/E3/RULES_REQUIRE index 417e9778ef4a5d7ee995a0f19281924330641e43..f1c66a4dead18f09fb87319f4ac3be7d3a72f65d 100644 --- a/configure/E3/RULES_REQUIRE +++ b/configure/E3/RULES_REQUIRE @@ -3,27 +3,19 @@ # The following VARIABLES are defined in RULES_REQUIRE instead of CONFIG_REQUIRE, # because they are used in ONLY RULES_REQUIRE. It is easy to understand them. # -# CentOS7.4 and Debian 8, it works -#IOCSH_HASH_VERSION:=$(shell git rev-parse --short HEAD) - -# If git rev-parse returns null, use the EPICS_MODULE_TAG -#IOCSH_HASH_VERSION?=$(EPICS_MODULE_TAG) FILE_FILTER:= %~ %\# -#E3_ESSENVCFG_FILE := $(TOP)/tools/ess-env.conf -#E3_CONFIG_FILE := $(E3_MODULE_SRC_PATH)/tools/e3.cfg E3_TEST_SCRIPT := $(TOP)/tools/test_installed_modules.sh # E3_SHELL_FILES := $(wildcard $(E3_MODULE_SRC_PATH)/tools/iocsh*.bash) -#E3_IOC_CFG_FILES += $(E3_ESSENVCFG_FILE) E3_IOC_CFG_FILES += $(E3_MODULE_SRC_PATH)/tools/setE3Env.bash E3_IOC_CFG_FILES += $(E3_MODULE_SRC_PATH)/tools/promptE3Env.bash E3_REQUIRE_CONF_FILES := $(filter-out $(FILE_FILTER), $(wildcard $(TOP)/configure/modules/*)) -.PHONY: e3-site-path requireconf # e3-site-conf +.PHONY: e3-site-path requireconf -requireconf: e3-site-path e3-require-path # e3-site-conf +requireconf: e3-site-path e3-require-path $(QUIET) install -m 755 $(wildcard $(E3_MODULE_SRC_PATH)/tools/*.tcl) $(E3_REQUIRE_TOOLS)/ $(QUIET) install -m 644 $(E3_MODULE_SRC_PATH)/tools/driver.makefile $(E3_REQUIRE_TOOLS)/ $(QUIET) install -m 755 $(E3_MODULE_SRC_PATH)/tools/*.sh $(E3_REQUIRE_TOOLS)/ @@ -44,16 +36,6 @@ e3-site-path: $(QUIET) install -d -m 755 $(E3_SITEAPPS_PATH) -#e3-site-conf: -## Makefile VERSION > 4.x is needed, DEFINES_REQUIRE can be found in a19eb01 -## $(QUIET) $(file > $(G_E3_CFG_FILE), $(E3_CFG_VARS)) -# $(QUIET)echo "declare -g DEFAULT_EPICS_BASE=$(E3_MODULES_PATH)" > $(E3_CONFIG_FILE) -# $(QUIET)echo "declare -g DEFAULT_REQUIRE_NAME=$(E3_REQUIRE_NAME)" >> $(E3_CONFIG_FILE) -# $(QUIET)echo "declare -g DEFAULT_REQUIRE_VERSION=$(E3_REQUIRE_VERSION)" >> $(E3_CONFIG_FILE) -# $(QUIET)sed -i 's/^IOCSH_HASH_VERSION=.*/IOCSH_HASH_VERSION=$(IOCSH_HASH_VERSION)/g' $(E3_ESSENVCFG_FILE) - - - VARS_EXCLUDES+=FILE_FILTER VARS_EXCLUDES+=E3_SHELL_FILES VARS_EXCLUDES+=E3_IOC_CFG_FILES diff --git a/require-ess/tools/setE3Env.bash b/require-ess/tools/setE3Env.bash index d2ddc29644646da4b07e28079b081599e4f4e7a9..120f46e3179057c7b920b61f8ee3b6bb723b9c79 100644 --- a/require-ess/tools/setE3Env.bash +++ b/require-ess/tools/setE3Env.bash @@ -174,46 +174,12 @@ fi SRC_NAME=${THIS_SRC##*/} -# e3.cfg will be generated via make e3-site-conf -# The Global Variables are defined in configure/E3/DEFINES_REQUIRE -# RULES is defined in configure/E3/RULES_REQUIRE -# -# Dynamic Changes according to the time when one installs REQUIRE -# -# declare -g DEFAULT_EPICS_BASE=/epics/base-7.0.5 -# declare -g DEFAULT_REQUIRE_NAME=require -# declare -g DEFAULT_REQUIRE_VERSION=3.4.1 - -## GENERATED_E3_CFG=$SRC_PATH/e3.cfg - -# don't install e3.cfg when make install is executed, -# so all varaibles are found according to the existent location -# the symbolic link path doesn't work -# -##if [ ! -f "${GENERATED_E3_CFG}" ]; then - E3_REQUIRE_LOCATION=${SRC_PATH%/*} E3_REQUIRE_VERSION=${E3_REQUIRE_LOCATION##*/} E3_REQUIRE_PATH=${E3_REQUIRE_LOCATION%/*} E3_REQUIRE_NAME=${E3_REQUIRE_PATH##*/} EPICS_BASE=${E3_REQUIRE_PATH%/*} -##else - -# # in e3-require/tools -# # in case, source within e3-require -# set -a -# # shellcheck disable=SC1090,SC1091 -# source "$GENERATED_E3_CFG" -# set +a -# -# EPICS_BASE=${DEFAULT_EPICS_BASE} -# E3_REQUIRE_NAME=${DEFAULT_REQUIRE_NAME} -# E3_REQUIRE_VERSION=${DEFAULT_REQUIRE_VERSION} -# E3_REQUIRE_LOCATION=${EPICS_BASE}/${E3_REQUIRE_NAME}/${E3_REQUIRE_VERSION} - -#fi - epics_host_arch_file="${EPICS_BASE}/startup/EpicsHostArch.pl" if [ -e "$epics_host_arch_file" ]; then EPICS_HOST_ARCH=$("${EPICS_BASE}/startup/EpicsHostArch.pl")