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
Wiki
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
Anders Lindh Olsson
e3-require
Commits
4a58bd55
Commit
4a58bd55
authored
4 years ago
by
Simon Rose
Browse files
Options
Downloads
Patches
Plain Diff
Removed some base 3x stuff
parent
e24eb3c3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tools/iocsh_functions
+3
-25
3 additions, 25 deletions
tools/iocsh_functions
with
3 additions
and
25 deletions
tools/iocsh_functions
+
3
−
25
View file @
4a58bd55
...
...
@@ -302,21 +302,10 @@ function loadRequire() {
local
require_lib
=
${
E3_REQUIRE_LIB
}
/
${
EPICS_HOST_ARCH
}
/
${
libName
}
local
require_dbd
=
${
E3_REQUIRE_DBD
}
/
${
E3_REQUIRE_NAME
}
.dbd
local
load_cmd
=
""
# Support for dynamic loading 3.14.11
#
if
[[
${
BASECODE
}
-ge
03141100
]]
;
then
load_cmd
=
"dlload"
else
# Not sure it works or not.
load_cmd
=
"ld"
fi
printf
"#
\n
"
printf
"# Load
${
E3_REQUIRE_NAME
}
module, which has the version
${
E3_REQUIRE_VERSION
}
\n
"
printf
"#
\n
"
printf
"
${
load
_cmd
}
${
require_lib
}
\n
"
printf
"
dl
load
${
require_lib
}
\n
"
printf
"dbLoadDatabase
${
require_dbd
}
\n
"
printf
"
${
E3_REQUIRE_NAME
%-*
}
_registerRecordDeviceDriver
\n\n
"
printf
"#
\n
"
...
...
@@ -433,12 +422,7 @@ function loadFiles() {
exit
1
;;
*
.so
)
## dlload introduced from EPICS Base Release 3.14.11
if
[[
${
BASECODE
}
-ge
03141100
]]
;
then
echo
"dlload
\"
$file
\"
"
else
echo
"ld
\"
$file
\"
"
fi
echo
"dlload
\"
$file
\"
"
;;
*
)
subst
=
""
...
...
@@ -467,13 +451,7 @@ function loadFiles() {
;;
*
)
set_e3_cmd_top
"
$file
"
# iocshLoad introduced from 3.15.0.2
if
[[
${
BASECODE
}
-ge
03150002
]]
;
then
echo
"iocshLoad '
$file
','
$subst
'"
else
echo
-n
$subst
|
awk
-F
'='
-v
'RS=,'
'{printf "epicsEnvSet %s '
\'
'%s'
\'
'\n" $1 $2}'
echo
"< '
$file
'"
fi
echo
"iocshLoad '
$file
','
$subst
'"
if
grep
-q
iocInit
$file
;
then
init
=
NO
...
...
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