diff --git a/configure/E3/RULES_REQUIRE b/configure/E3/RULES_REQUIRE index da876c85e9ead93e1242ee2924312b4216598674..71c8c5357ad7449b53801137eefa473b6421bb4c 100644 --- a/configure/E3/RULES_REQUIRE +++ b/configure/E3/RULES_REQUIRE @@ -4,10 +4,10 @@ # 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) +#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) +#IOCSH_HASH_VERSION?=$(EPICS_MODULE_TAG) FILE_FILTER:= %~ %\# E3_ESSENVCFG_FILE := $(TOP)/tools/ess-env.conf @@ -21,9 +21,9 @@ 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-conf e3-site-path requireconf +.PHONY: e3-site-path requireconf # e3-site-conf -requireconf: e3-site-path e3-site-conf e3-require-path +requireconf: e3-site-path e3-require-path # e3-site-conf $(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,13 +44,13 @@ 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) +#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) diff --git a/tools/ess-env.conf b/tools/ess-env.conf deleted file mode 100644 index 326f21527fc3b615fb3c86562b84e9a1b7c7cb98..0000000000000000000000000000000000000000 --- a/tools/ess-env.conf +++ /dev/null @@ -1 +0,0 @@ -IOCSH_HASH_VERSION=d3c308e