change to ESS require instead of PSI one, because we have to change thier makefile

.gitmodules

@@ -5,4 +5,8 @@
 [submodule "require"]
 	path = require
 	url = https://github.com/paulscherrerinstitute/require
-	ignore = all
\ No newline at end of file
+	ignore = all
+[submodule "require-ess"]
+	path = require-ess
+	url = https://github.com/icshwi/require-ess
+	ignore = dirty
\ No newline at end of file

Makefile

@@ -28,6 +28,15 @@ include $(TOP)/configure/CONFIG
 -include $(TOP)/$(E3_ENV_NAME)/$(E3_ENV_NAME)
 
 
+ifndef VERBOSE
+  QUIET := @
+endif
+
+ifdef DEBUG_SHELL
+  SHELL = /bin/sh -x
+endif
+
+
 #
 # Keep always the module up-to-date
 define git_update =
@@ -40,13 +49,6 @@ git submodule update --init --recursive --recursive $@/.
 git submodule update --remote --merge $@/
 endef
 
-ifndef VERBOSE
-  QUIET := @
-endif
-
-ifdef DEBUG_SHELL
-  SHELL = /bin/sh -x
-endif
 
 # Pass necessary driver.makefile variables through makefile options
 # This options is only vaild for require. The similiar options can
@@ -88,7 +90,6 @@ help:
 default: help
 
 
-all : rebuild
 #
 ## Install "Require" Module in order to use it
 install: uninstall
@@ -128,17 +129,18 @@ rebuild: clean build install
 clean: conf
 	$(QUIET) make $(M_OPTIONS) clean
 
-
+## Show driver.makefile help
+help2:
+	$(QUIET) make $(M_OPTIONS) help
 #
 ## Initialize EPICS BASE and E3 ENVIRONMENT Module
-init: git-submodule-sync $(EPICS_MODULE_NAME) $(E3_ENV_NAME)
+init: git-submodule-sync $(EPICS_MODULE_SRC_PATH) $(E3_ENV_NAME)
 
 git-submodule-sync: 
 	$(QUIET) git submodule sync
 
 
-
-$(EPICS_MODULE_NAME): 
+$(EPICS_MODULE_SRC_PATH): 
 	$(QUIET) $(git_update)
 	cd $@ && git checkout $(REQUIRE_MODULE_TAG)
 
@@ -151,11 +153,11 @@ $(E3_ENV_NAME):
 env:
 	$(QUIET) echo ""
 
-	$(QUIET) echo "EPICS_MODULE_NAME           : "$(EPICS_MODULE_NAME)
-	$(QUIET) echo "REQUIRE_MODULE_TAG          : "$(REQUIRE_MODULE_TAG)
 	$(QUIET) echo "EPICS_MODULE_SRC_PATH       : "$(EPICS_MODULE_SRC_PATH)
 	$(QUIET) echo "ESS_MODULE_MAKEFILE         : "$(ESS_MODULE_MAKEFILE)
-
+	$(QUIET) echo "REQUIRE_MODULE_TAG          : "$(REQUIRE_MODULE_TAG)
+	$(QUIET) echo "LIBVERSION                  : "$(REQUIRE_VERSION)
+	$(QUIET) echo "PROJECT                     : "$(PROJECT)
 	$(QUIET) echo ""
 	$(QUIET) echo "----- >>>> EPICS BASE Information <<<< -----"
 	$(QUIET) echo ""
@@ -178,7 +180,7 @@ env:
 
 conf:
 	$(QUIET) install -m 644 $(TOP)/$(ESS_MODULE_MAKEFILE)  $(EPICS_MODULE_SRC_PATH)/
-	$(QUIET) install -m 644 $(TOP)/require.c               $(EPICS_MODULE_SRC_PATH)/
+#	$(QUIET) install -m 644 $(TOP)/require.c               $(EPICS_MODULE_SRC_PATH)/
 
 
 ### We have to think how to find $(EPICS_BASE) and
@@ -198,4 +200,4 @@ db: conf
 	$(QUIET) make $(M_OPTIONS) db
 
 
-.PHONY: help default init $(EPICS_MODULE_NAME) $(E3_ENV_NAME) env conf install uninstall build clean rebuild db
+.PHONY: help default init $(EPICS_MODULE_SRC_PATH) $(E3_ENV_NAME) env conf install uninstall build clean rebuild db

configure/CONFIG

