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

Merge branch '2022q4-rc1' into 'master'

E3-1019: Release require 5.0.0

See merge request e3/e3-require!114
parents ab25ab52 9d31a480
No related branches found
No related tags found
No related merge requests found
...@@ -19,5 +19,6 @@ cellMods ...@@ -19,5 +19,6 @@ cellMods
__pycache__ __pycache__
require-ess/require.Makefile require-ess/require.Makefile
require-ess/O.*
require-ess/Db/*.db require-ess/Db/*.db
require-ess/Db/*.d require-ess/Db/*.d
...@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [5.0.0]
### New Features ### New Features
* Recursive dependency for headers at build-time. This is a more major change that involves: * Recursive dependency for headers at build-time. This is a more major change that involves:
* Module dependecies are now fetched from `CONFIG_MODULE` in the sense that `X_DEP_VERSION` is parsed as a * Module dependecies are now fetched from `CONFIG_MODULE` in the sense that `X_DEP_VERSION` is parsed as a
......
EPICS_BASE=/epics/base-7.0.6.1 EPICS_BASE=/epics/base-7.0.7
E3_REQUIRE_NAME:=require E3_REQUIRE_NAME:=require
E3_REQUIRE_VERSION:=4.0.0 E3_REQUIRE_VERSION:=5.0.0
# The definitions shown below can also be placed in an untracked RELEASE.local # The definitions shown below can also be placed in an untracked RELEASE.local
......
#!/usr/bin/env bash #!/usr/bin/env bash
# This file exists for (temporary) backwards compatability # This file exists for (temporary) backwards compatability
echo "setE3Env.bash has been deprecated, please use activate instead" echo "setE3Env.bash has been deprecated, please use activate instead" >&2
DIR="${0%/*}" DIR="${BASH_SOURCE[0]%/*}"
# shellcheck source=require-ess/tools/activate # shellcheck source=require-ess/tools/activate
. "$DIR"/activate . "$DIR"/activate
...@@ -59,16 +59,6 @@ USR_CFLAGS += -std=c99 ...@@ -59,16 +59,6 @@ USR_CFLAGS += -std=c99
# USR_CFLAGS += -DT_A='"${T_A}"' # USR_CFLAGS += -DT_A='"${T_A}"'
TEMPLATES += $(APPDB)/moduleversion.template TEMPLATES += $(APPDB)/moduleversion.template
# TEMPLATES += moduleversion.db
vpath dbLoadTemplate_lex.l ../$(APPSRC) vpath dbLoadTemplate_lex.l ../$(APPSRC)
dbLoadTemplate.c: dbLoadTemplate_lex.c ../$(APPSRC)/dbLoadTemplate.h dbLoadTemplate.c: dbLoadTemplate_lex.c ../$(APPSRC)/dbLoadTemplate.h
# moduleversion should convert to db instead of template
# So, ESS uses it internally independent upon any IOC
# variables
#
USR_DBFLAGS += -I . -I ..
USR_DBFLAGS += -I$(EPICS_BASE)/db
TMPS = $(wildcard $(APPDB)/*.template)
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