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
dfa75e05
Commit
dfa75e05
authored
3 years ago
by
Wayne Lewis
Browse files
Options
Downloads
Patches
Plain Diff
Remove EPICS base 3 references
parent
c70d6a33
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure/CONFIG
+0
-3
0 additions, 3 deletions
configure/CONFIG
require-ess/tools/driver.makefile
+2
-12
2 additions, 12 deletions
require-ess/tools/driver.makefile
with
2 additions
and
15 deletions
configure/CONFIG
+
0
−
3
View file @
dfa75e05
...
...
@@ -31,9 +31,6 @@ include $(REQUIRE_CONFIG)/CONFIG_EPICS
include $(REQUIRE_CONFIG)/CONFIG_EXPORT
VARS_EXCLUDES+=BASE_3_14
VARS_EXCLUDES+=BASE_3_15
VARS_EXCLUDES+=BASE_3_16
VARS_EXCLUDES+=BASE_7_0
VARS_EXCLUDES+=EPICS_VERSION
VARS_EXCLUDES+=EPICS_REVISION
...
...
This diff is collapsed.
Click to expand it.
require-ess/tools/driver.makefile
+
2
−
12
View file @
dfa75e05
...
...
@@ -507,7 +507,6 @@ COMMON_DIR = ../O.${EPICSVERSION}_Common
# Remove include directory for this module from search path.
INSTALL_INCLUDES
=
EPICS_INCLUDES
=
# Add include directory of foreign modules to include file search path.
#
...
...
@@ -572,9 +571,6 @@ endif # MINOR
LDFLAGS
+=
${
PROVIDES
}
${
USR_LDFLAGS_
${
T_A
}}
# Create and include dependency files.
# 3.14.8 uses HDEPENDS to select depends mode
# 3.14.12 uses 'HDEPENDSCFLAGS -MMD' (does not catch #include <...>)
# 3.15 uses 'HDEPENDS_COMPFLAGS = -MM -MF $@' (does not catch #include <...>)
HDEPENDS
=
HDEPENDS_METHOD
=
COMP
HDEPENDS_COMPFLAGS
=
-c
...
...
@@ -595,9 +591,6 @@ SRC_INCLUDES = $(addprefix -I, $(wildcard $(foreach d,$(call uniq, $(filter-out
# Look for includes from standard locations relative to vendor libraries
USR_INCLUDES
+=
$(
addprefix
-I
,
$(
wildcard
$(
patsubst %/lib/
$(
T_A
)
/,../%/include,
$(
call
uniq
,
$(
dir
$(
VLIBS
)))
$(
patsubst %/lib/,../%/include,
$(
call
uniq
,
$(
dir
$(
VLIBS
)))))))
# Different macro name for 3.14.8.
GENERIC_SRC_INCLUDES
=
$(
SRC_INCLUDES
)
# Create dbd file for snl code.
DBDFILES
+=
$(
patsubst %.st,%_snl.dbd,
$(
notdir
$(
filter %.st,
${
SRCS
})))
DBDFILES
+=
$(
patsubst %.stt,%_snl.dbd,
$(
notdir
$(
filter %.stt,
${
SRCS
})))
...
...
@@ -605,8 +598,7 @@ DBDFILES += $(patsubst %.stt,%_snl.dbd,$(notdir $(filter %.stt,${SRCS})))
# Create dbd file for GPIB code.
DBDFILES
+=
$(
patsubst %.gt,%.dbd,
$(
notdir
$(
filter %.gt,
${
SRCS
})))
# snc location in 3.14: From latest version of module seq or fall back to globally installed snc.
#SNC=$(lastword $(dir ${EPICS_BASE})seq/bin/$(EPICS_HOST_ARCH)/snc $(shell ls -dv ${EPICS_MODULES}/seq/$(or $(seq_VERSION),$(VERSIONGLOB))/bin/${EPICS_HOST_ARCH}/snc 2>/dev/null))
# snc location
SNCALL
=
$(
shell
ls
-dv
$(
E3_SITEMODS_PATH
)
/sequencer/
$(
call FETCH_BUILD_NUMBER,
$(
E3_SITEMODS_PATH
)
,sequencer
)
/bin/
$(
EPICS_HOST_ARCH
)
2> /dev/null
)
SNC
=
$(
lastword
$(
SNCALL
))
/snc
...
...
@@ -665,11 +657,9 @@ endif
# Fix incompatible release rules.
RELEASE_DBDFLAGS
=
-I
${
EPICS_BASE
}
/dbd
RELEASE_INCLUDES
=
-I
${
EPICS_BASE
}
/include
# For EPICS 3.15:
# For EPICS 3.15
+
:
RELEASE_INCLUDES
+=
-I
${
EPICS_BASE
}
/include/compiler/
${
CMPLR_CLASS
}
RELEASE_INCLUDES
+=
-I
${
EPICS_BASE
}
/include/os/
${
OS_CLASS
}
# Dor EPICS 3.13:
EPICS_INCLUDES
+=
-I
$(
EPICS_BASE_INCLUDE
)
-I
$(
EPICS_BASE_INCLUDE
)
/os/
$(
OS_CLASS
)
# Find all sources and set vpath accordingly.
$(
foreach
file,
${
SRCS
}
${
TEMPLS
}
${
DBDINSTALLS
}
${
SCR
}
,
$(
eval
vpath
$(
notdir
${
file
})
../
$(
dir
${
file
})))
...
...
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