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
d5162f06
Commit
d5162f06
authored
2 years ago
by
Simon Rose
Browse files
Options
Downloads
Patches
Plain Diff
E3-1024: Expand TMPS and SUBS at build time
parent
c00950e0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!104
E3-1024: Expand TMPS and SUBS at build time
Pipeline
#121749
passed with warnings
2 years ago
Stage: check
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure/E3/RULES_E3
+2
-2
2 additions, 2 deletions
configure/E3/RULES_E3
require.Makefile
+0
-13
0 additions, 13 deletions
require.Makefile
with
2 additions
and
15 deletions
configure/E3/RULES_E3
+
2
−
2
View file @
d5162f06
...
@@ -39,7 +39,7 @@ err_no_db_rule:
...
@@ -39,7 +39,7 @@ err_no_db_rule:
$(error The 'db' target has been discontinued. If you have custom database expansion rule to use, please contact the e3 team)
$(error The 'db' target has been discontinued. If you have custom database expansion rule to use, please contact the e3 team)
.PHONY: install_module
.PHONY: install_module
install_module: build
db_internal
install_module: build
$(QUIET) $(E3_MODULE_MAKE_CMDS) install
$(QUIET) $(E3_MODULE_MAKE_CMDS) install
.PHONY: check_uninstall
.PHONY: check_uninstall
...
@@ -50,7 +50,7 @@ uninstall: check_uninstall conf
...
@@ -50,7 +50,7 @@ uninstall: check_uninstall conf
$(QUIET) $(E3_MODULE_MAKE_CMDS) uninstall
$(QUIET) $(E3_MODULE_MAKE_CMDS) uninstall
## Build current module
## Build current module
build: conf checkout prebuild
build: conf checkout prebuild
db_internal
$(QUIET) $(E3_MODULE_MAKE_CMDS) build
$(QUIET) $(E3_MODULE_MAKE_CMDS) build
## Run module-specific commands before building
## Run module-specific commands before building
...
...
This diff is collapsed.
Click to expand it.
require.Makefile
+
0
−
13
View file @
d5162f06
...
@@ -85,20 +85,7 @@ dbLoadTemplate.c: dbLoadTemplate_lex.c ../$(APPSRC)/dbLoadTemplate.h
...
@@ -85,20 +85,7 @@ dbLoadTemplate.c: dbLoadTemplate_lex.c ../$(APPSRC)/dbLoadTemplate.h
# So, ESS uses it internally independent upon any IOC
# So, ESS uses it internally independent upon any IOC
# variables
# variables
#
#
EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
MSI = $(EPICS_BASE_HOST_BIN)/msi
USR_DBFLAGS += -I . -I ..
USR_DBFLAGS += -I . -I ..
USR_DBFLAGS += -I$(EPICS_BASE)/db
USR_DBFLAGS += -I$(EPICS_BASE)/db
TMPS = $(wildcard $(APPDB)/*.template)
TMPS = $(wildcard $(APPDB)/*.template)
.PHONY: db
db: $(TMPS)
.PHONY: $(TMPS)
$(TMPS):
@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
@rm -f $(basename $(@)).db.d $(basename $(@)).db
@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db $@ > $(basename $(@)).db.d
@$(MSI) $(USR_DBFLAGS) -o $(basename $(@)).db $@
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