Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
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
epics-modules
require
Commits
6c509ea5
Commit
6c509ea5
authored
2 years ago
by
Douglas Araujo
Browse files
Options
Downloads
Patches
Plain Diff
Run end-file and trim-whitespace fixer
parent
4ae09aeb
Branches
5.0.0_conda_to_master
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
App/tools/driver.makefile
+7
-7
7 additions, 7 deletions
App/tools/driver.makefile
tools/iocsh
+1
-1
1 addition, 1 deletion
tools/iocsh
tools/iocsh_functions.bash
+7
-7
7 additions, 7 deletions
tools/iocsh_functions.bash
with
15 additions
and
15 deletions
App/tools/driver.makefile
+
7
−
7
View file @
6c509ea5
...
...
@@ -38,7 +38,7 @@
# Name of the built module.
# If not defined, it is derived from the directory name.
# SOURCES
# All source files to compile.
# All source files to compile.
# If not defined, default is all *.c *.cc *.cpp *.st *.stt in
# the source directory (where you run make).
# If you define this, you must list ALL sources.
...
...
@@ -158,7 +158,7 @@ COMMANDLINE_LIBRARY =
OBJ=.o
COMMON_DIR = O.${EPICSVERSION}_Common
ifndef T_A
## RUN 1
# Target achitecture not yet defined, but EPICSVERSION is already known.
...
...
@@ -372,7 +372,7 @@ LOADABLE_LIBRARY=$(if ${LIBRARY_OBJS},${PRJ},)
LIBOBJS += $(if $(MODULEDBD), $(addsuffix $(OBJ),$(basename ${REGISTRYFILE})))
# Create and include dependency files.
HDEPENDS =
HDEPENDS =
HDEPENDS_METHOD = COMP
HDEPENDS_COMPFLAGS = -c
MKMF = DO_NOT_USE_MKMF
...
...
@@ -421,9 +421,9 @@ debug::
@echo "BPTS = ${BPTS}"
@echo "DBDINSTALLS = ${DBDINSTALLS}"
@echo "HDRS = ${HDRS}"
@echo "SOURCES = ${SOURCES}"
@echo "SOURCES_${OS_CLASS} = ${SOURCES_${OS_CLASS}}"
@echo "SRCS = ${SRCS}"
@echo "SOURCES = ${SOURCES}"
@echo "SOURCES_${OS_CLASS} = ${SOURCES_${OS_CLASS}}"
@echo "SRCS = ${SRCS}"
@echo "REQ = ${REQ}"
@echo "LIBOBJS = ${LIBOBJS}"
@echo "DBDS = ${DBDS}"
...
...
@@ -451,7 +451,7 @@ endif
# Fix incompatible release rules.
RELEASE_DBDFLAGS = -I ${EPICS_BASE}/dbd
RELEASE_INCLUDES = -I${EPICS_BASE}/include
RELEASE_INCLUDES = -I${EPICS_BASE}/include
# For EPICS 3.15+:
RELEASE_INCLUDES += -I${EPICS_BASE}/include/compiler/${CMPLR_CLASS}
RELEASE_INCLUDES += -I${EPICS_BASE}/include/os/${OS_CLASS}
...
...
This diff is collapsed.
Click to expand it.
tools/iocsh
+
1
−
1
View file @
6c509ea5
...
...
@@ -163,4 +163,4 @@ fi
#
#
# shellcheck disable=SC2086
${
__LOADER__
}${
EPICS_BASE
}
/bin/
${
EPICS_HOST_ARCH
}
/softIoc
${
__PVA__
}
-D
${
EPICS_BASE
}
/dbd/softIoc
${
__PVA__
}
.dbd
"
${
IOC_STARTUP
}
"
2>&1
\ No newline at end of file
${
__LOADER__
}${
EPICS_BASE
}
/bin/
${
EPICS_HOST_ARCH
}
/softIoc
${
__PVA__
}
-D
${
EPICS_BASE
}
/dbd/softIoc
${
__PVA__
}
.dbd
"
${
IOC_STARTUP
}
"
2>&1
This diff is collapsed.
Click to expand it.
tools/iocsh_functions.bash
+
7
−
7
View file @
6c509ea5
# -*- mode: sh -*-
#
# Copyright (c) 2004 - 2017 Paul Scherrer Institute
# Copyright (c) 2004 - 2017 Paul Scherrer Institute
# Copyright (c) 2017 - 2019 European Spallation Source ERIC
#
# The program is free software: you can redistribute
...
...
@@ -45,7 +45,7 @@ function checkIfVar
result
=
$EXIST
# exist
fi
echo
"
${
result
}
"
echo
"
${
result
}
"
}
;
...
...
@@ -152,7 +152,7 @@ function printIocEnv() {
# kill softioc process : OK
# kill main precess : Enter twice in terminal,
# close softIoc, but STATUP file is remained.
#
#
function
softIoc_end
()
{
local
startup_file
=
$1
...
...
@@ -190,15 +190,15 @@ function iocsh_ps1() {
}
# Please look at the limitation in require.c in registerModule()
# /*
# Require DB has the following four PVs:
# /*
# Require DB has the following four PVs:
# - $(REQUIRE_IOC):$(MODULE)_VER
# - $(REQUIRE_IOC):MOD_VER
# - $(REQUIRE_IOC):VERSIONS
# - $(REQUIRE_IOC):MODULES
# We reserved 30 chars for :$(MODULE)_VER, so MODULE has the maximum 24 chars.
# And we've reserved for 30 chars for $(REQUIRE_IOC).
# So, the whole PV and record name in moduleversion.template has 59 + 1.
# So, the whole PV and record name in moduleversion.template has 59 + 1.
# */
...
...
@@ -420,7 +420,7 @@ function set_e3_cmd_top(){
local
file_path
=
""
local
file_top
=
""
local
file_name
=
""
if
[
-f
"
$file
"
]
;
then
file_path
=
"
$(
readlink
-e
"
$file
"
)
"
file_top
=
"
${
file_path
%/*
}
"
...
...
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