Removed /modules/ configure directory

configure/module/RULES_REQUIRE

@@ -10,7 +10,7 @@ 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_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/*))
+E3_REQUIRE_CONF_FILES := $(filter-out $(FILE_FILTER), $(wildcard $(TOP)/configure/E3/*))
 
 check_uninstall:
 ifneq (,$(strip $(wildcard $(E3_SITEMODS_PATH)/*)))

configure/modules/CONFIG_E3_MAKEFILE

-# Pass necessary driver.makefile variables through makefile options
-#
-
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS := -C $(E3_MODULE_SRC_PATH)
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += -f $(E3_MODULE_MAKEFILE)
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += LIBVERSION="$(E3_MODULE_VERSION)"
-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)
-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')"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_STATUS="[ $(shell git status --porcelain | sed 's/^/\\\\\\\"/' | sed 's/$$/\\\\\\\", /')]"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_URL="$(shell git config --get remote.$(GIT_REMOTE_NAME).url 2> /dev/null | sed 's%^https://[^@]*@%https://%')"
-else
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_DESC=
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_STATUS=
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_URL=
-endif
-
-
-E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS)
-
-
-## the following variables to display
-
-VARS_EXCLUDES+=E3_REQUIRE_MAKEFILE_INPUT_OPTIONS
-VARS_EXCLUDES+=GIT_REMOTE_NAME

configure/modules/CONFIG_E3_PATH

-
-
-E3_SITEMODS_PATH:=$(E3_REQUIRE_LOCATION)/siteMods
-E3_SITELIBS_PATH:=$(E3_REQUIRE_LOCATION)/siteLibs
-E3_SITEAPPS_PATH:=$(E3_REQUIRE_LOCATION)/siteApps
-
-E3_MODULES_INSTALL_LOCATION:=$(E3_MODULES_PATH)/$(E3_MODULE_NAME)/$(E3_MODULE_VERSION)
-
-E3_MODULES_INSTALL_LOCATION_INC:=$(E3_MODULES_INSTALL_LOCATION)/include
-E3_MODULES_INSTALL_LOCATION_DB:=$(E3_MODULES_INSTALL_LOCATION)/db
-E3_MODULES_INSTALL_LOCATION_BIN:=$(E3_MODULES_INSTALL_LOCATION)/bin
-E3_MODULES_INSTALL_LOCATION_LIB:=$(E3_MODULES_INSTALL_LOCATION)/lib
-
-EXPORT_VARS+=E3_MODULES_INSTALL_LOCATION_LIB

configure/modules/CONFIG_EPICS

-COMMUNITY_EPICS_MODULES:=$(EPICS_BASE)/epics-modules
-
-M_AUTOSAVE:=$(COMMUNITY_EPICS_MODULES)/autosave
-M_DEVLIB2:=$(COMMUNITY_EPICS_MODULES)/devlib2
-M_IOCSTATS:=$(COMMUNITY_EPICS_MODULES)/iocStats
-M_ASYN:=$(COMMUNITY_EPICS_MODULES)/asyn
-M_BUSY:=$(COMMUNITY_EPICS_MODULES)/busy
-M_MODBUS:=$(COMMUNITY_EPICS_MODULES)/modbus
-M_MRFIOC2:=$(COMMUNITY_EPICS_MODULES)/mrfioc2
-M_LUA:=$(COMMUNITY_EPICS_MODULES)/lua
-M_IPMICOMM:=$(COMMUNITY_EPICS_MODULES)/ipmiComm
-M_STREAM:=$(COMMUNITY_EPICS_MODULES)/stream
-M_CALC:=$(COMMUNITY_EPICS_MODULES)/calc
-M_MOTOR:=$(COMMUNITY_EPICS_MODULES)/motor
-M_SSCAN:=$(COMMUNITY_EPICS_MODULES)/sscan
-M_SNCSEQ:=$(COMMUNITY_EPICS_MODULES)/seq
-M_IP:=$(COMMUNITY_EPICS_MODULES)/ip
-M_IPAC:=$(COMMUNITY_EPICS_MODULES)/ipac
-M_ADSUPPORT:=$(COMMUNITY_EPICS_MODULES)/adsupport
-M_ADCORE:=$(COMMUNITY_EPICS_MODULES)/adcore
-M_OPCUA:=$(COMMUNITY_EPICS_MODULES)/opcua
-
-
-
-export M_AUTOSAVE
-export M_DEVLIB2
-export M_IOCSTATS
-export M_ASYN
-export M_BUSY
-export M_MODBUS
-export M_MRFIOC2
-export M_LUA
-export M_IPMICOMM
-export M_STREAM
-export M_CALC
-export M_MOTOR
-export M_SSCAN
-export M_SNCSEQ
-export M_IP
-export M_IPAC
-export M_ADSUPPORT
-export M_ADCORE
-export M_OPCUA
-
-## This is needed since the target "epics" (in configure/RULES_MODULE in most modules)
-## uses SUDOBASH to run the make process:
-#
-#.PHONY: epics
-#epics:
-#	$(QUIET)echo "EPICS_BASE:=$(EPICS_BASE)"        > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
-#	$(QUIET)echo "ASYN:=$(M_ASYN)"                  > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
-#	$(QUIET)echo "CHECK_RELEASE:=YES"             > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
-#	$(QUIET)echo "INSTALL_LOCATION:=$(M_DEVLIB2)"  >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
-#	$(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH)"
-#
-## And so that last line will only run if SUDOBASH is defined to be "bash -c"
-SUDOBASH := bash -c
-
-### Exclude the following variables to display
-VARS_EXCLUDES+=COMMUNITY_EPICS_MODULES
-VARS_EXCLUDES+=M_AUTOSAVE
-VARS_EXCLUDES+=M_DEVLIB2
-VARS_EXCLUDES+=M_IOCSTATS
-VARS_EXCLUDES+=M_ASYN
-VARS_EXCLUDES+=M_BUSY
-VARS_EXCLUDES+=M_MODBUS
-VARS_EXCLUDES+=M_MRFIOC2
-VARS_EXCLUDES+=M_LUA
-VARS_EXCLUDES+=M_IPMICOMM
-VARS_EXCLUDES+=M_STREAM
-VARS_EXCLUDES+=M_CALC
-VARS_EXCLUDES+=M_MOTOR
-VARS_EXCLUDES+=M_SSCAN
-VARS_EXCLUDES+=M_SNCSEQ
-VARS_EXCLUDES+=M_IP
-VARS_EXCLUDES+=M_IPAC
-VARS_EXCLUDES+=M_ADSUPPORT
-VARS_EXCLUDES+=M_ADCORE
-VARS_EXCLUDES+=M_OPCUA
-
-VARS_EXCLUDES+=SUDOBASH

configure/modules/CONFIG_EXPORT

-# Variables should be transferred to module_name.makefile
-
-EPICS_HOST_ARCH:=$(shell perl $(EPICS_BASE)/lib/perl/EpicsHostArch.pl 2> /dev/null)
-
-MSI:=$(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/msi
-
-EXPORT_VARS+=EPICS_HOST_ARCH
-EXPORT_VARS+=EPICS_BASE
-EXPORT_VARS+=MSI
-EXPORT_VARS+=E3_MODULE_NAME
-EXPORT_VARS+=E3_MODULE_VERSION
-EXPORT_VARS+=E3_SITEMODS_PATH
-EXPORT_VARS+=E3_SITEAPPS_PATH
-EXPORT_VARS+=E3_SITELIBS_PATH
-EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES))
-
-EXPORT_VARS+=QUIET
-EXPORT_VARS+=$(filter %_DEP_VERSION,$(.VARIABLES))
-EXPORT_VARS+=$(filter WITH_%,$(.VARIABLES))
-EXPORT_VARS+=$(filter %_EXTERNAL,$(.VARIABLES))
-
-export_version=$(eval export $1)
-$(eval $(foreach v,$(EXPORT_VARS),$(call export_version,$v)))
-
-VARS_EXCLUDES+=export_version

configure/modules/CONFIG_REQUIRE

-#
-# The following VARIABLES are the same as other modules ones.
-#
-
-E3_REQUIRE_LOCATION:=$(EPICS_BASE)/$(E3_REQUIRE_NAME)/$(E3_REQUIRE_VERSION)
-
-E3_REQUIRE_TOOLS:=$(E3_REQUIRE_LOCATION)/tools
-E3_REQUIRE_BIN:=$(E3_REQUIRE_LOCATION)/bin
-E3_REQUIRE_LIB:=$(E3_REQUIRE_LOCATION)/lib
-E3_REQUIRE_DB:=$(E3_REQUIRE_LOCATION)/db
-E3_REQUIRE_DBD:=$(E3_REQUIRE_LOCATION)/dbd
-E3_REQUIRE_INC:=$(E3_REQUIRE_LOCATION)/include
-E3_REQUIRE_CONFIG:=$(E3_REQUIRE_LOCATION)/configure

configure/modules/CONFIG_SHELL

-
-ifdef DEBUG_SHELL
-  SHELL = /bin/sh -x
-else
-  SHELL = /usr/bin/bash
-endif
-
-VARS_EXCLUDES+=SHELL

configure/modules/CONFIG_TEST

-TEST_DIR:=$(TOP)/tests
-
-RUN_IOCSH_TEST_COMMAND = run-iocsh --name "${EPICS_BASE}/require/${E3_REQUIRE_VERSION}/bin/iocsh.bash" -r "$(E3_MODULE_NAME),$(E3_MODULE_VERSION)" -l $(TEMP_CELL_PATH)
-TEMP_CELL_PATH := $(TOP)/testMods-$(shell date +"%y%m%d%H%M%S")
-RMDIR = $(RM) -rf
-
-EXPORT_VARS+=TEMP_CELL_PATH
-
-VARS_EXCLUDES+=TEST_DIR
-VARS_EXCLUDES+=RMDIR
-VARS_EXCLUDES+=TEMP_CELL_PATH

configure/modules/DECOUPLE_FLAGS

-# Legacy file. Needed since <module>.Makefiles include the boilerplate code
-#
-# where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-# include ${E3_REQUIRE_TOOLS}/driver.makefile
-# include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
-#
-# which fails if this file does not exist. TODO: Remove this line from all modules

configure/modules/DEFINES_FT

-# Keep always the module up-to-date
-define git_update =
-git submodule deinit -f $@/
-sed -i '/submodule/,24465d'  $(TOP)/.git/config
-rm -rf $(TOP)/.git/modules/$@
-git submodule init $@/
-git submodule update --init --recursive $@/.
-git submodule update --remote --merge $@/
-endef
-
-define git_module_init_update =
-git submodule update --init --recursive $@/.
-git submodule update --remote --merge $@/
-endef
-
-define patch_site
-patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION)/*.p0.patch 2> /dev/null); \
-if [ -n "$$patches" ]; then \
-  for i in $$patches; do \
-    printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \
-    git apply --directory=$(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 $$i; \
-  done; \
-else \
-  echo ">>> No patches to apply" >&2; \
-fi
-endef
-
-define patch_revert_site
-patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION)/*.p0.patch 2> /dev/null); \
-if [ -n "$$patches" ]; then \
-  for i in $$patches; do\
-    printf "\nReverting applied patch %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \
-    git apply -R --directory=$(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 $$i;\
-  done \
-else \
-  echo ">>> No patches to revert" >&2; \
-fi
-endef
-
-ifndef VERBOSE
-  QUIET := @
-endif
-
-### Exclude the following variables to display
-VARS_EXCLUDES+=git_update
-VARS_EXCLUDES+=git_module_init_update
-VARS_EXCLUDES+=patch_site
-VARS_EXCLUDES+=patch_revert_site
-VARS_EXCLUDES+=QUIET
-VARS_EXCLUDES+=SHELL

configure/modules/RULES_CHECKS

-.PHONY: consistency_checks
-consistency_checks: module_name_check loc-check
-
-ifneq (require,$(E3_MODULE_NAME))
-consistency_checks: sitemods_check
-endif
-
-# Check that the module name satisfies a few conditions before we go on.
-module_name_check:
-ifneq ($(shell echo $(E3_MODULE_NAME) | grep -q '^[a-z_][a-z0-9_]*$$' ; echo $$?),0)
-	$(error E3_MODULE_NAME '$(E3_MODULE_NAME)' is not valid. It should consist only of lowercase letters, numbers, and underscores.)
-endif
-
-# Check that a module is including RULES_SITEMODS instead of RULES_SITEAPPS or manually including RULES_E3
-.PHONY: sitemods_check
-sitemods_check:
-ifeq ($(filter RULES_SITEMODS,$(notdir $(MAKEFILE_LIST))),)
-	$(error RULES_E3 should only be loaded from RULES_SITEMODS)
-endif
-
-# Check that e3 wrappers are using EPICS_MODULE_TAG to manage local source mode
-.PHONU: loc-check
-loc-check:
-ifneq (,$(findstring -loc,$(E3_MODULE_SRC_PATH)))
-	$(error DEPRECATED: Local source mode "-loc" has being deprecated. Please comment out the EPICS_MODULE_TAG to use local source mode.)
-endif