-# (EPICS) EPICS_MODULE_NAME 
-# The EPICS community MODULE name. 
-# For example, https://github.com/epics-module/devlib2
-# devlib2 is EPICS_MODULE_NAME
-#
-# We have to use hard-coded require name, which we have to sync with
-# e3-env REQUIRE
-# 
-EPICS_MODULE_NAME:=require
-
-
-# (EPICS) EPICS_MODULE_TAG
-# The EPICS community tag number, which we would like to install
-# within ESS EPICS Environment (ESS)
-
-# This is the module source tag
-# *) individual tags
-#    export EPICS_MODULE_TAG:=tags/require_2_5_3
-# *) master branch 
-#    export EPICS_MODULE_TAG:=master
-# *) individual hash 
-export EPICS_MODULE_TAG:=$(REQUIRE_MODULE_TAG)
-
-
-# (LOCAL) EPICS_MODULE_PATH
-# Usually, it is the directory in $(TOP), after cloning the repository
-# However, some modules from ESS have the weird directory structure. 
-# If one use the cloned directory, one should define the proper source
-# directory path in $(ESS_MODULE_MAKEFILE)
-export EPICS_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME)
-
-
-
-# (LOCAL) ESS_MODULE_MAKEFILE 
-# The very strange and additional Makefile for EPICS_MODULE_NAME, which
-# should be maintained according to main repository evolving.
-# some export variables in CONFIG file 
-# in order to build and install for EEE
-export ESS_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
-
-# (EEE) PROJECT 
-# it is the jargon of EEE, the EEE generic makefile uses it
-# as the installation directory, and it will be used in the iocsh script
-# with the require commands, for    example
-# require $(PROJECT),$(LIBVERSION)
-export PROJECT:=$(EPICS_MODULE_NAME)
-
-
-
-# E3_ENV_NAME
-export E3_ENV_NAME:=e3-env
-#export E3_ENV_TAG:=v0.1
-

configure/CONFIG

+CONFIG_ESS
\ No newline at end of file

configure/CONFIG_ESS

+# (EPICS) EPICS_MODULE_NAME 
+# The EPICS community MODULE name. 
+# For example, https://github.com/epics-module/devlib2
+# devlib2 is EPICS_MODULE_NAME
+#
+# We have to use hard-coded require name, which we have to sync with
+# e3-env REQUIRE
+# 
+EPICS_MODULE_NAME:=require
+
+
+# (EPICS) EPICS_MODULE_TAG
+# The EPICS community tag number, which we would like to install
+# within ESS EPICS Environment (ESS)
+
+# This is the module source tag
+# *) individual tags
+#    export EPICS_MODULE_TAG:=tags/require_2_5_3
+# *) master branch 
+#    export EPICS_MODULE_TAG:=master
+# *) individual hash 
+export EPICS_MODULE_TAG:=$(REQUIRE_MODULE_TAG)
+
+
+# (LOCAL) EPICS_MODULE_PATH
+# Usually, it is the directory in $(TOP), after cloning the repository
+# However, some modules from ESS have the weird directory structure. 
+# If one use the cloned directory, one should define the proper source
+# directory path in $(ESS_MODULE_MAKEFILE)
+export EPICS_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME)-ess
+
+
+
+# (LOCAL) ESS_MODULE_MAKEFILE 
+# The very strange and additional Makefile for EPICS_MODULE_NAME, which
+# should be maintained according to main repository evolving.
+# some export variables in CONFIG file 
+# in order to build and install for EEE
+export ESS_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
+
+# (EEE) PROJECT 
+# it is the jargon of EEE, the EEE generic makefile uses it
+# as the installation directory, and it will be used in the iocsh script
+# with the require commands, for    example
+# require $(PROJECT),$(LIBVERSION)
+export PROJECT:=$(EPICS_MODULE_NAME)
+
+
+
+# E3_ENV_NAME
+export E3_ENV_NAME:=e3-env
+#export E3_ENV_TAG:=v0.1
+

configure/CONFIG_PSI

+# (EPICS) EPICS_MODULE_NAME 
+# The EPICS community MODULE name. 
+# For example, https://github.com/epics-module/devlib2
+# devlib2 is EPICS_MODULE_NAME
+#
+# We have to use hard-coded require name, which we have to sync with
+# e3-env REQUIRE
+# 
+EPICS_MODULE_NAME:=require
+
+
+# (EPICS) EPICS_MODULE_TAG
+# The EPICS community tag number, which we would like to install
+# within ESS EPICS Environment (ESS)
+
+# This is the module source tag
+# *) individual tags
+#    export EPICS_MODULE_TAG:=tags/require_2_5_3
+# *) master branch 
+#    export EPICS_MODULE_TAG:=master
+# *) individual hash 
+export EPICS_MODULE_TAG:=$(REQUIRE_MODULE_TAG)
+
+
+# (LOCAL) EPICS_MODULE_PATH
+# Usually, it is the directory in $(TOP), after cloning the repository
+# However, some modules from ESS have the weird directory structure. 
+# If one use the cloned directory, one should define the proper source
+# directory path in $(ESS_MODULE_MAKEFILE)
+export EPICS_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME)
+
+
+
+# (LOCAL) ESS_MODULE_MAKEFILE 
+# The very strange and additional Makefile for EPICS_MODULE_NAME, which
+# should be maintained according to main repository evolving.
+# some export variables in CONFIG file 
+# in order to build and install for EEE
+export ESS_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
+
+# (EEE) PROJECT 
+# it is the jargon of EEE, the EEE generic makefile uses it
+# as the installation directory, and it will be used in the iocsh script
+# with the require commands, for    example
+# require $(PROJECT),$(LIBVERSION)
+export PROJECT:=$(EPICS_MODULE_NAME)
+
+
+
+# E3_ENV_NAME
+export E3_ENV_NAME:=e3-env
+#export E3_ENV_TAG:=v0.1
+

ess-env.conf

-IOCSH_HASH_VERSION=2ec969d
+IOCSH_HASH_VERSION=68d3ec2

require-ess @ 34c293d9

+Subproject commit 34c293d97af2d90a9e9d61c62f6599fa8f911bad