diff --git a/Makefile b/Makefile index 9619ca0b2e2d338e9b4768c8780e61c6ad1e3625..1fbb6d4dc3038ae71932a3f7a9f0958a9e8df696 100644 --- a/Makefile +++ b/Makefile @@ -124,13 +124,13 @@ clean: ## Initialize EPICS BASE and E3 ENVIRONMENT Module init: git-submodule-sync $(EPICS_MODULE_NAME) $(E3_ENV_NAME) -git-submodule-sync: +git-submodule-sync: $(QUIET) git submodule sync $(EPICS_MODULE_NAME): $(QUIET) $(git_update) - cd $@ && git checkout tags/$(REQUIRE_MODULE_TAG) + cd $@ && git checkout $(REQUIRE_MODULE_TAG) $(E3_ENV_NAME): diff --git a/ess-env.conf b/ess-env.conf index b8040d1875bab27a8f778f87b1b0dca00c3687a5..647abe213cbcfad24770952d15cd27fefc978884 100644 --- a/ess-env.conf +++ b/ess-env.conf @@ -4,4 +4,4 @@ EPICS_LOCATION=/e3/bases EPICS_MODULES=/e3/modules REQUIRE=require -IOCSH_HASH_VERSION=8804bcb +IOCSH_HASH_VERSION=a17ef3d diff --git a/iocsh.bash b/iocsh.bash index c374c0bdf63eb199f9466301c9dd8d010eb6fc3f..12472e00ed87aa441198110e6300afcef94de954 100755 --- a/iocsh.bash +++ b/iocsh.bash @@ -59,13 +59,14 @@ trap "softIoc_end ${IOC_STARTUP}" EXIT HUP INT TERM printIocEnv; loadRequire; loadFiles "$@"; - if [ "$init" != NO ]; then printf "iocInit\n" fi printf "epicsEnvSet IOCSH_PS1 \"$IOCSH_PS1\"\n"; + printf "epicsEnvShow T_A\n"; + printf "epicsEnvShow EPICS_HOST_ARCH\n"; } > ${IOC_STARTUP} diff --git a/iocsh_functions b/iocsh_functions index 0729ff8b8bbb0a782da39063a76bb23940eac0d1..36110a58e36d8f4a43e2037cb9085b758747f63f 100644 --- a/iocsh_functions +++ b/iocsh_functions @@ -210,9 +210,13 @@ function loadRequire local load_cmd="dlload" + printf "# Loading the mandatory require module ... \n" + printf "# \n"; printf "${load_cmd} ${require_lib}\n"; printf "dbLoadDatabase ${require_dbd}\n" printf "${REQUIRE%-*}_registerRecordDeviceDriver\n\n" + printf "# \n"; + printf "# \n"; }; diff --git a/require.Makefile b/require.Makefile index c5ef927efc9e749ffbd8c35e961bb746247fb8e2..24b51232a6d9466d3b00d84c05eb0e78af8ce78f 100644 --- a/require.Makefile +++ b/require.Makefile @@ -23,14 +23,17 @@ HEADERS += strdup.h asprintf.h HEADERS += require.h # We need to find the Linux link.h before the EPICS link.h -USR_INCLUDES_Linux=-idirafter ${EPICS_BASE}/include +USR_INCLUDES_Linux=-idirafter $(EPICS_BASE)/include # Pass T_A to the code -USR_CFLAGS += -DT_A=${T_A} +# Should use ' +USR_CFLAGS += -DT_A='"$(T_A)"' # This should really go into some global WIN32 config file USR_CFLAGS_WIN32 += /D_WIN32_WINNT=0x501 +TEMPLATES += moduleversion.template + dbLoadTemplate.c: dbLoadTemplate_lex.c ../dbLoadTemplate.h