debug require.c

Makefile

@@ -107,7 +107,7 @@ install: uninstall
 	$(QUIET) sudo install -m 644  $(TOP)/$(E3_ENV_NAME)/setE3Env.bash  $(REQUIRE_BIN)/	
 #
 ## Uninstall "Require" Module in order not to use it
-uninstall:
+uninstall: conf
 	$(QUIET) sudo -E bash -c 'make $(M_OPTIONS) uninstall'
 
 
@@ -115,8 +115,13 @@ uninstall:
 build: conf
 	$(QUIET) make $(M_OPTIONS)
 
+
+## clean, build, and install again.
+rebuild: clean build install
+
+
 ## Clean the EPICS Module
-clean:
+clean: conf
 	$(QUIET) make $(M_OPTIONS) clean
 
 
@@ -171,4 +176,4 @@ conf:
 
 
 
-.PHONY: help default init $(EPICS_MODULE_NAME) $(E3_ENV_NAME) env conf install uninstall build clean 
+.PHONY: help default init $(EPICS_MODULE_NAME) $(E3_ENV_NAME) env conf install uninstall build clean rebuild 

ess-env.conf

@@ -4,4 +4,4 @@ EPICS_LOCATION=/e3/bases
 EPICS_MODULES=/e3/modules
 
 REQUIRE=require
-IOCSH_HASH_VERSION=a17ef3d
+IOCSH_HASH_VERSION=ebc0c0b

iocsh.bash

@@ -58,6 +58,7 @@ trap "softIoc_end ${IOC_STARTUP}" EXIT HUP INT TERM
 {
     printIocEnv;
     loadRequire;
+
     loadFiles "$@";
     if [ "$init" != NO ]; then
 	printf "iocInit\n"
@@ -67,6 +68,7 @@ trap "softIoc_end ${IOC_STARTUP}" EXIT HUP INT TERM
     printf "epicsEnvSet IOCSH_PS1 \"$IOCSH_PS1\"\n";
     printf "epicsEnvShow T_A\n";
     printf "epicsEnvShow EPICS_HOST_ARCH\n";
+    printf "var requireDebug 1\n";
     
 }  > ${IOC_STARTUP}
 

require.Makefile

@@ -21,13 +21,11 @@ SOURCES_T2 += strdup.c
 SOURCES_vxWorks   += asprintf.c
 HEADERS += strdup.h asprintf.h
 HEADERS += require.h
+HEADERS += require_env.h
 
 # We need to find the Linux link.h before the EPICS link.h
 USR_INCLUDES_Linux=-idirafter $(EPICS_BASE)/include 
 
-# Pass T_A to the code
-# 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