Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ESS EPICS Environment
wrappers
e3-require
Commits
cee8c993
Commit
cee8c993
authored
7 years ago
by
Jeong Han Lee
Browse files
Options
Downloads
Patches
Plain Diff
understood what EPICS_DRIVER_PATH means
parent
f7e8716e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
Makefile
+1
-0
1 addition, 0 deletions
Makefile
ess-env.conf
+1
-1
1 addition, 1 deletion
ess-env.conf
iocsh.bash
+5
-0
5 additions, 0 deletions
iocsh.bash
require.Makefile
+1
-1
1 addition, 1 deletion
require.Makefile
require.c
+6
-1
6 additions, 1 deletion
require.c
with
14 additions
and
3 deletions
Makefile
+
1
−
0
View file @
cee8c993
...
...
@@ -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
)
/
...
...
This diff is collapsed.
Click to expand it.
ess-env.conf
+
1
−
1
View file @
cee8c993
...
...
@@ -4,4 +4,4 @@ EPICS_LOCATION=/e3/bases
EPICS_MODULES
=/
e3
/
modules
REQUIRE
=
require
IOCSH_HASH_VERSION
=
ebc0c0b
IOCSH_HASH_VERSION
=
f7e8716
This diff is collapsed.
Click to expand it.
iocsh.bash
+
5
−
0
View file @
cee8c993
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
require.Makefile
+
1
−
1
View file @
cee8c993
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
require.c
+
6
−
1
View file @
cee8c993
...
...
@@ -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"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment