Skip to content
Snippets Groups Projects
Commit 3b226a84 authored by Simon Rose's avatar Simon Rose
Browse files

Merge branch 'e3_1024_db_expansion_at_build_time' into 'master'

E3-1024: Expand TMPS and SUBS at build time

See merge request e3/e3-require!104
parents c00950e0 d5162f06
No related branches found
No related tags found
1 merge request!104E3-1024: Expand TMPS and SUBS at build time
Pipeline #121801 passed with warnings
......@@ -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)
.PHONY: install_module
install_module: build db_internal
install_module: build
$(QUIET) $(E3_MODULE_MAKE_CMDS) install
.PHONY: check_uninstall
......@@ -50,7 +50,7 @@ uninstall: check_uninstall conf
$(QUIET) $(E3_MODULE_MAKE_CMDS) uninstall
## Build current module
build: conf checkout prebuild
build: conf checkout prebuild db_internal
$(QUIET) $(E3_MODULE_MAKE_CMDS) build
## Run module-specific commands before building
......
......@@ -85,20 +85,7 @@ dbLoadTemplate.c: dbLoadTemplate_lex.c ../$(APPSRC)/dbLoadTemplate.h
# So, ESS uses it internally independent upon any IOC
# variables
#
EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
MSI = $(EPICS_BASE_HOST_BIN)/msi
USR_DBFLAGS += -I . -I ..
USR_DBFLAGS += -I$(EPICS_BASE)/db
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 $@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment