Skip to content
Snippets Groups Projects
Commit cee8c993 authored by Jeong Han Lee's avatar Jeong Han Lee
Browse files

understood what EPICS_DRIVER_PATH means

parent f7e8716e
No related branches found
No related tags found
No related merge requests found
......@@ -173,6 +173,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)/
......
......@@ -4,4 +4,4 @@ EPICS_LOCATION=/e3/bases
EPICS_MODULES=/e3/modules
REQUIRE=require
IOCSH_HASH_VERSION=ebc0c0b
IOCSH_HASH_VERSION=f7e8716
......@@ -51,6 +51,11 @@ IOCSH_PS1=$(iocsh_ps1 "${IOCSH_HASH_VERSION}" "${BASHPID}")
IOC_STARTUP=/tmp/${SC_SCRIPTNAME}-${SC_VERSION}-startup
# EPICS_DRIVER_PATH defined in iocsh and startup.script_common
# Remember, driver is equal to module, so EPICS_DRIVER_PATH is the module directory
# In our jargon. It is the same as ${EPICS_MODULES}
EPICS_DRIVER_PATH=${EPICS_MODULES}
trap "softIoc_end ${IOC_STARTUP}" EXIT HUP INT TERM
......
......@@ -21,7 +21,7 @@ SOURCES_T2 += strdup.c
SOURCES_vxWorks += asprintf.c
HEADERS += strdup.h asprintf.h
HEADERS += require.h
HEADERS += require_env.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
......
......@@ -56,7 +56,7 @@ epicsShareFunc int epicsShareAPI iocshCmd(const char *cmd);
#endif
#include "require.h"
#include "require_env.h"
//#include "require_env.h"
int requireDebug;
......@@ -239,6 +239,11 @@ const char osClass[] = OS_CLASS;
Find a loadable library by name and load it.
*/
char epicsRelease[80];
char epicsBasetype[80];
char *targetArch;
void set_require_env()
{
char* epics_version_major = getenv("EPICS_VERSION_MAJOR");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment